Merge pull request #5 from Technus/master

update

34 files changed, 1693 insertions, 632 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 2609a81860..00b31915c2 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
@@ -43,7 +43,7 @@ public class DreamCraftRecipeLoader implements Runnable {
         try {
             ADD_ASSEMBLER_RECIPE.invoke(GT_Values.RA, items, fluid, output, time, eut, true);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to add clean room assembler recipe! " +output.getDisplayName(),e);
+            throw new RuntimeException("Failed to add clean room assembler recipe! " + output.getDisplayName(), e);
         }
     }
     //endregion
@@ -269,9 +269,9 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_LuV_IV.get(1), 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, 1920);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_LuV_IV").get(1), 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, 1920);
 
-        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,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2)}, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 7680);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4)}, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 7680);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_ZPM_LuV").get(1), CustomItemList.eM_energyMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6)}, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.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, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2)}, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4)}, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_ZPM_LuV").get(1), CustomItemList.eM_energyMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6)}, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 7680);
 
         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, 30720);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_UV_ZPM.get(1), 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, 30720);
@@ -294,9 +294,9 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_energyMulti64_UIV.get(1), 400, 8000000);
 
         //Buck Converter IV-UIV
-        if(Loader.isModLoaded("bartworks")) {
+        if (Loader.isModLoaded("bartworks")) {
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 2)}, Materials.TungstenSteel.getMolten(288), CustomItemList.Machine_BuckConverter_IV.get(1), 100, 7680);
-            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 3)},  new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), 100, 30720);
+            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 3)}, new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), 100, 30720);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 4)}, Materials.Iridium.getMolten(288), CustomItemList.Machine_BuckConverter_ZPM.get(1), 100, 122880);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 5)}, Materials.Osmium.getMolten(288), CustomItemList.Machine_BuckConverter_UV.get(1), 100, 500000);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 4L, 5)}, Materials.Neutronium.getMolten(288), CustomItemList.Machine_BuckConverter_UHV.get(1), 100, 2000000);
@@ -560,7 +560,7 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 getItemContainer("WetTransformer_ZPM_LuV").get(1),
                 getItemContainer("HighEnergyFlowCircuit").get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV",Materials.Superconductor), 16),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV", Materials.Superconductor), 16),
                 ItemList.valueOf("Circuit_Chip_UHPIC").get(2),
         }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1), 400, 30720);
 
@@ -608,48 +608,48 @@ public class DreamCraftRecipeLoader implements Runnable {
         //Matter Junction
         TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_Switch.get(1),
                 8000, 32, 500000, 4, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Robot_Arm_LuV.get(2),
-                ItemList.Electric_Piston_LuV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Robot_Arm_LuV.get(2),
+                        ItemList.Electric_Piston_LuV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(2),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000);
 
         //Matter Quantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Input_UV.get(1),
                 12000, 32, 500000, 6, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Emitter_UV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Emitter_UV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000);
 
         //Matter DeQuantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Output_UV.get(1),
                 12000, 32, 500000, 6, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Sensor_UV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Sensor_UV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000);
 
         //Essentia Quantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_MatterToEM.get(1),
@@ -1190,67 +1190,86 @@ public class DreamCraftRecipeLoader implements Runnable {
                             Materials.Concrete.getMolten(73728L)
                     },
                     getItemContainer("StargateFramePart").get(1L), 72000, 2000000);
