Updated Changelog and version bump to 1.15.0 (#1610)

* Updated Changelog and version bump to 1.15.0 * Update version with which fixers are released
GregTechCE · May 18, 2021 · 32bc0f3 · 32bc0f3
1 parent b4d2627
commit 32bc0f3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 ## Changelog
 
+### 1.15.0
+* Highlight: Fixed Granite ID Shift (#1549) - dan
+  * Full info: https://github.com/GregTechCE/GregTech/pull/1549
+  * There may be conversion of old worlds
+* Added minimal Coil tier for Electric Blast furnace recipes to JEI (#1580) - LAGIdiot
+* Added notconsumable for fluids to CT (#1603) - dan
+* Updated GTCE chests to allow covers on bottom side (#1579) - htmlcsjs  
+* Updated Hay Bale recipe to use Packager instead of Compressor (#1592) - LAGIdiot
+* Updated Assembler Slot background to be more darker (#1611) - galyfray
+* Removed Forge Multipart legacy support (#1594) - LAGIdiot
+* Fixed MouseTweaks wheel action not working (#1485) - Nikolay Korolev
+* Fixed Crafting Station voiding items on right click (#1485) - Nikolay Korolev
+* Fixed Global Renderer in MetaTileEntityTESR (#1563) - KilaBash
+* Fixed Rubber trees spawning in water (#1590) - Bohdan Schepansky
+* Fixed eating food not returning container (#1595) - bruberu
+* Fixed Issues with Dust Uncrafting (#1596) - dan
+* Fixed TOP showing wrong burn time for small steam boilers (#1600) - galyfray
+* Internal removed Bintray uploading (#1593) - LAGIdiot
+* Internal fixed git using wrong folder, upgrade git and gradle (#1565) - Adrian Brock
+
 ### 1.14.1
 * Added mechanism to distribute expensive ticks more evenly (#1513) - dan
 * Added ore weight tooltips to JEI Ore page (#1562) - ALongStringOfNumbers

diff --git a/src/main/java/gregtech/GregTechVersion.java b/src/main/java/gregtech/GregTechVersion.java
@@ -6,9 +6,9 @@ public final class GregTechVersion {
 
     public static final int MAJOR = 1;
     //This number is incremented every major feature update
-    public static final int MINOR = 14;
+    public static final int MINOR = 15;
     //This number is incremented every time the feature is added, or bug is fixed. resets every major version change
-    public static final int REVISION = 1;
+    public static final int REVISION = 0;
     //This number is incremented every build, and never reset. Should always be 0 in the repo code.
     public static final int BUILD = 0;
 

diff --git a/src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixHelper.java b/src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixHelper.java
@@ -15,8 +15,11 @@
 
 public class MetaBlockIdFixHelper {
 
+    private MetaBlockIdFixHelper() {
+    }
+
     public static final Version V1_10_5 = new Version(1, 10, 5); // granite was added in 1.10.5
-    public static final Version V1_14_0 = new Version(1, 14, 0); // meta block id alloc was changed in 1.14.0
+    public static final Version V1_15_0 = new Version(1, 15, 0); // meta block id alloc was changed in 1.15.0
 
     public static final String KEY_FALLBACK_VERSION = "FallbackVersion";
 
@@ -31,6 +34,7 @@ public static int getCompressedIndexFromResLoc(String resLoc) {
             try {
                 return Integer.parseInt(resLoc.substring(COMP_RESLOC_PREF_LEN));
             } catch (NumberFormatException ignored) {
+                //Left empty on purpose
             }
         }
         return -1;
@@ -47,6 +51,7 @@ public static int getSurfRockIndexFromResLoc(String resLoc) {
             try {
                 return Integer.parseInt(resLoc.substring(SURF_ROCK_RESLOC_PREF_LEN));
             } catch (NumberFormatException ignored) {
+                //Left empty on purpose
             }
         }
         return -1;

diff --git a/src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixer.java b/src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixer.java
@@ -12,7 +12,7 @@ public interface MetaBlockIdFixer {
     static MetaBlockIdFixer create(Version prevSaveVersion, NBTTagCompound fmlTag) {
         if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_10_5) < 0) {
             return PreGraniteMetaBlockIdFixer.generate(fmlTag);
-        } else if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_14_0) < 0) {
+        } else if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_15_0) < 0) {
             return PostGraniteMetaBlockIdFixer.generate(fmlTag);
         } else {
             return NOOP;

diff --git a/src/main/java/gregtech/common/datafix/fixes/metablockid/WorldDataHooks.java b/src/main/java/gregtech/common/datafix/fixes/metablockid/WorldDataHooks.java
@@ -120,7 +120,7 @@ public static void onWorldLoad(SaveHandler saveHandler, NBTTagCompound levelTag)
 
     public static void promptWorldBackup(int prevDataVersion) {
         String text = "GregTech detected a required registry remapping!\n\n"
-                + "Updating from before " + TextFormatting.AQUA + (prevDataVersion == -1 ? MetaBlockIdFixHelper.V1_10_5 : MetaBlockIdFixHelper.V1_14_0) + TextFormatting.RESET
+                + "Updating from before " + TextFormatting.AQUA + (prevDataVersion == -1 ? MetaBlockIdFixHelper.V1_10_5 : MetaBlockIdFixHelper.V1_15_0) + TextFormatting.RESET
                 + " to " + TextFormatting.AQUA + GregTechVersion.VERSION.toString(3) + TextFormatting.RESET + ".\n"
                 + "It is " + TextFormatting.UNDERLINE + "strongly" + TextFormatting.RESET + " recommended that you perform a backup. Create backup?";