From 3605bcb59c4cbb06745e13bb6038507acd5fec02 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 29 Oct 2013 18:24:42 -0400 Subject: [PATCH] fix merge derp --- src/tconstruct/util/config/PHConstruct.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 52150566..617c5c3c 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -365,10 +365,8 @@ public class PHConstruct cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}).getIntList(); slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false).getBoolean(false); slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true).getBoolean(true); -<<<<<<< HEAD genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false).getBoolean(false); -======= ->>>>>>> a60fabcd9234f22a17190deceeece12190b00c72 + //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true);