Merge branch 'master' into betterParametrizers

# Conflicts:
#	src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
#	src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java

5 files changed, 110 insertions, 55 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 33f4840929..4875847fd4 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -143,7 +143,7 @@ public class DreamCraftRecipeLoader implements Runnable {
                         getOrDefault("Trinium",Materials.Osmium).getMolten(1296),
                         Materials.Osmium.getMolten(1296),
                         new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                        Materials.Argon.getGas(576),
+                        Materials.Argon.getGas(1000),
                 }, CustomItemList.eM_Hollow.get(2), 200, 2000000);
 
         //EM Coil
@@ -236,15 +236,15 @@ public class DreamCraftRecipeLoader implements Runnable {
         }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1), 800, 122880);
 
         //Object Holder
-        GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, new ItemStack[]{
+        GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, new Object[]{
                 ItemList.Hatch_Input_Bus_ZPM.get(1),
                 CustomItemList.eM_Computer_Bus.get(1),
                 ItemList.Emitter_ZPM.get(8),
                 ItemList.Robot_Arm_ZPM.get(1),
                 ItemList.Electric_Motor_ZPM.get(2),
-                ItemList.Circuit_Crystalmainframe.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 1)},
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2)},
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16)},
                 CustomItemList.DATApipe.get(2),
         }, new FluidStack[]{
                 Materials.UUMatter.getFluid(500),
@@ -323,12 +323,12 @@ public class DreamCraftRecipeLoader implements Runnable {
         }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1), 800, 122880);
 
         //Quantum Computer
-        GT_Values.RA.addAssemblylineRecipe(ItemList.Tool_DataOrb.get(1), 20000, new ItemStack[]{
+        GT_Values.RA.addAssemblylineRecipe(ItemList.Tool_DataOrb.get(1), 20000, new Object[]{
                 CustomItemList.Machine_Multi_Switch.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2)},
                 ItemList.Tool_DataOrb.get(1),
                 ItemList.Cover_Screen.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8)},
                 CustomItemList.DATApipe.get(8),
         }, new FluidStack[]{
                 Materials.UUMatter.getFluid(1000),
@@ -338,14 +338,14 @@ public class DreamCraftRecipeLoader implements Runnable {
         }, CustomItemList.Machine_Multi_Computer.get(1), 12000, 100000);
 
         //Research Station
-        GT_Values.RA.addAssemblylineRecipe(getItemContainer("ScannerZPM").get(1), 80000, new ItemStack[]{
+        GT_Values.RA.addAssemblylineRecipe(getItemContainer("ScannerZPM").get(1), 80000, new Object[]{
                 CustomItemList.Machine_Multi_Switch.get(1),
                 ItemList.Sensor_ZPM.get(8),
-                ItemList.Circuit_Crystalmainframe.get(4),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 4)},
                 ItemList.Field_Generator_ZPM.get(1),
                 ItemList.Electric_Motor_ZPM.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4),
-                GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32),
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4)},
+                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 32)},
                 CustomItemList.DATApipe.get(16),
         }, new FluidStack[]{
                 Materials.UUMatter.getFluid(1000),
@@ -783,10 +783,10 @@ public class DreamCraftRecipeLoader implements Runnable {
                 48000, 128, 500000, 8,  new ItemStack[]{
                         ItemList.Circuit_Board_Bio_Ultra.get(2L),
                         ItemList.Circuit_Biowarecomputer.get(2L),
-                        ItemList.Circuit_Parts_DiodeSMD.get(48L),
-                        ItemList.Circuit_Parts_ResistorSMD.get(16L),
                         ItemList.Circuit_Parts_TransistorSMD.get(16L),
-                        ItemList.Circuit_Parts_DiodeSMD.get(16L),
+                        ItemList.Circuit_Parts_ResistorSMD.get(16L),
+                        ItemList.Circuit_Parts_CapacitorSMD.get(16L),
+                        ItemList.Circuit_Parts_DiodeSMD.get(48L),
                         ItemList.Circuit_Chip_NOR.get(32L),
                         ItemList.Circuit_Chip_Ram.get(64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L),
@@ -802,8 +802,7 @@ public class DreamCraftRecipeLoader implements Runnable {
                 96000, 256, 1000000, 16,  new ItemStack[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L),
                         ItemList.Circuit_Biowaresupercomputer.get(2L),
-                        ItemList.Circuit_Parts_Coil.get(64L),
-                        ItemList.Circuit_Parts_Coil.get(64L),
+                        ItemList.UV_Coil.get(16L),
                         ItemList.Circuit_Parts_CapacitorSMD.get(64L),
                         ItemList.Circuit_Parts_ResistorSMD.get(64L),
                         ItemList.Circuit_Parts_TransistorSMD.get(64L),
@@ -906,12 +905,12 @@ public class DreamCraftRecipeLoader implements Runnable {
                             ItemList.Electric_Motor_UV.get(64L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
+                            GT_OreDictUnificator.get(OrePrefixes.block, Materials.NetherStar, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L),
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L),
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L),
-                            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 64L),
-                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 64L),
+                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
+                            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
                             getItemContainer("NanoCircuit").get(1L).splitStack(32)
                     },
                     new FluidStack[]{
@@ -940,10 +939,7 @@ public class DreamCraftRecipeLoader implements Runnable {
             //Batteries
             TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Energy_Cluster.get(1L),12000,16,100000,3,new Object[]{
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 64L),
-                    new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
+                    new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4L},
                     ItemList.Energy_Cluster.get(8L),
                     ItemList.Field_Generator_UV.get(2),
                     ItemList.Circuit_Wafer_HPIC.get(64),
@@ -956,11 +952,9 @@ public class DreamCraftRecipeLoader implements Runnable {
             }, ItemList.ZPM2.get(1), 3000, 400000);
 
             TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.ZPM2.get(1L),24000,64,200000,6,new Object[]{
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 64L),
-                    new Object[]{OrePrefixes.circuit, Materials.Bio, 1L},
-                    new Object[]{OrePrefixes.circuit, Materials.Bio, 1L},
-                    new Object[]{OrePrefixes.circuit, Materials.Bio, 1L},
-                    new Object[]{OrePrefixes.circuit, Materials.Bio, 1L},
+                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
+                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
+                    new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4L},
                     ItemList.ZPM2.get(8),
                     ItemList.Field_Generator_UHV.get(4),
                     ItemList.Circuit_Wafer_UHPIC.get(64),
