diff --git a/build.gradle b/build.gradle index 2fe7f24de..73c216e28 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'idea' -version = "1.10.2-r51" +version = "1.10.2-r52" group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java index ed9973709..58132d31e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java @@ -74,7 +74,7 @@ public class FluidDisplay extends Gui{ if(this.resLoc == null || this.oldFluid != fluid){ this.oldFluid = fluid; - if(fluid != null){ + if(fluid != null && fluid.getStill() != null){ this.resLoc = new ResourceLocation(fluid.getStill().getResourceDomain(), "textures/"+fluid.getStill().getResourcePath()+".png"); } } diff --git a/update/changelog.md b/update/changelog.md index f8583aa39..b398b9555 100644 --- a/update/changelog.md +++ b/update/changelog.md @@ -1,3 +1,16 @@ +# 1.10.2-r52 +* Added lens of disenchanting. It's awesome, I promise. +* Awesome new energy and fluid displays in GUIs +* Added the ability to change between RF and Tesla display modes in energy GUIs +* Changed advanced coil and ender star recipes a bit +* Fixed log spam when switching worlds +* Made JEI know about the drills so that people don't not know how to craft them. +* Disallow bosses to be spawner changed +* Fixed a crash when breaking soulshards spawners with a drill (hopefully) +* Reconstructed book (ha ha) to have a reconstruction section +* Made ESD use new capability item system. It might be broken in your world now, go look at all of the ones you're using and fix their settings if that's the case. +* Fixed bowls of water being hideous because they weren't going into the right slots + # 1.10.2-r51 * Made TiCon Rapier be able to be repaired in the Item Repairer * Added Player Probe diff --git a/update/updateVersions.properties b/update/updateVersions.properties index 78ea18ead..03605dc83 100644 --- a/update/updateVersions.properties +++ b/update/updateVersions.properties @@ -3,4 +3,4 @@ 1.9=33 1.9.4=45 1.10=46 -1.10.2=51 \ No newline at end of file +1.10.2=52 \ No newline at end of file