From 072e3a693b87da2376f5ed0ad31cef4b3bfc8cbd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 15:05:27 -0500 Subject: [PATCH] Fix extended state blocks shitting themselves --- build.properties | 2 +- .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 2 +- src/main/java/vazkii/botania/common/lib/LibMisc.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 6d983de6e..66c94f169 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jul 29 18:40:22 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2041 +forge_version=12.18.1.2042 mc_version=1.10.2 dir_repo=./ build_number=315 diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index e6ffa1476..47e96c45c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -174,7 +174,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I if (meta > 15) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 5022e29bf..89db6d30a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2034,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2042,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json";