+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

26 files changed, 226 insertions, 166 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 0b71b612f4..e0d0374493 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -10,7 +10,7 @@ public class Gregtech4Content
 {
 
 	//ID Range 828, 829, 833 - 850
-	
+
 	public static void run()
 	{
 		if (LoadedMods.Gregtech){
@@ -20,14 +20,14 @@ public class Gregtech4Content
 	}
 
 	private static void workbenches(){
-        //Gregtech 4 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));
 	}
-	
+
 	private static void tesseracts(){
-        //Gregtech 4 Workbenches
+		//Gregtech 4 Workbenches
 		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));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 118d6083c0..9fd4eedaa7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
+
+import java.util.ArrayList;
+
 import gregtech.api.enums.*;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -14,18 +17,15 @@ import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.*;
-
-import java.util.ArrayList;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class GregtechConduits {
 	/**
-	 * 
+	 *
 	 * The Voltage Tiers. Use this Array instead of the old named Voltage Variables
 	 * public static final long[] V = new long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE};
-	 * 
+	 *
 	 */
 
 
@@ -36,8 +36,12 @@ public class GregtechConduits {
 	{
 		if (Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes.");
-			if (CORE.configSwitches.enableCustom_Cables) run1();
-			if (CORE.configSwitches.enableCustom_Pipes) run2();
+			if (CORE.configSwitches.enableCustom_Cables) {
+				run1();
+			}
+			if (CORE.configSwitches.enableCustom_Pipes) {
+				run2();
+			}
 		}
 
 	}
@@ -56,11 +60,11 @@ public class GregtechConduits {
 		if (LoadedMods.Thaumcraft){
 			superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8);}
 
-		
-		
 
-	}	
-	
+
+
+	}
+
 	private static void run2(){
 		generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 6250, 7500, true);
 		generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID+5, 5000, 4250, true);
@@ -81,8 +85,8 @@ public class GregtechConduits {
 		generateGTFluidPipes(Materials.Lead, BasePipeID+70, 720, 1200, true);
 	}
 
-	private static void wireFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
-		Materials T = Materials.valueOf(Material);
+	private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps){
+		final Materials T = Materials.valueOf(Material);
 		int V = 0;
 		if (Voltage == 8){
 			V = 0;
@@ -119,12 +123,12 @@ public class GregtechConduits {
 			Utils.LOG_ERROR(Material+" has defaulted to 8v.");
 			V = 0;
 		}
-		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);	 
-		makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);	 
-		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);	 
-	}	
+		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);
+		makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);
+		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);
+	}
 
-	private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated)
+	private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated)
 	{
 		Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new material for Wire & Cable.");
 		GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 0, "wire." + aMaterial.name().toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, aLoss, 1L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
@@ -143,8 +147,8 @@ public class GregtechConduits {
 		}
 	}
 
-	private static void superConductorFactory(GT_Materials Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
-		GT_Materials T = Material;
+	private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps){
+		final GT_Materials T = Material;
 		int V = 0;
 		if (Voltage == 8){
 			V = 0;
@@ -181,27 +185,27 @@ public class GregtechConduits {
 			Utils.LOG_ERROR(Material.name()+" has defaulted to 8v.");
 			V = 0;
 		}
-		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);	 
-		makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);	 
-		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);	 
-	}	
+		//makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false);
+		makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);
+		//makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);
+	}
 
-	private static void makeSuperConductors(GT_Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated)
+	private static void makeSuperConductors(final GT_Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated)
 	{
 		Utils.LOG_WARNING("Gregtech5u Content | Registered "+aMaterial.name() +" as a new Super Conductor.");
 		registerOre(GregtechOrePrefixes.type2, aMaterial, new GregtechMetaPipeEntity_SuperConductor(aStartID + 5, "wire." + aMaterial.name().toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 1.0F, aMaterial, aLoss, 16L * aAmperage, aVoltage, false, !aAutoInsulated).getStackForm(1L));
 
 	}
 