@@ -980,22 +974,22 @@ public class DreamCraftRecipeLoader implements Runnable {
     }
 
     private void register_machine_EM_behaviours(){
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(5),ItemList.Machine_IV_Centrifuge.get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(6),getItemContainer("CentrifugeLuV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(7),getItemContainer("CentrifugeZPM").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(8),getItemContainer("CentrifugeUV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(9),getItemContainer("CentrifugeUHV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(10),getItemContainer("CentrifugeUEV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(11),getItemContainer("CentrifugeUIV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_Centrifuge(12),getItemContainer("CentrifugeUMV").get(1));
-
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(5),ItemList.Machine_IV_ElectromagneticSeparator.get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(6),getItemContainer("ElectromagneticSeparatorLuV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(7),getItemContainer("ElectromagneticSeparatorZPM").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(8),getItemContainer("ElectromagneticSeparatorUV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(9),getItemContainer("ElectromagneticSeparatorUHV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(10),getItemContainer("ElectromagneticSeparatorUEV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(11),getItemContainer("ElectromagneticSeparatorUIV").get(1));
-        GT_MetaTileEntity_EM_machine.registerBehaviour(()->new Behaviour_ElectromagneticSeparator(12),getItemContainer("ElectromagneticSeparatorUMV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(5),ItemList.Machine_IV_Centrifuge.get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(6),getItemContainer("CentrifugeLuV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(7),getItemContainer("CentrifugeZPM").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(8),getItemContainer("CentrifugeUV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(9),getItemContainer("CentrifugeUHV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(10),getItemContainer("CentrifugeUEV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(11),getItemContainer("CentrifugeUIV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_Centrifuge(12),getItemContainer("CentrifugeUMV").get(1));
+
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(5),ItemList.Machine_IV_ElectromagneticSeparator.get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(6),getItemContainer("ElectromagneticSeparatorLuV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(7),getItemContainer("ElectromagneticSeparatorZPM").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(8),getItemContainer("ElectromagneticSeparatorUV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(9),getItemContainer("ElectromagneticSeparatorUHV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(10),getItemContainer("ElectromagneticSeparatorUEV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(11),getItemContainer("ElectromagneticSeparatorUIV").get(1));
+        GT_MetaTileEntity_EM_machine.registerBehaviour(new Behaviour_ElectromagneticSeparator(12),getItemContainer("ElectromagneticSeparatorUMV").get(1));
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
index fc2cc455de..7522a4928c 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
@@ -250,25 +250,82 @@ public class BloodyRecipeLoader implements Runnable {
                 Materials.Tungsten.getMolten(4608),
                 CustomItemList.eM_dynamomulti64_UEV.get(1), 2000, 500000);
 
-        //Energy Hatches  UV-UIV
+        //Energy Hatches 4A-64A  IV-UIV
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                        ItemList.Hatch_Energy_IV.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2)},
+                Materials.Silver.getMolten(144),
+                CustomItemList.eM_energymulti4_IV.get(1), 100, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                        CustomItemList.eM_energymulti4_IV.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4)},
+                Materials.Electrum.getMolten(144),
+                CustomItemList.eM_energymulti16_IV.get(1), 200, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                        CustomItemList.eM_energymulti16_IV.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6)},
+                Materials.Tungsten.getMolten(144),
+                CustomItemList.eM_energymulti64_IV.get(1), 400, 7680);
+
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                ItemList.Hatch_Energy_LuV.get(1),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2)},
+                Materials.Silver.getMolten(288),
+                CustomItemList.eM_energymulti4_LuV.get(1), 100, 30720);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                CustomItemList.eM_energymulti4_LuV.get(1),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4)},
+                Materials.Electrum.getMolten(288),
+                CustomItemList.eM_energymulti16_LuV.get(1), 200, 30720);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                CustomItemList.eM_energymulti16_LuV.get(1),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6)},
+                Materials.Tungsten.getMolten(288),
+                CustomItemList.eM_energymulti64_LuV.get(1), 400, 30720);
+
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                ItemList.Hatch_Energy_ZPM.get(1),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2)},
+                Materials.Silver.getMolten(576),
+                CustomItemList.eM_energymulti4_ZPM.get(1), 100, 122880);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                 CustomItemList.eM_energymulti4_ZPM.get(1),
+                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2),
+                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4)},
+                Materials.Electrum.getMolten(576),
+                CustomItemList.eM_energymulti16_ZPM.get(1), 200, 122880);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+                 CustomItemList.eM_energymulti16_ZPM.get(1),
+                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2),
+                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6)},
+                Materials.Tungsten.getMolten(576),
+                CustomItemList.eM_energymulti64_ZPM.get(1), 400, 122880);
+
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 ItemList.Hatch_Energy_UV.get(1),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2)},
                 Materials.Silver.getMolten(1152),
