diff options
author | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
---|---|---|
committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
commit | 6e946c6cc26665c97dad880dec2b5604f0104a28 (patch) | |
tree | d967abd48d2cb7659fbe1fcc9f9bcd4f68ef6863 /src/Java/gtPlusPlus/core/lib/CORE.java | |
parent | 4d15336cfb84a61d7609d75c683f21ea084f47bb (diff) | |
parent | ab4b246c65795d612d35a8ace09acfe53e4580b4 (diff) | |
download | GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.gz GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.bz2 GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.zip |
Merge remote-tracking branch 'remotes/origin/VersionBump'
# Conflicts:
# src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
# src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
# src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/lib/CORE.java')
-rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 93f40ef737..ed5c7fa90b 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -48,7 +48,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-prerelease-11-final"; + public static final String VERSION = "1.7.0-prerelease-14-final"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); |