-	private static boolean registerOre(GregtechOrePrefixes aPrefix, Object aMaterial, ItemStack aStack) {
+	private static boolean registerOre(final GregtechOrePrefixes aPrefix, final Object aMaterial, final ItemStack aStack) {
 		return GT_OreDictUnificator.registerOre(aPrefix.get(aMaterial), aStack);
 	}
 
 
-	private static void generateGTFluidPipes(Materials material, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){
-		int transferRatePerTick = transferRatePerSec/20;
-		long mass = material.getMass();
-		long voltage = material.mMeltingPoint >= 2800 ? 64 : 16;
+	private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof){
+		final int transferRatePerTick = transferRatePerSec/20;
+		final long mass = material.getMass();
+		final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16;
 		GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GT_MetaPipeEntity_Fluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L));
 		GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GT_MetaPipeEntity_Fluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L));
 		GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GT_MetaPipeEntity_Fluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L));
@@ -210,8 +214,8 @@ public class GregtechConduits {
 		generatePipeRecipes(material.mDefaultLocalName, mass, voltage);
 	}
 
-	private static void generateNonGTFluidPipes(GT_Materials material, Material myMaterial, int startID, int transferRatePerSec, int heatResistance, boolean isGasProof){
-		int transferRatePerTick = transferRatePerSec/20;
+	private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof){
+		final int transferRatePerTick = transferRatePerSec/20;
 		long mass;
 		long voltage;
 		if (myMaterial != null){
@@ -219,11 +223,11 @@ public class GregtechConduits {
 			voltage = myMaterial.vVoltageMultiplier;
 			if (myMaterial.getLocalizedName().equals(ALLOY.POTIN.getLocalizedName())){
 				voltage = 4;
-			}			
+			}
 		}
 		else {
 			mass = ELEMENT.getInstance().IRON.getMass();
-			voltage = 8;			
+			voltage = 8;
 		}
 
 		GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GregtechMetaPipeEntityFluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L));
@@ -235,7 +239,7 @@ public class GregtechConduits {
 
 	}
 
-	private static void generatePipeRecipes(String materialName, long Mass, long vMulti){
+	private static void generatePipeRecipes(final String materialName, final long Mass, final long vMulti){
 
 		String output = materialName.substring(0, 1).toUpperCase() + materialName.substring(1);
 		output = output.replace("-", "").replace("_", "").replace(" ", "");
@@ -244,11 +248,17 @@ public class GregtechConduits {
 			output = "Void";
 		}
 
-		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");		
+		Utils.LOG_INFO("Generating "+output+" pipes & respective recipes.");
 
-		ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDict("ingot"+output, 1).copy();
-		ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
+		ItemStack pipeIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+output, 1);
+		ItemStack pipePlate = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+output, 1);
 
+		if (pipeIngot == null){
+			if (pipePlate != null){
+				pipeIngot = pipePlate;
+			}
+		}
+		
 		//Check all pipes are not null
 		Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
 		Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
@@ -258,13 +268,13 @@ public class GregtechConduits {
 
 		int eut = 128;
 		int time = 0;
-		int bonusMulti = 5*20;
+		final int bonusMulti = 5*20;
 
 		time = (int) Math.max(Mass * 8L, 1);
 		eut = (int) (10 * vMulti);
 
 
-		//Add the Three Shaped Recipes First		
+		//Add the Three Shaped Recipes First
 		RecipeUtils.recipeBuilder(
 				pipePlate, "craftingToolWrench", pipePlate,
 				pipePlate, null, pipePlate,
@@ -313,25 +323,26 @@ public class GregtechConduits {
 				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1),
 				time+=bonusMulti, eut);
 
-		if (eut < 512 && !output.equals("Void")){
-			ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
-			if (pipePlateDouble != null)
+		if ((eut < 512) && !output.equals("Void")){
+			final ItemStack pipePlateDouble = ItemUtils.getItemStackOfAmountFromOreDict("plateDouble"+output, 1).copy();
+			if (pipePlateDouble != null) {
 				RecipeUtils.recipeBuilder(
 						pipePlateDouble, "craftingToolHardHammer", pipePlateDouble,
 						pipePlateDouble, null, pipePlateDouble,
 						pipePlateDouble, "craftingToolWrench", pipePlateDouble,
 						ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1));
-			else
+			} else {
 				Utils.LOG_INFO("Failed to add a recipe for "+materialName+" Huge pipes. Double plates probably do not exist.");
+			}
 		}
 
 
 	}
 
