Skip to content

Commit 32bc0f3

Browse files
authored
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
1 parent b4d2627 commit 32bc0f3

File tree

5 files changed

+30
-5
lines changed

5 files changed

+30
-5
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
## Changelog
22

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

src/main/java/gregtech/GregTechVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ public final class GregTechVersion {
66

77
public static final int MAJOR = 1;
88
//This number is incremented every major feature update
9-
public static final int MINOR = 14;
9+
public static final int MINOR = 15;
1010
//This number is incremented every time the feature is added, or bug is fixed. resets every major version change
11-
public static final int REVISION = 1;
11+
public static final int REVISION = 0;
1212
//This number is incremented every build, and never reset. Should always be 0 in the repo code.
1313
public static final int BUILD = 0;
1414

src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixHelper.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515

1616
public class MetaBlockIdFixHelper {
1717

18+
private MetaBlockIdFixHelper() {
19+
}
20+
1821
public static final Version V1_10_5 = new Version(1, 10, 5); // granite was added in 1.10.5
19-
public static final Version V1_14_0 = new Version(1, 14, 0); // meta block id alloc was changed in 1.14.0
22+
public static final Version V1_15_0 = new Version(1, 15, 0); // meta block id alloc was changed in 1.15.0
2023

2124
public static final String KEY_FALLBACK_VERSION = "FallbackVersion";
2225

@@ -31,6 +34,7 @@ public static int getCompressedIndexFromResLoc(String resLoc) {
3134
try {
3235
return Integer.parseInt(resLoc.substring(COMP_RESLOC_PREF_LEN));
3336
} catch (NumberFormatException ignored) {
37+
//Left empty on purpose
3438
}
3539
}
3640
return -1;
@@ -47,6 +51,7 @@ public static int getSurfRockIndexFromResLoc(String resLoc) {
4751
try {
4852
return Integer.parseInt(resLoc.substring(SURF_ROCK_RESLOC_PREF_LEN));
4953
} catch (NumberFormatException ignored) {
54+
//Left empty on purpose
5055
}
5156
}
5257
return -1;

src/main/java/gregtech/common/datafix/fixes/metablockid/MetaBlockIdFixer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public interface MetaBlockIdFixer {
1212
static MetaBlockIdFixer create(Version prevSaveVersion, NBTTagCompound fmlTag) {
1313
if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_10_5) < 0) {
1414
return PreGraniteMetaBlockIdFixer.generate(fmlTag);
15-
} else if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_14_0) < 0) {
15+
} else if (prevSaveVersion.compareTo(MetaBlockIdFixHelper.V1_15_0) < 0) {
1616
return PostGraniteMetaBlockIdFixer.generate(fmlTag);
1717
} else {
1818
return NOOP;

src/main/java/gregtech/common/datafix/fixes/metablockid/WorldDataHooks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static void onWorldLoad(SaveHandler saveHandler, NBTTagCompound levelTag)
120120

121121
public static void promptWorldBackup(int prevDataVersion) {
122122
String text = "GregTech detected a required registry remapping!\n\n"
123-
+ "Updating from before " + TextFormatting.AQUA + (prevDataVersion == -1 ? MetaBlockIdFixHelper.V1_10_5 : MetaBlockIdFixHelper.V1_14_0) + TextFormatting.RESET
123+
+ "Updating from before " + TextFormatting.AQUA + (prevDataVersion == -1 ? MetaBlockIdFixHelper.V1_10_5 : MetaBlockIdFixHelper.V1_15_0) + TextFormatting.RESET
124124
+ " to " + TextFormatting.AQUA + GregTechVersion.VERSION.toString(3) + TextFormatting.RESET + ".\n"
125125
+ "It is " + TextFormatting.UNDERLINE + "strongly" + TextFormatting.RESET + " recommended that you perform a backup. Create backup?";
126126

0 commit comments

Comments
 (0)