Merge in KekzTech with history

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

125 files changed, 6091 insertions, 0 deletions

diff --git a/kekztech/src/main/java/client/ClientProxy.java b/kekztech/src/main/java/client/ClientProxy.java
new file mode 100644
index 0000000000..9dfaea0d33
--- /dev/null
+++ b/kekztech/src/main/java/client/ClientProxy.java
@@ -0,0 +1,19 @@
+package client;
+
+import common.CommonProxy;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class ClientProxy extends CommonProxy {
+
+    @Override
+    public void preInit(final FMLPreInitializationEvent e) {
+        super.preInit(e);
+    }
+
+    @Override
+    public void init(final FMLInitializationEvent e) {
+        super.init(e);
+    }
+}
diff --git a/kekztech/src/main/java/client/gui/KT_UITextures.java b/kekztech/src/main/java/client/gui/KT_UITextures.java
new file mode 100644
index 0000000000..6f28a0280b
--- /dev/null
+++ b/kekztech/src/main/java/client/gui/KT_UITextures.java
@@ -0,0 +1,17 @@
+package client.gui;
+
+import com.gtnewhorizons.modularui.api.drawable.UITexture;
+
+import kekztech.KekzCore;
+
+public class KT_UITextures {
+
+    public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture
+        .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_on");
+
+    public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF = UITexture
+        .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off");
+
+    public static final UITexture OVERLAY_BUTTON_WIRELESS_OFF_DISABLED = UITexture
+        .fullImage(KekzCore.MODID, "gui/overlay_button/wireless_off_disabled");
+}
diff --git a/kekztech/src/main/java/common/Blocks.java b/kekztech/src/main/java/common/Blocks.java
new file mode 100644
index 0000000000..4003e8e9e4
--- /dev/null
+++ b/kekztech/src/main/java/common/Blocks.java
@@ -0,0 +1,59 @@
+package common;
+
+import net.minecraft.block.Block;
+
+import common.blocks.Block_GDCUnit;
+import common.blocks.Block_IchorJar;
+import common.blocks.Block_LapotronicEnergyUnit;
+import common.blocks.Block_LargeHexPlate;
+import common.blocks.Block_TFFTStorageField;
+import common.blocks.Block_ThaumiumReinforcedJar;
+import common.blocks.Block_YSZUnit;
+
+import kekztech.KekzCore;
+
+public class Blocks {
+
+    public static Block yszUnit;
+    public static Block gdcUnit;
+    public static Block tfftStorageField;
+    public static Block jarThaumiumReinforced;
+    public static Block jarIchor;
+    public static Block lscLapotronicEnergyUnit;
+
+    public static Block largeHexPlate;
+
+    public static void preInit() {
+        KekzCore.LOGGER.info("Registering blocks...");
+
+        registerBlocks_SOFC();
+        registerBlocks_TFFT();
+        registerBlocks_Jars();
+        registerBlocks_LSC();
+        registerBlocks_Cosmetics();
+
+        KekzCore.LOGGER.info("Finished registering blocks");
+    }
+
+    private static void registerBlocks_SOFC() {
+        yszUnit = Block_YSZUnit.registerBlock();
+        gdcUnit = Block_GDCUnit.registerBlock();
+    }
+
+    private static void registerBlocks_TFFT() {
+        tfftStorageField = Bloc