-	private static ItemStack getOredictStack(String oredictName, int amount){
-		ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+	private static ItemStack getOredictStack(final String oredictName, final int amount){
+		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
 		if (!oreDictList.isEmpty()){
-			ItemStack returnValue = oreDictList.get(0).copy();
+			final ItemStack returnValue = oreDictList.get(0).copy();
 			returnValue.stackSize = amount;
 			return returnValue;
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 8c57d47cf5..0c14ca2eaf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -13,7 +13,9 @@ public class GregtechDehydrator
 	{
 		if (LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
-			if (CORE.configSwitches.enableMachine_Dehydrators) run1();
+			if (CORE.configSwitches.enableMachine_Dehydrators) {
+				run1();
+			}
 		}
 
 	}
@@ -25,7 +27,7 @@ public class GregtechDehydrator
 
 		 public GT_MetaTileEntity_BasicMachine_GT_Recipe(
 		  int aID, String aName, String aNameRegional, int aTier,
-		  String aDescription, 
+		  String aDescription,
 		  GT_Recipe_Map aRecipes,
 		  int aInputSlots, int aOutputSlots,
 		  int aTankCapacity,
@@ -34,7 +36,7 @@ public class GregtechDehydrator
 		  boolean aSharedTank, boolean aRequiresFluidForFiltering,
 		  int aSpecialEffect,
 		  String aOverlays,
-		  Object[] aRecipe) {	  
+		  Object[] aRecipe) {
 
 		 */
 
@@ -44,7 +46,7 @@ public class GregtechDehydrator
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
-				2, 5, 
+				2, 5,
 				"Dehydrator.png", "",
 				false, false,
 				0,
@@ -56,7 +58,7 @@ public class GregtechDehydrator
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
-				2, 5, 
+				2, 5,
 				"Dehydrator.png", "",
 				false, false,
 				0,
@@ -68,7 +70,7 @@ public class GregtechDehydrator
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
-				2, 5, 
+				2, 5,
 				"Dehydrator.png", "",
 				false, false,
 				0,
@@ -80,7 +82,7 @@ public class GregtechDehydrator
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes,
 				2, 9,
 				10000,
-				2, 5, 
+				2, 5,
 				"Dehydrator.png", "",
 				false, false,
 				0,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 66b92b90bc..133695204f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -11,29 +11,31 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.creative.Greg
 
 public class GregtechEnergyBuffer
 {
-	
+
 	//Misc Items
 	//public static Item itemBufferCore;
-	
+
 	public static void run()
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks.");
-			if (CORE.configSwitches.enableMachine_RocketEngines) run1();
+			if (CORE.configSwitches.enableMachine_RocketEngines) {
+				run1();
+			}
 		}
-		
+
 	}
 
 	private static void run1()
 	{
-		
+
 		//itemBufferCore = new Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");
 
 		//Registry
 		//GameRegistry.registerItem(itemBufferCore, "itemBufferCore");
 		//LanguageRegistry.addName(itemBufferCore, "Buffer Core");
 		//OreDictionary.registerOre("itemBufferCore", itemBufferCore);
-		
+
 
 		//Energy Buffers
 		GregtechItemList.Energy_Buffer_1by1_ULV.set(new GregtechMetaEnergyBuffer(770, "energybuffer.01.tier.00", "Ultra Low Voltage Energy Buffer", 0, "", 1).getStackForm(1L));
@@ -48,10 +50,10 @@ public class GregtechEnergyBuffer
 		GregtechItemList.Energy_Buffer_1by1_MAX.set(new GregtechMetaEnergyBuffer(779, "energybuffer.01.tier.09", "MAX Voltage Energy Buffer", 9, "", 1).getStackForm(1L));
 		// Creative Buffer Has Special ID
 		GregtechItemList.Energy_Buffer_CREATIVE
-				.set(new GregtechMetaCreativeEnergyBuffer(750,
-						"energybuffer.01.tier.xx",
-						"512V Creative Energy Buffer", 3, "", 0)
-						.getStackForm(1L));
+		.set(new GregtechMetaCreativeEnergyBuffer(750,
+				"energybuffer.01.tier.xx",
+				"512V Creative Energy Buffer", 3, "", 0)
+				.getStackForm(1L));
 
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_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[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_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[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
@@ -73,9 +75,9 @@ public class GregtechEnergyBuffer
 						ItemList.Hull_MAX, Character.valueOf('W'),
 						OrePrefixes.wireGt08.get(Materials.Superconductor),
 						Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/
-		
-		
-		
+
+
+
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index 174136e8f8..86749e1f40 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -7,7 +7,8 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.api.enums.*;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator;
 import net.minecraft.item.ItemStack;
@@ -18,7 +19,9 @@ public class GregtechGeothermalThermalGenerator {
 	{
 		if (LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
-			if (CORE.configSwitches.enableMachine_GeothermalEngines) run1();
+			if (CORE.configSwitches.enableMachine_GeothermalEngines) {
+				run1();
+			}
 		}
 
 	}
@@ -30,36 +33,36 @@ public class GregtechGeothermalThermalGenerator {
 
 		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, 
+				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'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
-					Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
-					Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
-		
+						Character.valueOf('M'), ItemList.Hull_EV,
+						Character.valueOf('P'), ItemList.Electric_Piston_EV,
+						Character.valueOf('E'), ItemList.Electric_Motor_EV,
+						Character.valueOf('C'), GregtechOrePrefixes.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,
-			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
-			Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
-		
+						Character.valueOf('M'), ItemList.Hull_IV,
+						Character.valueOf('P'), ItemList.Electric_Piston_IV,
+						Character.valueOf('E'), ItemList.Electric_Motor_IV,
+						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
+						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
+						Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
+
 		final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV;
 		final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.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'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), 
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
-			Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
+				new Object[]{"CEC", "GMG", "PWP",
+						Character.valueOf('M'), ItemList.Hull_LuV,
+						Character.valueOf('P'), INGREDIENT_1,
+						Character.valueOf('E'), INGREDIENT_2,
+						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic),
+						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 3ff39be788..94b2462cb3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -11,7 +11,9 @@ public class GregtechIndustrialBlastSmelter{
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock.");
-			if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter) run1();
+			if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter) {
+				run1();
+			}
 		}
 
 	}
@@ -20,6 +22,6 @@ public class GregtechIndustrialBlastSmelter{
 	{
 		//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 44a2cb4c0a..b09c36b020 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -14,7 +14,9 @@ public class GregtechIndustrialCentrifuge
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
-			if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge) run1();
+			if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge) {
+				run1();
+			}
 		}
 
 	}
@@ -23,6 +25,6 @@ public class GregtechIndustrialCentrifuge
 	{
 		//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 d9fdb9a0fd..e366658c65 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -14,7 +14,9 @@ public class GregtechIndustrialCokeOven
 	{
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
-			if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven) run1();
+			if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven) {
+				run1();
+			}
 		}
 
 	}
@@ -23,6 +25,6 @@ public class GregtechIndustrialCokeOven
 	{
 		//Industrial Centrifuge Multiblock
 		GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven(791, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L));
-