Merge pull request #132 from GTNewHorizons/CelestialThingy

Eye of Harmony

112 files changed, 85926 insertions, 284 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index a989d71b7d..fc80700899 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.254:dev')
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.259-pre: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/repositories.gradle b/repositories.gradle
index bb2c605d5c..f1347fd90f 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -33,6 +33,5 @@ repositories {
         content {
             includeGroup 'curse.maven'
         }
-
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 6640949617..158f10da25 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;
@@ -34,7 +36,9 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
 import java.util.Iterator;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
+import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
 
 @Mod(
         modid = Reference.MODID,
@@ -209,6 +213,7 @@ public class TecTech {
 
         Ma