Merge b2a2166e2c9086b0e5678d9088522437fe6af607 into 44fbc83f2e41def4a911eca26af0ee76a1b99962

111 files changed, 85082 insertions, 2776 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index 2232f98c3a..b8a7280196 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.204:dev')
+    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.209:dev')
     compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev')
     compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
     compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev')
@@ -10,6 +10,11 @@ dependencies {
     compile('com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev')
     compile('com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev')
     compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+    compile('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.26:dev')
+
+    // todo To remove, for testing only.
+    compile('com.github.GTNewHorizons:ExtraCells2:2.5.28:dev')
+    compile('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.40-gtnh:dev')
 
     compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.4-GTNH:dev') {transitive=false}
@@ -19,4 +24,5 @@ dependencies {
     compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false}
     compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
+
 }
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/