Merge b2a2166e2c9086b0e5678d9088522437fe6af607 into 44fbc83f2e41def4a911eca26af0ee76a1b99962

110 files changed, 85075 insertions, 2775 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 6640949617..cd51a532d3 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -19,7 +19,9 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData;
+import com.github.technus.tectech.nei.IMCForNEI;
 import com.github.technus.tectech.proxy.CommonProxy;
+import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage;
 import com.github.technus.tectech.util.XSTR;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
@@ -209,6 +211,7 @@ public class TecTech {
 
         MainLoader.load(definitionsRegistry);
         MainLoader.addAfterGregTechPostLoadRunner();
+        IMCForNEI.IMCSender();
     }
 
     @Mod.EventHandler
@@ -231,9 +234,14 @@ public class TecTech {
         }
     }
 
+    public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null;
+
     @Mod.EventHandler
     public void onServerAboutToStart(FMLServerAboutToStartEvent aEvent) {
         chunkDataHandler.clearData();
         playerPersistence.clearData();
+
+        // This must be done after game load otherwise it fails.
+        eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
index f69941cb63..c27fd95bd3 100644
--- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
@@ -46,6 +46,7 @@ public class TecTechConfig extends ConfigManager {
      */
     @Override
     protected void PreInit() {
+
         DISABLE_MATERIAL_LOADING_FFS = false;
 
         BOOM_ENABLE = true;
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 436c806da2..89230fa4e1 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -844,8 +844,8 @@ public class MachineLoader implements Runnable {
         Machine_Multi_Annihilation.set(
                 new GT_MetaTileEntity_EM_annihilation(15405, "multimachine.em.annihilation", "Annihilation Generator")
                         .getStackForm(1L));
-        Machine_Multi_BHG.set(
-                new GT_MetaTileEntity_EM_bhg(15410, "multimachine.em.blackholegenerator", "Black Hole Generator")
+        Machine_Multi_EyeOfHarmony.set(
+                new GT_MetaTileEntity_EM_EyeOfHarmony(15410, "multimachine.em.eye_of_harmony", "Eye of Harmony")
                         .getStackForm(1L));
 
         // ============================================================================================