+ More Cyclotron Work.

+ Added Better Accelerator Tooltip.

34 files changed, 675 insertions, 717 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 18ba3ad097..d6f2472fd0 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -72,6 +72,7 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialSifter.run();
 			GregtechSimpleWasher.run();
 			GregtechRTG.run();
+			GregtechCyclotron.run();
 			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index 34568f60bd..e0f94036a7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -1,5 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
+import static gregtech.api.enums.GT_Values.V;
+
+import java.util.*;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -9,6 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.block.Block;
@@ -20,12 +25,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import static gregtech.api.enums.GT_Values.V;
-
 public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
 
 	public static String[] BlacklistedTileEntiyClassNames;
@@ -68,7 +67,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
 				String.format("Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)", mTier,
 						getEnergyDemand(mTier, false), mAccelerateStatic[mTier]),
 				"Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it",
-				"This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" };
+				"This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand", CORE.GT_Tooltip};
+		
 	}
 
 	public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
index 48ef351679..7d2de70c9c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.enums.Dyes;
-import gregtech.api.enums.Textures;
+import gregtech.api.enums.*;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
@@ -37,7 +36,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
 
     @Override
 	public long maxEUStore() {
-        return (640010000L/4) * (Math.min(16, this.mEnergyHatches.size())) / 16L;
+        return Integer.MAX_VALUE;
     }
 
     @Override
@@ -167,21 +166,21 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
     }
 
     private boolean addIfEnergyInjector(int aX, int aY, int aZ, IGregTechTileEntity aBaseMetaTileEntity) {
-        if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
     }
 
     private boolean addIfInjector(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) {
-        if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
     }
 
     private boolean addIfExtractor(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) {
-        if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) {
+        if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) {
             return true;
         }
         return isAdvancedMachineCasing(aX, aY, aZ);
@@ -218,14 +217,14 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
         		"------------------------------------------------------------",
         		"Particles are accelerated over 186 revolutions to 80% light speed",
         		"Can produce a continuous beam current of 2.2 mA at 590 MeV",
-        		"Which will be extracted from the Isochronous cyclotron",
+        		"Which will be extracted from the Isochronous Cyclotron",
         		"------------------------------------------------------------",
         		"Consists of the same layout as a Fusion Reactor",
         		"Cyclotron Machine Casings around Cyclotron Coil Blocks", 
         		"2-16 Input Hatches", 
         		"1-16 Output Hatches", 
         		"1-16 Energy Hatches", 
-        		"All Hatches must be ZPM or better"};
+        		"All Hatches must be LuV or better"};
     }
 
     @Override
@@ -304,8 +303,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo
         return new String[]{
                 "COMET - Compact Cyclotron MK "+tier,
                 "EU Required: "+powerRequired+"EU/t",
-                "Stored EU: "+mEUStore+" / "+maxEUStore(),
-                "Plasma Output: "+plasmaOut+"L/t"};
+                "Stored EU: "+mEUStore+" / "+maxEUStore()};
     }
 
     @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index dec1d3f746..3bbdd48a0a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -9,14 +9,12 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_Aut
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_ThermalBoiler;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*;
 
-public class Gregtech4Content
-{
+public class Gregtech4Content {
 
-	//ID Range 828, 829, 833 - 850
+	// ID Range 828, 829, 833 - 850
 
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			workbenches();
 			thermalBoiler();
 			multiCrafter();
@@ -25,40 +23,57 @@ public class Gregtech4Content
 		}
 	}
 
-	private static void workbenches(){
-		//Gregtech 4 Workbenches
+	private static void workbenches() {
+		// Gregtech 4 Workbenches
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches.");
-		//Free	//GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L));
-		//Free	//GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L));
+		// Free //GregtechItemList.GT4_Workbench_Bronze.set(new
+		// GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze",
+		// "Bronze Workbench", 0).getStackForm(1L));
+		// Free //GregtechItemList.GT4_Workbench_Advanced.set(new
+		// GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced",
+		// "Advanced Workbench", 1).getStackForm(1L));
 	}
-	
 
-	private static void tesseracts(){
-		//Gregtech 4 Tesseracts
+	private static void tesseracts() {
+		// Gregtech 4 Tesseracts
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts.");
-		GregtechItemList.GT4_Tesseract_Generator.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4).getStackForm(1L));
-		GregtechItemList.GT4_Tesseract_Terminal.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4).getStackForm(1L));
+		GregtechItemList.GT4_Tesseract_Generator
+				.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4)
+						.getStackForm(1L));
+		GregtechItemList.GT4_Tesseract_Terminal
+				.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4)
+						.getStackForm(1L));
 	}
-	
-	private static void shelves(){
-		//Gregtech 4 Shelves
+
+	private static void shelves() {
+		// Gregtech 4 Shelves
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Shelves.");
-		GregtechItemList.GT4_Shelf.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Iron.set(new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Stores Books & Things").getStackForm(1L));
-	    GregtechItemList.GT4_Shelf_Desk.set(new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things").getStackForm(1L));
-		}
+		GregtechItemList.GT4_Shelf
+				.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Iron.set(
+				new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet",
+				"File Cabinet", "Stores Books & Things").getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Desk.set(
+				new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things")
+						.getStackForm(1L));
+		GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment",
+				"Compartment", "Stores Books & Things").getStackForm(1L));
+	}
 
-	private static void thermalBoiler(){
-		//Gregtech 4 Thermal Boiler
+	private static void thermalBoiler() {
+		// Gregtech 4 Thermal Boiler
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler.");
-		GregtechItemList.GT4_Thermal_Boiler.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
+		GregtechItemList.GT4_Thermal_Boiler
+				.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
 	}
-	
-	private static void multiCrafter(){
-		//Gregtech 4 Multiblock Auto-Crafter
+
+	private static void multiCrafter() {
+		// Gregtech 4 Multiblock Auto-Crafter
 		Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
-		GregtechItemList.GT4_Multi_Crafter.set(new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
+		GregtechItemList.GT4_Multi_Crafter.set(
+				new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index ea1279126d..0ac4379e7e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -14,95 +14,85 @@ import net.minecraft.item.ItemStack;
 public class GregtechAdvancedBoilers {
 
 	public static void run() {
-		if (LoadedMods.Gregtech){
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Advanced Boilers.");
 			run1();
 		}
 	}
 
-	private static void run1(){
-		//Boilers
-		GregtechItemList.Boiler_Advanced_LV.set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_MV.set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_HV.set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
-		
-		
-		ItemStack chassisT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
-		ItemStack chassisT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
-		ItemStack chassisT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
+	private static void run1() {
+		// Boilers
+		GregtechItemList.Boiler_Advanced_LV
+				.set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_MV
+				.set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_HV
+				.set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
 
+		ItemStack chassisT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				0, 1);
+		ItemStack chassisT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				1, 1);
+		ItemStack chassisT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1",
+				2, 1);
 
-		//Make the Coil in each following recipe a hammer and a Screwdriver.
+		// Make the Coil in each following recipe a hammer and a Screwdriver.
 
-		
-		//Chassis Recipes
-		GT_ModHandler.addCraftingRecipe(
-		chassisT1,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_ULV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.Bronze),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Primitive),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Lead),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Copper)});
+		// Chassis Recipes
+		GT_ModHandler.addCraftingRecipe(chassisT1,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Copper) });
 
