manual merges of up to 9a578fc

This commit is contained in:
Progwml6 committed 2013-12-11 23:47:07 -05:00
1 parent 655780cc0c
commit 0c9c8100ad
21 files changed
+218 -56

No files matched your search

@@ -113,6 +113,9 @@ public class TRepo
public static Block castingChannel;
public static Block metalBlock;
public static Block tankAir;
public static Block smelteryNether;
public static Block lavaTankNether;
public static Block searedBlockNether;
public static Block dryingRack;
@@ -217,6 +220,7 @@ public class TRepo
public static Block slimeChannel;
public static Block slimePad;
public static Block bloodChannel;
//Glue
public static Fluid glueFluid;