mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
fix merge derp
This commit is contained in:
1 parent
8ad9888d44
commit
3605bcb59c
1 file changed
+1
-3
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user