-            //Deep Dark Portal
-            TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0),
-                    16777216, 2048, 2000000, 64, new Object[]{
-                    GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7),
-                    GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0),
-                    ItemList.Robot_Arm_UEV.get(4),
-                    ItemList.Emitter_UEV.get(4),
-                    ItemList.Sensor_UEV.get(4),
-            }, new FluidStack[]{
-                    new FluidStack(FluidRegistry.getFluid("oganesson"), 50000),
-                    Materials.Infinity.getMolten(9216L),
-                    Materials.Cheese.getMolten(232000L),
-            }, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000);
-
-
-            //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},
-                    ItemList.Energy_Cluster.get(8L),
-                    ItemList.Field_Generator_UV.get(2),
-                    ItemList.Circuit_Wafer_HPIC.get(64),
-                    ItemList.Circuit_Wafer_HPIC.get(64),
-                    ItemList.Circuit_Parts_DiodeASMD.get(32),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 32),
-            }, new FluidStack[]{
-                    Materials.SolderingAlloy.getMolten(2880),
-                    new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
-            }, 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, 32L),
-                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
-                    new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
-                    ItemList.ZPM2.get(8),
-                    ItemList.Field_Generator_UHV.get(4),
-                    ItemList.Circuit_Wafer_UHPIC.get(64),
-                    ItemList.Circuit_Wafer_UHPIC.get(64),
-                    ItemList.Circuit_Wafer_SoC2.get(32),
-                    ItemList.Circuit_Parts_DiodeASMD.get(64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
-            }, new FluidStack[]{
-                    Materials.SolderingAlloy.getMolten(3760),
-                    Materials.Naquadria.getMolten(9216),
-                    new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)
-            }, ItemList.ZPM3.get(1), 4000, 1600000);
         }
         //endregion
+        
+        //Deep Dark Portal
+        TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0),
+        		16777216, 2048, 2000000, 64, new Object[]{
+                    	GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7),
+                    	GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0),
+                    	GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
+                    	new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                    	new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                    	new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                    	new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                    	GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0),
+                    	ItemList.Robot_Arm_UEV.get(4),
+                    	ItemList.Emitter_UEV.get(4),
+                    	ItemList.Sensor_UEV.get(4),
+            	}, new FluidStack[]{
+            			new FluidStack(FluidRegistry.getFluid("oganesson"), 50000),
+            			Materials.Infinity.getMolten(9216L),
+            			Materials.Cheese.getMolten(232000L),
+            	}, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000);
+
+        //Debug maintenance hatch
+        TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_AutoMaintenance.get(1L),
+                2764800, 128, 500000, 6, new Object[]{
+                		ItemList.Hatch_AutoMaintenance.get(1L),
+                		ItemList.Robot_Arm_UV.get(1L),
+                		ItemList.Electric_Pump_UV.get(1L),
+                		ItemList.Conveyor_Module_UV.get(1L),
+                		new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 4L},
+                		ItemList.Energy_LapotronicOrb2.get(1L),
+                		ItemList.Duct_Tape.get(64L),
+                		ItemList.Duct_Tape.get(64L),
+                		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L),
+        		}, new FluidStack[]{
+        				Materials.Lubricant.getFluid(256000),
+        				Materials.SolderingAlloy.getMolten(1296L),
+        		}, CustomItemList.hatch_CreativeMaintenance.get(1), 6000, 500000);
+
+        //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},
+                ItemList.Energy_Cluster.get(8L),
+                ItemList.Field_Generator_UV.get(2),
+                ItemList.Circuit_Wafer_HPIC.get(64),
+                ItemList.Circuit_Wafer_HPIC.get(64),
+                ItemList.Circuit_Parts_DiodeASMD.get(32),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 32),
+        }, new FluidStack[]{
+                Materials.SolderingAlloy.getMolten(2880),
+                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)
+        }, 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, 32L),
+                GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+                ItemList.ZPM2.get(8),
+                ItemList.Field_Generator_UHV.get(4),
+                ItemList.Circuit_Wafer_UHPIC.get(64),
+                ItemList.Circuit_Wafer_UHPIC.get(64),
+                ItemList.Circuit_Wafer_SoC2.get(32),
+                ItemList.Circuit_Parts_DiodeASMD.get(64),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
+        }, new FluidStack[]{
+                Materials.SolderingAlloy.getMolten(3760),
+                Materials.Naquadria.getMolten(9216),
+                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)
+        }, ItemList.ZPM3.get(1), 4000, 1600000);
+        
 
+        
         //region singleblocks
 
         //Tesla Transceiver LV 1A
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java
index 1376049f5a..880113073c 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java
@@ -2,9 +2,11 @@ package com.github.technus.tectech.loader.thing;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_EnderFluidLink;
+import com.github.technus.tectech.thing.cover.GT_Cover_TM_PowerPassUpgrade;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate;
 import com.github.technus.tectech.thing.item.EnderFluidLinkCover;