-		GT_ModHandler.addCraftingRecipe(
-		chassisT2,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_LV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.Steel),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Steel),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Bronze)});
+		GT_ModHandler.addCraftingRecipe(chassisT2,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Bronze) });
 
-		GT_ModHandler.addCraftingRecipe(
-		chassisT3,
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"WCW", "GMG", "WPW",
-			Character.valueOf('M'), ItemList.Hull_MV,
-			Character.valueOf('P'), OrePrefixes.pipeLarge.get(Materials.StainlessSteel),
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
-			Character.valueOf('W'), OrePrefixes.plate.get(Materials.Aluminium),
-			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Steel)});
+		GT_ModHandler.addCraftingRecipe(chassisT3,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+						OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+						OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('G'),
+						OrePrefixes.pipeSmall.get(Materials.Steel) });
 
-		
 		ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1);
 		ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1);
 		ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1);
-		
-		//Boiler Recipes
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_LV,
-			Character.valueOf('P'), pipeTier1,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
-			Character.valueOf('W'), chassisT1,
-			Character.valueOf('G'), OrePrefixes.gear.get(Materials.Steel)});
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_MV,
-			Character.valueOf('P'), pipeTier2,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
-			Character.valueOf('W'), chassisT2,
-			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
+		// Boiler Recipes
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+						pipeTier1, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
+						Character.valueOf('W'), chassisT1, Character.valueOf('G'),
+						OrePrefixes.gear.get(Materials.Steel) });
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"dCw", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_HV,
-			Character.valueOf('P'), pipeTier3,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
-			Character.valueOf('W'), chassisT3,
-			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+						pipeTier2, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
+						Character.valueOf('W'), chassisT2, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
+
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+						pipeTier3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
+						Character.valueOf('W'), chassisT3, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
 
-		
 	}
-	
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
index 44b10d81cf..193ab09b4b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
@@ -6,15 +6,17 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaT
 
 public class GregtechCyclotron {
 
-	public static void run(){
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering COMET Cyclotron.");
 			run1();
 		}
 	}
 
-	private static void run1(){
-		GregtechItemList.COMET_Cyclotron.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6).getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.COMET_Cyclotron
+				.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6)
+						.getStackForm(1L));
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 63621c627e..aed701d6cd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -14,11 +14,9 @@ import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
-public class GregtechDehydrator
-{
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+public class GregtechDehydrator {
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
 			if (CORE.configSwitches.enableMachine_Dehydrators) {
 				run1();
@@ -27,79 +25,49 @@ public class GregtechDehydrator
 
 	}
 
-	private static void run1()
-	{
+	private static void run1() {
 
 		/*
-
-		 public GT_MetaTileEntity_BasicMachine_GT_Recipe(
-		  int aID, String aName, String aNameRegional, int aTier,
-		  String aDescription,
-		  GT_Recipe_Map aRecipes,
-		  int aInputSlots, int aOutputSlots,
-		  int aTankCapacity,
-		  int aGUIParameterA, int aGUIParameterB,
-		  String aGUIName, String aSound,
-		  boolean aSharedTank, boolean aRequiresFluidForFiltering,
-		  int aSpecialEffect,
-		  String aOverlays,
-		  Object[] aRecipe) {
-
+		 * 
+		 * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String
+		 * aName, String aNameRegional, int aTier, String aDescription,
+		 * GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int
+		 * aTankCapacity, int aGUIParameterA, int aGUIParameterB, String
+		 * aGUIName, String aSound, boolean aSharedTank, boolean
+		 * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays,
+		 * Object[] aRecipe) {
+		 * 
 		 */
 
-		GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4,
-				"This dehydrates your Grapes into Raisins. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5,
-				"A hangover is the way your body reacts to dehydration. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6,
-				"You could probably make space icecream with this.. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
-		GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
-				816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7,
-				"You can definitely make space icecream with this.. "+CORE.GT_Tooltip,
-				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
-				2, 9,
-				10000,
-				2, 5,
-				"Dehydrator.png", "",
-				false, false,
-				0,
-				"UNBOXINATOR",
-				null).getStackForm(1L));
+		GregtechItemList.GT_Dehydrator_EV
+				.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01",
+						"Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip,
+						Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+						"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
+		GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(814,
+				"advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5,
+				"A hangover is the way your body reacts to dehydration. " + CORE.GT_Tooltip,
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
+		GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(815,
+				"advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6,
+				"You could probably make space icecream with this.. " + CORE.GT_Tooltip,
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
+		GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(816,
+				"advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7,
+				"You can definitely make space icecream with this.. " + CORE.GT_Tooltip,
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "",
+				false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
 
-		ItemStack coilWire1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4);
-		ItemStack coilWire2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4);
-		ItemStack coilWire3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4);
-		ItemStack coilWire4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4);
+		ItemStack coilWire1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0,
+				4);
+		ItemStack coilWire2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1,
+				4);
+		ItemStack coilWire3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2,
+				4);
+		ItemStack coilWire4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3,
+				4);
 		ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1);
 		ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1);
 		ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1);
@@ -108,78 +76,49 @@ public class GregtechDehydrator
 		ItemStack spoolT2 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumSteel", 1);
 		ItemStack spoolT3 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumStainlessSteel", 1);
 		ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1);
-		
-		//Make some coils by wrapping wire around a spool.
-		GT_Values.RA.addAssemblerRecipe(
-				coilWire1,
-				spoolT1,
-				coilT1,
-				8*20,
-				120);
-		GT_Values.RA.addAssemblerRecipe(
-				coilWire2,
-				spoolT2,
-				coilT2,
-				8*20,
-				240);
-		GT_Values.RA.addAssemblerRecipe(
-				coilWire3,
-				spoolT3,
-				coilT3,
-				8*20,
-				480);
-		GT_Values.RA.addAssemblerRecipe(
-				coilWire4,
-				spoolT4,
-				coilT4,
-				8*20,
-				960);		
-		
-		
-		//Add recipes for the Dehydrators.
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"ECE", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_EV,
-			Character.valueOf('P'), ItemList.Robot_Arm_EV,
-			Character.valueOf('E'), coilT1,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
-			Character.valueOf('G'), ALLOY.TUMBAGA.getGear(1)});
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.GT_Dehydrator_IV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"ECE", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_IV,
-			Character.valueOf('P'), ItemList.Robot_Arm_IV,
-			Character.valueOf('E'), coilT2,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite),
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
-			Character.valueOf('G'), ALLOY.INCONEL_690.getGear(1)});
+		// Make some coils by wrapping wire around a spool.
+		GT_Values.RA.addAssemblerRecipe(coilWire1, spoolT1, coilT1, 8 * 20, 120);
+		GT_Values.RA.addAssemblerRecipe(coilWire2, spoolT2, coilT2, 8 * 20, 240);
+		GT_Values.RA.addAssemblerRecipe(coilWire3, spoolT3, coilT3, 8 * 20, 480);
+		GT_Values.RA.addAssemblerRecipe(coilWire4, spoolT4, coilT4, 8 * 20, 960);
+
+		// Add recipes for the Dehydrators.
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+						ItemList.Robot_Arm_EV, Character.valueOf('E'), coilT1, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'),
+						ALLOY.TUMBAGA.getGear(1) });
+
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_IV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+						ItemList.Robot_Arm_IV, Character.valueOf('E'), coilT2, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'),
+						ALLOY.INCONEL_690.getGear(1) });
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"ECE", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_LuV,
-			Character.valueOf('P'), CI.robotArm_LuV,
-			Character.valueOf('E'), coilT3,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master),
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Naquadah),
-			Character.valueOf('G'), ALLOY.HASTELLOY_N.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+						CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Naquadah), Character.valueOf('G'),
+						ALLOY.HASTELLOY_N.getGear(1) });
 
