manual update of all master commits up to ca86fa8

This commit is contained in:
Progwml6 committed 2013-11-25 14:08:18 -05:00
1 parent 14d357ccf6
commit 983c91c2c9
48 files changed
+680 -158

No files matched your search

@@ -133,7 +133,9 @@ public class PHConstruct
moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216);
blood = config.getBlock("Liquid Cow", 3217).getInt(3217);
moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218);
glueBlock = config.getBlock("Glue Block", 3219).getInt(3219);
glueFluidBlock = config.getBlock("Glue Fluid Block", 3220).getInt(3220);
// signalBus = config.getBlock("Signal Bus", 3221).getInt(3221);
// signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222);
@@ -162,7 +164,6 @@ public class PHConstruct
woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245);
glueBlock = config.getBlock("Glue Block", 3256).getInt(3256);
castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249);
slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);
@@ -486,6 +487,10 @@ public class PHConstruct
public static int slimeChannel;
public static int slimePad;
// Glue
public static int glueFluidBlock;
public static int glueBlock;
//Decoration
public static int stoneTorch;
public static int stoneLadder;
@@ -497,7 +502,6 @@ public class PHConstruct
public static int meatBlock;
public static int woolSlab1;
public static int woolSlab2;
public static int glueBlock;
//Patterns and misc
public static int blankPattern;
@@ -717,6 +721,7 @@ public class PHConstruct
//Looks
public static int connectedTexturesMode;
public static File cfglocation;
//dimensionblacklist
public static boolean slimeIslGenDim0Only;
public static int[] cfgDimBlackList;