From 640b5b8cd5b2266a3998ac43706b756c4758ae9a Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 5 Dec 2019 18:04:16 +0200
Subject: [PATCH] Update and enable mod menu support

---
 build.gradle      | 8 ++++++--
 gradle.properties | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index a1bfce2b..5b03c5ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,9 +11,13 @@ plugins {
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_1_8
 
-version = "${project.minecraft_version}-${project.version}"
+version = project.version
 
-if (System.env.TRAVIS_BRANCH != 'master') {
+if (System.env.TRAVIS_BRANCH != project.minecraft_version) {
+    version += "-${project.minecraft_version}"
+}
+
+if (System.env.TRAVIS_BRANCH != null && System.env.TRAVIS_BRANCH != 'master') {
     version += "-${System.env.TRAVIS_BRANCH}"
 }
 
diff --git a/gradle.properties b/gradle.properties
index 753932e9..61d9732f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,6 @@ org.gradle.daemon=false
 
 # Dependencies
   modmenu_version=1.8.0.1.15-pre3+build.14
-  kirin_version=1.15-pre3-1.5-1.15-pre3-SNAPSHOT
-  hd_skins_version=1.15-pre3-6-1.15-pre3-SNAPSHOT
-  mson_version=1.15-pre3-1.1.3-1.15-pre3-SNAPSHOT
+  kirin_version=1.5-1.15-pre3-SNAPSHOT
+  hd_skins_version=6-1.15-pre3-SNAPSHOT
+  mson_version=1.1.3-1.15-pre3-SNAPSHOT