-		GT_ModHandler.addCraftingRecipe(
-		GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]),
-		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-		new Object[]{"ECE", "WMW", "GPG",
-			Character.valueOf('M'), ItemList.Hull_ZPM,
-			Character.valueOf('P'), CI.robotArm_ZPM,
-			Character.valueOf('E'), coilT4,
-			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate),
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Osmium),
-			Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('P'),
+						CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Osmium), Character.valueOf('G'),
+						ALLOY.ZERON_100.getGear(1) });
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index b7b89d4aba..a81e29bb77 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -13,9 +13,8 @@ import net.minecraft.item.ItemStack;
 
 public class GregtechGeothermalThermalGenerator {
 
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
 			if (CORE.configSwitches.enableMachine_GeothermalEngines) {
 				run1();
@@ -24,43 +23,42 @@ public class GregtechGeothermalThermalGenerator {
 
 	}
 
-	private static void run1(){
-		GregtechItemList.Geothermal_Engine_EV.set(new GregtechMetaTileEntityGeothermalGenerator(830, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4).getStackForm(1L));
-		GregtechItemList.Geothermal_Engine_IV.set(new GregtechMetaTileEntityGeothermalGenerator(831, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5).getStackForm(1L));
-		GregtechItemList.Geothermal_Engine_LuV.set(new GregtechMetaTileEntityGeothermalGenerator(832, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6).getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.Geothermal_Engine_EV.set(new GregtechMetaTileEntityGeothermalGenerator(830,
+				"advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4).getStackForm(1L));
+		GregtechItemList.Geothermal_Engine_IV.set(new GregtechMetaTileEntityGeothermalGenerator(831,
+				"advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5).getStackForm(1L));
+		GregtechItemList.Geothermal_Engine_LuV.set(new GregtechMetaTileEntityGeothermalGenerator(832,
+				"advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6).getStackForm(1L));
 
-		GT_ModHandler.addCraftingRecipe(
-				GregtechItemList.Geothermal_Engine_EV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"CEC", "GMG", "PWP",
-						Character.valueOf('M'), ItemList.Hull_EV,
-						Character.valueOf('P'), ItemList.Electric_Piston_EV,
-						Character.valueOf('E'), ItemList.Electric_Motor_EV,
-						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate),
-						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
-						Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_EV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+						ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV,
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'),
+						ALLOY.TANTALLOY_61.getGear(1) });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_IV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"CEC", "GMG", "PWP",
-						Character.valueOf('M'), ItemList.Hull_IV,
-						Character.valueOf('P'), ItemList.Electric_Piston_IV,
-						Character.valueOf('E'), ItemList.Electric_Motor_IV,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+						ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV,
 						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor),
-						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
-						Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
+						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'),
+						ALLOY.STELLITE.getGear(1) });
 
 		final ItemStack INGREDIENT_1 = CI.electricPiston_LuV;
 		final ItemStack INGREDIENT_2 = CI.electricMotor_LuV;
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_LuV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"CEC", "GMG", "PWP",
-						Character.valueOf('M'), ItemList.Hull_LuV,
-						Character.valueOf('P'), INGREDIENT_1,
-						Character.valueOf('E'), INGREDIENT_2,
-						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite),
-						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
-						Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+						INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'),
+						ALLOY.ZERON_100.getGear(1) });
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
index 94b2462cb3..600ac3346a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -5,11 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_AlloyBlastSmelter;
 
-public class GregtechIndustrialBlastSmelter{
+public class GregtechIndustrialBlastSmelter {
 
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter) {
 				run1();
@@ -18,10 +17,10 @@ public class GregtechIndustrialBlastSmelter{
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Alloy Blast Smelter Multiblock
-		GregtechItemList.Industrial_AlloyBlastSmelter.set(new GregtechMetaTileEntity_AlloyBlastSmelter(810, "industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter").getStackForm(1L));
+	private static void run1() {
+		// Industrial Alloy Blast Smelter Multiblock
+		GregtechItemList.Industrial_AlloyBlastSmelter.set(new GregtechMetaTileEntity_AlloyBlastSmelter(810,
+				"industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index b09c36b020..a6b452a4b7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCentrifuge;
 
-public class GregtechIndustrialCentrifuge
-{
+public class GregtechIndustrialCentrifuge {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialCentrifuge
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Centrifuge Multiblock
-		GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntity_IndustrialCentrifuge(790, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L));
+	private static void run1() {
+		// Industrial Centrifuge Multiblock
+		GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntity_IndustrialCentrifuge(790,
+				"industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
index e366658c65..d5bd5c58d3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCokeOven;
 
-public class GregtechIndustrialCokeOven
-{
+public class GregtechIndustrialCokeOven {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialCokeOven
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Centrifuge Multiblock
-		GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven(791, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L));
+	private static void run1() {
+		// Industrial Centrifuge Multiblock
+		GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven(791,
+				"industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 932da8fcff..453a6644e8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialElectrolyzer;
 
-public class GregtechIndustrialElectrolyzer
-{
+public class GregtechIndustrialElectrolyzer {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialElectrolyzer
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntity_IndustrialElectrolyzer(796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L));
+	private static void run1() {
+		// Industrial Electrolyzer Multiblock
+		GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntity_IndustrialElectrolyzer(796,
+				"industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
index a892d31d50..f172f6b325 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_Refinery;
 
-public class GregtechIndustrialFuelRefinery
-{
+public class GregtechIndustrialFuelRefinery {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_NuclearFuelRefinery) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialFuelRefinery
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Maceration Stack Multiblock
-		GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery(835, "industrialrefinery.controller.tier.single", "Fission Fuel Processing Plant").getStackForm(1L));
+	private static void run1() {
+		// Industrial Maceration Stack Multiblock
+		GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery(835,
+				"industrialrefinery.controller.tier.single", "Fission Fuel Processing Plant").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
index acdce264a9..5ce1fc4a70 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator;
 
-public class GregtechIndustrialMacerator
-{
+public class GregtechIndustrialMacerator {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialMacerationStack) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialMacerator
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Maceration Stack Multiblock
-		GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntity_IndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L));
+	private static void run1() {
+		// Industrial Maceration Stack Multiblock
+		GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntity_IndustrialMacerator(797,
+				"industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index 4110d06acc..a04c516bce 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MassFabricator;
 
-public class GregtechIndustrialMassFabricator
-{
+public class GregtechIndustrialMassFabricator {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_MatterFabricator) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialMassFabricator
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Matter Fabricator Multiblock
-		GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntity_MassFabricator(799, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L));
+	private static void run1() {
+		// Industrial Matter Fabricator Multiblock
+		GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntity_MassFabricator(799,
+				"industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
index 63f461d6f0..b07ba7f275 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MultiTank;
 
-public class GregtechIndustrialMultiTank
-{
+public class GregtechIndustrialMultiTank {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks.");
 			if (CORE.configSwitches.enableMultiblock_MultiTank) {
 				run1();
@@ -21,10 +17,14 @@ public class GregtechIndustrialMultiTank
 
 	}
 
-	private static void run1()
-	{
-		GregtechItemList.Industrial_MultiTank.set(new GregtechMetaTileEntity_MultiTank(827, "multitank.controller.tier.single", "Gregtech Multitank").getStackForm(1L));
-		//GregtechItemList.Industrial_MultiTankDense.set(new GregtechMetaTileEntityMultiTankDense(828, "multitankdense.controller.tier.single", "Gregtech Dense Multitank").getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.Industrial_MultiTank
+				.set(new GregtechMetaTileEntity_MultiTank(827, "multitank.controller.tier.single", "Gregtech Multitank")
+						.getStackForm(1L));
+		// GregtechItemList.Industrial_MultiTankDense.set(new
+		// GregtechMetaTileEntityMultiTankDense(828,
+		// "multitankdense.controller.tier.single", "Gregtech Dense
+		// Multitank").getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
index bc345715c1..e94f3ac364 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialPlatePress;
 
-public class GregtechIndustrialPlatePress
-{
+public class GregtechIndustrialPlatePress {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialPlatePress) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechIndustrialPlatePress
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Presser Multiblock
-		GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntity_IndustrialPlatePress(792, "industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L));
+	private static void run1() {
+		// Industrial Presser Multiblock
+		GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntity_IndustrialPlatePress(792,
+				"industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
index 32ca4cd716..664f1c0d78 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
@@ -6,26 +6,22 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialSifter;
 
-public class GregtechIndustrialSifter
-{
+public class GregtechIndustrialSifter {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock.");
-			if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { //TODO
+			if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { // TODO
 				run1();
 			}
 		}
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Maceration Stack Multiblock
-		GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840, "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L));
+	private static void run1() {
+		// Industrial Maceration Stack Multiblock
+		GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840,
+				"industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
index 0512d4c1dd..dc3949997e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityTreeFarm;
 
-public class GregtechIndustrialTreeFarm
-{
+public class GregtechIndustrialTreeFarm {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farm Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_TreeFarmer) {
 				run1();
@@ -21,10 +17,11 @@ public class GregtechIndustrialTreeFarm
 
 	}
 
-	private static void run1()
-	{
-		//Industrial Maceration Stack Multiblock
-		GregtechItemList.Industrial_TreeFarm.set(new GregtechMetaTileEntityTreeFarm(836, "treefarm.controller.tier.single", "Tree Farmer").getStackForm(1L));
+	private static void run1() {
+		// Industrial Maceration Stack Multiblock
+		GregtechItemList.Industrial_TreeFarm
+				.set(new GregtechMetaTileEntityTreeFarm(836, "treefarm.controller.tier.single", "Tree Farmer")
+						.getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
index 5cfd25931d..b3ad360c23 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
@@ -5,26 +5,21 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialWireMill;
 
-public class GregtechIndustrialWiremill
-{
+public class GregtechIndustrialWiremill {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock.");
 			if (CORE.configSwitches.enableMultiblock_IndustrialWireMill) {
 				run1();
 			}
 		}
-
 	}
 
-	private static void run1()
-	{
-		//Industrial Wire Factory Multiblock
-		GregtechItemList.Industrial_WireFactory.set(new GregtechMetaTileEntity_IndustrialWireMill(798, "industrialwiremill.controller.tier.single", "Wire Factory Controller").getStackForm(1L));
+	private static void run1() {
+		// Industrial Wire Factory Multiblock
+		GregtechItemList.Industrial_WireFactory.set(new GregtechMetaTileEntity_IndustrialWireMill(798,
+				"industrialwiremill.controller.tier.single", "Wire Factory Controller").getStackForm(1L));
 
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
index 731caaf706..6df2b6df38 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IronBlastFurnace;
 
-public class GregtechIronBlastFurnace
-{
+public class GregtechIronBlastFurnace {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace.");
 			if (CORE.configSwitches.enableMultiblock_IronBlastFurnace) {
 				run1();
@@ -21,8 +17,8 @@ public class GregtechIronBlastFurnace
 
 	}
 
-	private static void run1()
-	{
-		GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntity_IronBlastFurnace(768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntity_IronBlastFurnace(768,
+				"ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L));
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
index fa3d327dba..0681a061f2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMTE_NuclearReactor;
 
-public class GregtechLFTR
-{
+public class GregtechLFTR {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR].");
 			if (CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
 				run1();
@@ -21,10 +17,11 @@ public class GregtechLFTR
 
 	}
 
-	private static void run1()
-	{
-		//LFTR
-		GregtechItemList.ThoriumReactor.set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]").getStackForm(1L));
+	private static void run1() {
+		// LFTR
+		GregtechItemList.ThoriumReactor
+				.set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]")
+						.getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
index 957786e8d5..3e9f0a7361 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
@@ -9,8 +9,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaP
 
 public class GregtechPollutionDevices {
 
-	public static void run(){
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Anti-Pollution Devices.");
 			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 				run1();
@@ -18,23 +18,37 @@ public class GregtechPollutionDevices {
 		}
 	}
 
-	private static void run1(){
-		//759
-		GregtechItemList.Pollution_Detector.set(new GregtechMetaPollutionDetector(756, "pollutiondetector.01.tier.single", "Pollution Detection Device", 0, "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L));
-		GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator(951, "pollutioncreator.01.tier.single", "Smog Device", 4, "Polluting the skies.", 0).getStackForm(1L));
-		
-		GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner(757, "pollutioncleaner.01.tier.single", "Pollution Scrubber", 0).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner(758, "pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner(759, "pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner(760, "pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_EV.set(new GregtechMetaAtmosphericReconditioner(761, "pollutioncleaner.05.tier.single", "Air Recycler", 4).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner(762, "pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner(763, "pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner(764, "pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner(765, "pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner(766, "pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9).getStackForm(1L));
-		
-	//767 is free but not 768
+	private static void run1() {
+		// 759
+		GregtechItemList.Pollution_Detector.set(
+				new GregtechMetaPollutionDetector(756, "pollutiondetector.01.tier.single", "Pollution Detection Device",
+						0, "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L));
+		GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator(951, "pollutioncreator.01.tier.single",
+				"Smog Device", 4, "Polluting the skies.", 0).getStackForm(1L));
+
+		GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner(757,
+				"pollutioncleaner.01.tier.single", "Pollution Scrubber", 0).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner(758,
+				"pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner(759,
+				"pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner(760,
+				"pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_EV
+				.set(new GregtechMetaAtmosphericReconditioner(761, "pollutioncleaner.05.tier.single", "Air Recycler", 4)
+						.getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner(762,
+				"pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner(763,
+				"pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner(764,
+				"pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner(765,
+				"pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L));
+		GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner(766,
+				"pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9).getStackForm(1L));
+
+		// 767 is free but not 768
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
index 39d10a5413..c2d3878a11 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_PowerSubStationController;
 
-public class GregtechPowerSubStation
-{
+public class GregtechPowerSubStation {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Power Substation Node.");
 			if (CORE.configSwitches.enableMultiblock_PowerSubstation) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechPowerSubStation
 
 	}
 
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntity_PowerSubStationController(812, "substation.01.input.single", "Power Substation Node").getStackForm(1L));
+	private static void run1() {
+		// Steam Condensors
+		GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntity_PowerSubStationController(812,
+				"substation.01.input.single", "Power Substation Node").getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
index 356975bc44..4d3738f585 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
@@ -6,15 +6,17 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileE
 
 public class GregtechRTG {
 
-	public static void run(){
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering RTG.");
-				run1();
+			run1();
 		}
 	}
 
-	private static void run1(){
-		GregtechItemList.RTG.set(new GregtechMetaTileEntity_RTG(869, "rtg.01.tier.single", "Radioisotope Thermoelectric Generator", 3).getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.RTG.set(
+				new GregtechMetaTileEntity_RTG(869, "rtg.01.tier.single", "Radioisotope Thermoelectric Generator", 3)
+						.getStackForm(1L));
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 3c80717c32..520fa5af4d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -13,9 +13,8 @@ import net.minecraft.item.ItemStack;
 
 public class GregtechRocketFuelGenerator {
 
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Rocket Engines.");
 			if (CORE.configSwitches.enableMachine_RocketEngines) {
 				run1();
@@ -24,43 +23,42 @@ public class GregtechRocketFuelGenerator {
 
 	}
 
-	private static void run1(){
-		GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L));
-		GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L));
-		GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L));
+	private static void run1() {
+		GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(793,
+				"advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L));
+		GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(794,
+				"advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L));
+		GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(795,
+				"advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L));
 
-		GT_ModHandler.addCraftingRecipe(
-				GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"PCP", "EME", "GWG",
-						Character.valueOf('M'), ItemList.Hull_EV,
-						Character.valueOf('P'), ItemList.Electric_Piston_EV,
-						Character.valueOf('E'), ItemList.Electric_Motor_EV,
-						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate),
-						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium),
-						Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+						ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV,
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+						OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
+						ALLOY.TANTALLOY_61.getGear(1) });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"PCP", "EME", "GWG",
-						Character.valueOf('M'), ItemList.Hull_IV,
-						Character.valueOf('P'), ItemList.Electric_Piston_IV,
-						Character.valueOf('E'), ItemList.Electric_Motor_IV,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+						ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV,
 						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor),
-						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum),
-						Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
+						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
+						ALLOY.STELLITE.getGear(1) });
 
 		final ItemStack INGREDIENT_1 = CI.electricPiston_LuV;
 		final ItemStack INGREDIENT_2 = CI.electricMotor_LuV;
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"PCP", "EME", "GWG",
-						Character.valueOf('M'), ItemList.Hull_LuV,
-						Character.valueOf('P'), INGREDIENT_1,
-						Character.valueOf('E'), INGREDIENT_2,
-						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite),
-						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten),
-						Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+						INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'),
+						OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
+						ALLOY.ZERON_100.getGear(1) });
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 7cf3cc11b3..924a75680e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -7,11 +7,9 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
 
-public class GregtechSafeBlock
-{
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+public class GregtechSafeBlock {
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
 			if (CORE.configSwitches.enableMachine_Safes) {
 				run1();
@@ -20,35 +18,100 @@ public class GregtechSafeBlock
 
 	}
 
-	private static void run1()
-	{
-
-		GregtechItemList.GT_Safe_ULV.set(new GregtechMetaSafeBlock(780, "protection.playersafe.tier.00", "Ultra Low Voltage Player Safe", 0).getStackForm(1L));
-		GregtechItemList.GT_Safe_LV.set(new GregtechMetaSafeBlock(781, "protection.playersafe.tier.01", "Low Voltage Player Safe", 1).getStackForm(1L));
-		GregtechItemList.GT_Safe_MV.set(new GregtechMetaSafeBlock(782, "protection.playersafe.tier.02", "Medium Voltage Player Safe", 2).getStackForm(1L));
-		GregtechItemList.GT_Safe_HV.set(new GregtechMetaSafeBlock(783, "protection.playersafe.tier.03", "High Voltage Player Safe", 3).getStackForm(1L));
-		GregtechItemList.GT_Safe_EV.set(new GregtechMetaSafeBlock(784, "protection.playersafe.tier.04", "Extreme Voltage Player Safe", 4).getStackForm(1L));
-		GregtechItemList.GT_Safe_IV.set(new GregtechMetaSafeBlock(785, "protection.playersafe.tier.05", "Insane Voltage Player Safe", 5).getStackForm(1L));
-		GregtechItemList.GT_Safe_LuV.set(new GregtechMetaSafeBlock(786, "protection.playersafe.tier.06", "Ludicrous Voltage Player Safe", 6).getStackForm(1L));
-		GregtechItemList.GT_Safe_ZPM.set(new GregtechMetaSafeBlock(787, "protection.playersafe.tier.07", "ZPM Voltage Player Safe", 7).getStackForm(1L));
-		GregtechItemList.GT_Safe_UV.set(new GregtechMetaSafeBlock(788, "protection.playersafe.tier.08", "Ultimate Voltage Player Safe", 8).getStackForm(1L));
-		GregtechItemList.GT_Safe_MAX.set(new GregtechMetaSafeBlock(789, "protection.playersafe.tier.09", "MAX Voltage Player Safe", 9).getStackForm(1L));
-
-		//To-Do Change Recipes
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_HV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_EV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_IV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite)});
-
-
+	private static void run1() {
 
+		GregtechItemList.GT_Safe_ULV
+				.set(new GregtechMetaSafeBlock(780, "protection.playersafe.tier.00", "Ultra Low Voltage Player Safe", 0)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_LV
+				.set(new GregtechMetaSafeBlock(781, "protection.playersafe.tier.01", "Low Voltage Player Safe", 1)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_MV
+				.set(new GregtechMetaSafeBlock(782, "protection.playersafe.tier.02", "Medium Voltage Player Safe", 2)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_HV
+				.set(new GregtechMetaSafeBlock(783, "protection.playersafe.tier.03", "High Voltage Player Safe", 3)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_EV
+				.set(new GregtechMetaSafeBlock(784, "protection.playersafe.tier.04", "Extreme Voltage Player Safe", 4)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_IV
+				.set(new GregtechMetaSafeBlock(785, "protection.playersafe.tier.05", "Insane Voltage Player Safe", 5)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_LuV
+				.set(new GregtechMetaSafeBlock(786, "protection.playersafe.tier.06", "Ludicrous Voltage Player Safe", 6)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_ZPM
+				.set(new GregtechMetaSafeBlock(787, "protection.playersafe.tier.07", "ZPM Voltage Player Safe", 7)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_UV
+				.set(new GregtechMetaSafeBlock(788, "protection.playersafe.tier.08", "Ultimate Voltage Player Safe", 8)
+						.getStackForm(1L));
+		GregtechItemList.GT_Safe_MAX
+				.set(new GregtechMetaSafeBlock(789, "protection.playersafe.tier.09", "MAX Voltage Player Safe", 9)
+						.getStackForm(1L));
 
+		// To-Do Change Recipes
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ULV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_HV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_EV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_IV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'),
+						OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
+						Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite) });
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index 34a54c16de..d911b2eb7d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -15,30 +15,25 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechSimpleWasher {
 
-	public static void run(){
+	public static void run() {
 
-		//Generate Recipe Map for the Dust Washer.
+		// Generate Recipe Map for the Dust Washer.
 		ItemStack dustClean;
 		ItemStack dustDirty;
-		for (Materials v : Materials.values()){
+		for (Materials v : Materials.values()) {
 			dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L);
 			dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L);
-			if (dustClean != null && dustDirty != null){
-				Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes.addRecipe(
-						false,
-						new ItemStack[]{dustDirty},
-						new ItemStack[]{dustClean},
-						null,
-						new FluidStack[]{FluidUtils.getFluidStack("water", 100)},
-						null,
-						20,
-						8,
-						0);
-			}			
+			if (dustClean != null && dustDirty != null) {
+				Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes.addRecipe(false, new ItemStack[] { dustDirty },
+						new ItemStack[] { dustClean }, null,
+						new FluidStack[] { FluidUtils.getFluidStack("water", 100) }, null, 20, 8, 0);
+			}
 		}
-		
-		//Register the Simple Washer Entity.
-		GregtechItemList.SimpleDustWasher.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0).getStackForm(1L));		
-		
+
+		// Register the Simple Washer Entity.
+		GregtechItemList.SimpleDustWasher
+				.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0)
+						.getStackForm(1L));
+
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
index c6e3755f3a..4ca6cf35d1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
@@ -7,11 +7,9 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 
-public class GregtechSolarGenerators
-{
-	public static void run()
-	{
-		if (LoadedMods.Gregtech && configSwitches.enableMachine_SolarGenerators){
+public class GregtechSolarGenerators {
+	public static void run() {
+		if (LoadedMods.Gregtech && configSwitches.enableMachine_SolarGenerators) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Solar Generator Blocks.");
 			if (CORE.configSwitches.enableMachine_SolarGenerators) {
 				run1();
@@ -20,20 +18,32 @@ public class GregtechSolarGenerators
 
 	}
 
-	private static void run1()
-	{
-
-		GregtechItemList.GT_Solar_ULV.set(new GregtechMetaTileEntitySolarGenerator(800, "sunabsorber.tier.00", "Ultra Low Voltage Solar Generator", 0).getStackForm(1L));
-		GregtechItemList.GT_Solar_LV.set(new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1).getStackForm(1L));
-		GregtechItemList.GT_Solar_MV.set(new GregtechMetaTileEntitySolarGenerator(802, "sunabsorber.tier.02", "Medium Voltage Solar Generator", 2).getStackForm(1L));
-		GregtechItemList.GT_Solar_HV.set(new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3).getStackForm(1L));
-		GregtechItemList.GT_Solar_EV.set(new GregtechMetaTileEntitySolarGenerator(804, "sunabsorber.tier.04", "Extreme Voltage Solar Generator", 4).getStackForm(1L));
-		GregtechItemList.GT_Solar_IV.set(new GregtechMetaTileEntitySolarGenerator(805, "sunabsorber.tier.05", "Insane Voltage Solar Generator", 5).getStackForm(1L));
-		GregtechItemList.GT_Solar_LuV.set(new GregtechMetaTileEntitySolarGenerator(806, "sunabsorber.tier.06", "Ludicrous Voltage Solar Generator", 6).getStackForm(1L));
-		GregtechItemList.GT_Solar_ZPM.set(new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7).getStackForm(1L));
-		GregtechItemList.GT_Solar_UV.set(new GregtechMetaTileEntitySolarGenerator(808, "sunabsorber.tier.08", "Ultimate Voltage Solar Generator", 8).getStackForm(1L));
-		GregtechItemList.GT_Solar_MAX.set(new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9).getStackForm(1L));
+	private static void run1() {
 
+		GregtechItemList.GT_Solar_ULV.set(new GregtechMetaTileEntitySolarGenerator(800, "sunabsorber.tier.00",
+				"Ultra Low Voltage Solar Generator", 0).getStackForm(1L));
+		GregtechItemList.GT_Solar_LV.set(
+				new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1)
+						.getStackForm(1L));
+		GregtechItemList.GT_Solar_MV.set(new GregtechMetaTileEntitySolarGenerator(802, "sunabsorber.tier.02",
+				"Medium Voltage Solar Generator", 2).getStackForm(1L));
+		GregtechItemList.GT_Solar_HV.set(
+				new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3)
+						.getStackForm(1L));
+		GregtechItemList.GT_Solar_EV.set(new GregtechMetaTileEntitySolarGenerator(804, "sunabsorber.tier.04",
+				"Extreme Voltage Solar Generator", 4).getStackForm(1L));
+		GregtechItemList.GT_Solar_IV.set(new GregtechMetaTileEntitySolarGenerator(805, "sunabsorber.tier.05",
+				"Insane Voltage Solar Generator", 5).getStackForm(1L));
+		GregtechItemList.GT_Solar_LuV.set(new GregtechMetaTileEntitySolarGenerator(806, "sunabsorber.tier.06",
+				"Ludicrous Voltage Solar Generator", 6).getStackForm(1L));
+		GregtechItemList.GT_Solar_ZPM.set(
+				new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7)
+						.getStackForm(1L));
+		GregtechItemList.GT_Solar_UV.set(new GregtechMetaTileEntitySolarGenerator(808, "sunabsorber.tier.08",
+				"Ultimate Voltage Solar Generator", 8).getStackForm(1L));
+		GregtechItemList.GT_Solar_MAX.set(
+				new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9)
+						.getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
index 6831143906..3ed609edf0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
@@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor;
 
-public class GregtechSteamCondenser
-{
+public class GregtechSteamCondenser {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor.");
 			if (CORE.configSwitches.enableMachine_SteamConverter) {
 				run1();
@@ -21,10 +17,10 @@ public class GregtechSteamCondenser
 
 	}
 
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
+	private static void run1() {
+		// Steam Condensors
+		GregtechItemList.Condensor_MAX.set(
+				new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
index 99a37ffd39..35b7050300 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
@@ -4,24 +4,20 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
 
-public class GregtechSuperConductionPoint
-{
+public class GregtechSuperConductionPoint {
 
-
-
-	public static void run()
-	{
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Super Conductor Input Node.");
 			run1();
 		}
 
 	}
 
-	private static void run1()
-	{
-		//Steam Condensors
-		GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811, "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
+	private static void run1() {
+		// Steam Condensors
+		GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811,
+				"superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index 81a0f643ee..9d9f9b3cd1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -6,11 +6,9 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank;
 
-public class GregtechTieredFluidTanks
-{
-	public static void run()
-	{
-		if (LoadedMods.Gregtech){
+public class GregtechTieredFluidTanks {
+	public static void run() {
+		if (LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Portable Fluid Tanks.");
 			if (CORE.configSwitches.enableMachine_FluidTanks) {
 				run1();
@@ -19,23 +17,43 @@ public class GregtechTieredFluidTanks
 
 	}
 
-	private static void run1()	{
+	private static void run1() {
 		int ID = 817;
 		Utils.LOG_INFO("Is New Horizons Loaded? " + CORE.GTNH);
-		if (CORE.GTNH){
+		if (CORE.GTNH) {
 			Utils.LOG_INFO("Only loading ULV-IV tier tanks for New Horizons Modpack.");
 		}
-		GregtechItemList.GT_FluidTank_ULV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0).getStackForm(1L));
-		GregtechItemList.GT_FluidTank_LV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1).getStackForm(1L));
-		GregtechItemList.GT_FluidTank_MV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2).getStackForm(1L));
-		GregtechItemList.GT_FluidTank_HV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.03", "High Voltage Fluid Tank", 3).getStackForm(1L));
-		if (!CORE.GTNH){
-			GregtechItemList.GT_FluidTank_EV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.04", "Extreme Voltage Fluid Tank", 4).getStackForm(1L));
-			GregtechItemList.GT_FluidTank_IV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.05", "Insane Voltage Fluid Tank", 5).getStackForm(1L));
-			GregtechItemList.GT_FluidTank_LuV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.06", "Ludicrous Voltage Fluid Tank", 6).getStackForm(1L));
-			GregtechItemList.GT_FluidTank_ZPM.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7).getStackForm(1L));
-			GregtechItemList.GT_FluidTank_UV.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8).getStackForm(1L));
-			GregtechItemList.GT_FluidTank_MAX.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9).getStackForm(1L));
+		GregtechItemList.GT_FluidTank_ULV
+				.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0)
+						.getStackForm(1L));
+		GregtechItemList.GT_FluidTank_LV
+				.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1)
+						.getStackForm(1L));
+		GregtechItemList.GT_FluidTank_MV
+				.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2)
+						.getStackForm(1L));
+		GregtechItemList.GT_FluidTank_HV
+				.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.03", "High Voltage Fluid Tank", 3)
+						.getStackForm(1L));
+		if (!CORE.GTNH) {
+			GregtechItemList.GT_FluidTank_EV
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.04", "Extreme Voltage Fluid Tank", 4)
+							.getStackForm(1L));
+			GregtechItemList.GT_FluidTank_IV
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.05", "Insane Voltage Fluid Tank", 5)
+							.getStackForm(1L));
+			GregtechItemList.GT_FluidTank_LuV
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.06", "Ludicrous Voltage Fluid Tank", 6)
+							.getStackForm(1L));
+			GregtechItemList.GT_FluidTank_ZPM
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7)
+							.getStackForm(1L));
+			GregtechItemList.GT_FluidTank_UV
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8)
+							.getStackForm(1L));
+			GregtechItemList.GT_FluidTank_MAX
+					.set(new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9)
+							.getStackForm(1L));
 		}
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
index 85e80bd2c1..ce7e6e8ae8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
@@ -7,7 +7,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaT
 
 public class GregtechTreeFarmerTE {
 	public static void run() {
-		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farmer Structural Block.");
 			if (CORE.configSwitches.enableMultiblock_TreeFarmer) {
 				run1();
@@ -16,6 +16,7 @@ public class GregtechTreeFarmerTE {
 	}
 
 	private static void run1() {
-		GregtechItemList.TreeFarmer_Structural.set(new GregtechMetaTreeFarmerStructural(752, "treefarmer.structural", "Farm Keeper", 0).getStackForm(1L));
+		GregtechItemList.TreeFarmer_Structural.set(
+				new GregtechMetaTreeFarmerStructural(752, "treefarmer.structural", "Farm Keeper", 0).getStackForm(1L));
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
index c5e95f53dc..6ffadfea91 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
@@ -14,9 +14,8 @@ import net.minecraft.item.ItemStack;
 
 public class NewHorizonsAccelerator {
 
-	public static void run()
-	{
-		if (LoadedMods.Gregtech && !CORE.GTNH){
+	public static void run() {
+		if (LoadedMods.Gregtech && !CORE.GTNH) {
 			Utils.LOG_INFO("New Horizons Content | Registering World Accelerators.");
 			if (CORE.configSwitches.enableMachine_WorldAccelerators) {
 				run1();
@@ -25,104 +24,79 @@ public class NewHorizonsAccelerator {
 
 	}
 
-	private static void run1(){
-		GregtechItemList.AcceleratorLV.set(new GT_MetaTileEntity_WorldAccelerator(
-				841, "basicmachine.accelerator.tier.01", "Basic World Accelerator", 1).getStackForm(1L));
-		GregtechItemList.AcceleratorMV.set(new GT_MetaTileEntity_WorldAccelerator(
-				842, "basicmachine.accelerator.tier.02", "Advanced World Accelerator", 2).getStackForm(1L));
-		GregtechItemList.AcceleratorHV.set(new GT_MetaTileEntity_WorldAccelerator(
-				843, "basicmachine.accelerator.tier.03", "Advanced World Accelerator II", 3).getStackForm(1L));
-		GregtechItemList.AcceleratorEV.set(new GT_MetaTileEntity_WorldAccelerator(
-				844, "basicmachine.accelerator.tier.04", "Advanced World Accelerator III", 4).getStackForm(1L));
-		GregtechItemList.AcceleratorIV.set(new GT_MetaTileEntity_WorldAccelerator(
-				845, "basicmachine.accelerator.tier.05", "Advanced World Accelerator IV", 5).getStackForm(1L));
-		GregtechItemList.AcceleratorLuV.set(new GT_MetaTileEntity_WorldAccelerator(
-				846, "basicmachine.accelerator.tier.06", "Elite World Accelerator", 6).getStackForm(1L));
-		GregtechItemList.AcceleratorZPM.set(new GT_MetaTileEntity_WorldAccelerator(
-				847, "basicmachine.accelerator.tier.07", "Elite World Accelerator II", 7).getStackForm(1L));
-		GregtechItemList.AcceleratorUV.set(new GT_MetaTileEntity_WorldAccelerator(
-				848, "basicmachine.accelerator.tier.08", "Ultimate Time Anomaly", 8).getStackForm(1L));
-		
-		
+	private static void run1() {
+		GregtechItemList.AcceleratorLV.set(new GT_MetaTileEntity_WorldAccelerator(841,
+				"basicmachine.accelerator.tier.01", "Basic World Accelerator", 1).getStackForm(1L));
+		GregtechItemList.AcceleratorMV.set(new GT_MetaTileEntity_WorldAccelerator(842,
+				"basicmachine.accelerator.tier.02", "Advanced World Accelerator", 2).getStackForm(1L));
+		GregtechItemList.AcceleratorHV.set(new GT_MetaTileEntity_WorldAccelerator(843,
+				"basicmachine.accelerator.tier.03", "Advanced World Accelerator II", 3).getStackForm(1L));
+		GregtechItemList.AcceleratorEV.set(new GT_MetaTileEntity_WorldAccelerator(844,
+				"basicmachine.accelerator.tier.04", "Advanced World Accelerator III", 4).getStackForm(1L));
+		GregtechItemList.AcceleratorIV.set(new GT_MetaTileEntity_WorldAccelerator(845,
+				"basicmachine.accelerator.tier.05", "Advanced World Accelerator IV", 5).getStackForm(1L));
+		GregtechItemList.AcceleratorLuV.set(new GT_MetaTileEntity_WorldAccelerator(846,
+				"basicmachine.accelerator.tier.06", "Elite World Accelerator", 6).getStackForm(1L));
+		GregtechItemList.AcceleratorZPM.set(new GT_MetaTileEntity_WorldAccelerator(847,
+				"basicmachine.accelerator.tier.07", "Elite World Accelerator II", 7).getStackForm(1L));
+		GregtechItemList.AcceleratorUV.set(new GT_MetaTileEntity_WorldAccelerator(848,
+				"basicmachine.accelerator.tier.08", "Ultimate Time Anomaly", 8).getStackForm(1L));
+
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorLV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_LV,
-						'M', ItemList.Electric_Motor_LV,
-						'P', ItemList.Electric_Pump_LV,
-						'B', ItemList.Hull_LV,
-						'C', ItemList.Conveyor_Module_LV,
-						'I', ItemList.Electric_Piston_LV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LV, 'M', ItemList.Electric_Motor_LV, 'P',
+						ItemList.Electric_Pump_LV, 'B', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I',
+						ItemList.Electric_Piston_LV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorMV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_MV,
-						'M', ItemList.Electric_Motor_MV,
-						'P', ItemList.Electric_Pump_MV,
-						'B', ItemList.Hull_MV,
-						'C', ItemList.Conveyor_Module_MV,
-						'I', ItemList.Electric_Piston_MV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_MV, 'M', ItemList.Electric_Motor_MV, 'P',
+						ItemList.Electric_Pump_MV, 'B', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I',
+						ItemList.Electric_Piston_MV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorHV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_HV,
-						'M', ItemList.Electric_Motor_HV,
-						'P', ItemList.Electric_Pump_HV,
-						'B', ItemList.Hull_HV,
-						'C', ItemList.Conveyor_Module_HV,
-						'I', ItemList.Electric_Piston_HV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_HV, 'M', ItemList.Electric_Motor_HV, 'P',
+						ItemList.Electric_Pump_HV, 'B', ItemList.Hull_HV, 'C', ItemList.Conveyor_Module_HV, 'I',
+						ItemList.Electric_Piston_HV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorEV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_EV,
-						'M', ItemList.Electric_Motor_EV,
-						'P', ItemList.Electric_Pump_EV,
-						'B', ItemList.Hull_EV,
-						'C', ItemList.Conveyor_Module_EV,
-						'I', ItemList.Electric_Piston_EV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_EV, 'M', ItemList.Electric_Motor_EV, 'P',
+						ItemList.Electric_Pump_EV, 'B', ItemList.Hull_EV, 'C', ItemList.Conveyor_Module_EV, 'I',
+						ItemList.Electric_Piston_EV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorIV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_IV,
-						'M', ItemList.Electric_Motor_IV,
-						'P', ItemList.Electric_Pump_IV,
-						'B', ItemList.Hull_IV,
-						'C', ItemList.Conveyor_Module_IV,
-						'I', ItemList.Electric_Piston_IV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_IV, 'M', ItemList.Electric_Motor_IV, 'P',
+						ItemList.Electric_Pump_IV, 'B', ItemList.Hull_IV, 'C', ItemList.Conveyor_Module_IV, 'I',
+						ItemList.Electric_Piston_IV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorLuV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_LuV,
-						'M', ItemList.Electric_Motor_LuV,
-						'P', ItemList.Electric_Pump_LuV,
-						'B', ItemList.Hull_LuV,
-						'C', ItemList.Conveyor_Module_LuV,
-						'I', ItemList.Electric_Piston_LuV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LuV, 'M', ItemList.Electric_Motor_LuV, 'P',
+						ItemList.Electric_Pump_LuV, 'B', ItemList.Hull_LuV, 'C', ItemList.Conveyor_Module_LuV, 'I',
+						ItemList.Electric_Piston_LuV });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorZPM.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_ZPM,
-						'M', ItemList.Electric_Motor_ZPM,
-						'P', ItemList.Electric_Pump_ZPM,
-						'B', ItemList.Hull_ZPM,
-						'C', ItemList.Conveyor_Module_ZPM,
-						'I', ItemList.Electric_Piston_ZPM});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_ZPM, 'M', ItemList.Electric_Motor_ZPM, 'P',
+						ItemList.Electric_Pump_ZPM, 'B', ItemList.Hull_ZPM, 'C', ItemList.Conveyor_Module_ZPM, 'I',
+						ItemList.Electric_Piston_ZPM });
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.AcceleratorUV.get(1L),
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"RMR", "PBC", "IMI",
-						'R', ItemList.Robot_Arm_UV,
-						'M', ItemList.Electric_Motor_UV,
-						'P', ItemList.Electric_Pump_UV,
-						'B', ItemList.Hull_UV,
-						'C', ItemList.Conveyor_Module_UV,
-						'I', ItemList.Electric_Piston_UV});
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_UV, 'M', ItemList.Electric_Motor_UV, 'P',
+						ItemList.Electric_Pump_UV, 'B', ItemList.Hull_UV, 'C', ItemList.Conveyor_Module_UV, 'I',
+						ItemList.Electric_Piston_UV });
 	}
 
 }