Merge in KekzTech with history

git-subtree-dir: kekztech
git-subtree-mainline: 9bdc1ec39b62c303d6bb295f2cfc565b85c7db77
git-subtree-split: 609aae0684909d782d087ebbb26933866b8f04d1

1 files changed, 43 insertions, 0 deletions

diff --git a/kekztech/src/main/java/common/TileEntities.java b/kekztech/src/main/java/common/TileEntities.java
new file mode 100644
index 0000000000..31246ac5d8
--- /dev/null
+++ b/kekztech/src/main/java/common/TileEntities.java
@@ -0,0 +1,43 @@
+package common;
+
+import common.tileentities.GTMTE_LapotronicSuperCapacitor;
+import common.tileentities.GTMTE_SOFuelCellMK1;
+import common.tileentities.GTMTE_SOFuelCellMK2;
+import common.tileentities.GTMTE_TFFT;
+import common.tileentities.GTMTE_TFFTHatch;
+import common.tileentities.TE_IchorJar;
+import common.tileentities.TE_IchorVoidJar;
+import common.tileentities.TE_ThaumiumReinforcedJar;
+import common.tileentities.TE_ThaumiumReinforcedVoidJar;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class TileEntities {
+
+    // Multiblock controllers
+    public static GTMTE_SOFuelCellMK1 sofc1;
+    public static GTMTE_SOFuelCellMK2 sofc2;
+    public static GTMTE_TFFT tfft;
+    public static GTMTE_LapotronicSuperCapacitor lsc;
+
+    // Singleblocks
+    public static GTMTE_TFFTHatch tfftHatch;
+
+    public static void preInit() {
+        GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
+        GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar");
+        GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
+        GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar");
+    }
+
+    public static void init() {
+        // Multiblock controllers
+        sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");
+        sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");
+        tfft = new GTMTE_TFFT(13104, "multimachine.tfft", "T.F.F.T");
+        lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");
+
+        // Singleblocks
+        tfftHatch = new GTMTE_TFFTHatch(13109, "machine.tffthatch", "T.F.F.T Multi I/O Hatch");
+    }
+}