-                CustomItemList.eM_energymulti4_UV.get(1), 100, 122880);
+                CustomItemList.eM_energymulti4_UV.get(1), 100, 500000);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_energymulti4_UV.get(1),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NaquadahAlloy, 2),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4)},
                 Materials.Electrum.getMolten(1152),
-                CustomItemList.eM_energymulti16_UV.get(1), 200, 122880);
+                CustomItemList.eM_energymulti16_UV.get(1), 200, 500000);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_energymulti16_UV.get(1),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6)},
                 Materials.Tungsten.getMolten(1152),
-                CustomItemList.eM_energymulti64_UV.get(1), 400, 122880);
+                CustomItemList.eM_energymulti64_UV.get(1), 400, 500000);
 
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 ItemList.Hatch_Energy_MAX.get(1),
@@ -344,7 +401,7 @@ public class BloodyRecipeLoader implements Runnable {
                 CustomItemList.DATApipe.get(2),
         }, new FluidStack[]{
                 Materials.UUMatter.getFluid(500),
-                Materials.Iridium.getMolten(1000),
+                Materials.Iridium.getMolten(1152),
                 new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000)
         }, CustomItemList.holder_Hatch.get(1), 1200, 100000);
 
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 da8d70a772..24652296b9 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
@@ -11,6 +11,8 @@ import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pi
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
 import com.github.technus.tectech.thing.metaTileEntity.single.*;
 import cpw.mods.fml.common.Loader;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
@@ -312,6 +314,7 @@ public class MachineLoader implements Runnable {
         hatch_CreativeMaitenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance Hatch", 15).getStackForm(1L));
         Machine_DebugGenny.set(new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 15).getStackForm(1L));
         Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 15).getStackForm(1L));
+        UnusedStuff.set(new ItemStack(Blocks.air));
 
         // ===================================================================================================
         // MetaTE init
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index 206ac9eab3..4e352a7610 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -4,6 +4,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
 import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
@@ -50,7 +51,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
         }
         TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")}, aFluidInputs, null, assDuration, assEUt, 0,true);
-        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( aResearchItem, totalComputationRequired/computationRequiredPerSec, aInputs, aFluidInputs, aOutput, assDuration, assEUt));//todo unfuck
+        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine(CustomItemList.UnusedStuff.get(1), totalComputationRequired/computationRequiredPerSec, aInputs, aFluidInputs, aOutput, assDuration, assEUt));
         return true;
     }
 
@@ -114,8 +115,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
-        GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false,tInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")},aFluidInputs,null,assDuration,assEUt,0,tAlts,true);
-        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( aResearchItem, totalComputationRequired/computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts));
+        GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false,tInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])},aFluidInputs,null,assDuration,assEUt,0,tAlts,true);
+        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( CustomItemList.UnusedStuff.get(1), totalComputationRequired/computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts));
         return true;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 801c46416f..e17766ce5b 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -28,7 +28,7 @@ public enum CustomItemList implements IItemContainer {
     Machine_BuckConverter_IV,Machine_BuckConverter_LuV,Machine_BuckConverter_ZPM,
     Machine_BuckConverter_UV,Machine_BuckConverter_UHV,Machine_BuckConverter_UEV,
     Machine_BuckConverter_UIV,Machine_BuckConverter_UMV, Machine_BuckConverter_UXV,
-    Machine_DebugWriter,Machine_DebugGenny,
+    Machine_DebugWriter,Machine_DebugGenny,UnusedStuff,
     EMpipe, DATApipe, rack_Hatch, holder_Hatch, capacitor_Hatch,
 
     eM_dynamomulti4_IV, eM_dynamomulti16_IV, eM_dynamomulti64_IV,