+import com.github.technus.tectech.thing.item.PowerPassUpgradeCover;
 import com.github.technus.tectech.thing.item.TeslaCoilCover;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -19,10 +21,12 @@ public class CoverLoader implements Runnable {
         final IIconContainer TESLA_OVERLAY = new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY");
         final IIconContainer TESLA_OVERLAY_ULTIMATE = new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY_ULTIMATE");
         final IIconContainer ENDERFLUIDLINK_OVERLAY = new Textures.BlockIcons.CustomIcon("iconsets/ENDERFLUIDLINK_OVERLAY");
+        final IIconContainer POWERPASSUPGRADE_OVERLAY = new Textures.BlockIcons.CustomIcon("iconsets/POWERPASSUPGRADE_OVERLAY");
 
         GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1, 0), new GT_RenderedTexture(TESLA_OVERLAY), new GT_Cover_TM_TeslaCoil());
         GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1, 1), new GT_RenderedTexture(TESLA_OVERLAY_ULTIMATE), new GT_Cover_TM_TeslaCoil_Ultimate());
         GregTech_API.registerCover(new ItemStack(EnderFluidLinkCover.INSTANCE, 1, 0), new GT_RenderedTexture(ENDERFLUIDLINK_OVERLAY), new GT_Cover_TM_EnderFluidLink());
+        GregTech_API.registerCover(new ItemStack(PowerPassUpgradeCover.INSTANCE, 1, 0), new GT_RenderedTexture(POWERPASSUPGRADE_OVERLAY), new GT_Cover_TM_PowerPassUpgrade());
         TecTech.LOGGER.info("Cover functionality registered");
     }
 }
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 8a46732e66..0bf8c57f24 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
@@ -664,7 +664,7 @@ public class MachineLoader implements Runnable {
         // ===================================================================================================
         Machine_DebugPollutor.set(new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 15).getStackForm(1));
         hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 15).getStackForm(1));
-        hatch_CreativeMaintenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance Hatch", 15).getStackForm(1L));
+        hatch_CreativeMaintenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Auto-Taping 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));
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index 6fa0ba2bb3..4adeeec315 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -61,6 +61,7 @@ public class ThingsLoader implements Runnable {
         TeslaCoilCover.run();
         TeslaCoilCapacitor.run();
         EnderFluidLinkCover.run();
+        PowerPassUpgradeCover.run();
         TecTech.LOGGER.info("Useful Items registered");
 
         TeslaCoilComponent.run();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index 0beb5e0af8..dd388bc233 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -233,23 +233,32 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
             ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
             NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair);
             NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
+            boolean saveRequired = false;
             if(player.capabilities.isCreativeMode){
-                playerTag.setDouble(SPACE_CANCER, 0);
+                if (playerTag.getDouble(SPACE_CANCER) != 0) {
+                    playerTag.setDouble(SPACE_CANCER, 0);
+                    saveRequired = true;
+                }
             }else {
                 if (compound != null) {
                     int badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE);
                     if (badness > 0) {
                         playerTag.setDouble(SPACE_CANCER, Math.min(2, playerTag.getDouble(SPACE_CANCER) + 9.765625E-4f * badness));
                         player.attackEntityFrom(MainLoader.subspace,Math.max(1,badness/8f));
+                        saveRequired = true;
                     }
                 } else if (playerTag.getDouble(SPACE_CANCER) > 0 && !player.isDead) {
-                    if (playerTag.getDouble(SPACE_CANCER) == 0 || player.ticksExisted % 10 != 0)
-                        return;
-                    playerTag.setDouble(SPACE_CANCER, Math.max(0, playerTag.getDouble(SPACE_CANCER) - 7.6293945E-5f));
+                    if (player.ticksExisted % 10 == 0) {
+                        playerTag.setDouble(SPACE_CANCER, Math.max(0, playerTag.getDouble(SPACE_CANCER) - 7.6293945E-5f));
+                        saveRequired = true;
+                    }
                 }
             }
-            TecTech.playerPersistence.saveData(player);