+ 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.

11 files changed, 135 insertions, 132 deletions

diff --git a/src/Java/gtPlusPlus/core/common/BasePlayer.java b/src/Java/gtPlusPlus/core/common/BasePlayer.java
index 862d53d822..dffc83c2ab 100644
--- a/src/Java/gtPlusPlus/core/common/BasePlayer.java
+++ b/src/Java/gtPlusPlus/core/common/BasePlayer.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.common;
 
+import api.player.client.ClientPlayerAPI;
+import api.player.client.ClientPlayerBase;
 import gtPlusPlus.core.handler.events.CustomMovementHandler;
 import gtPlusPlus.core.handler.events.SneakManager;
 import net.minecraft.client.Minecraft;
@@ -11,16 +13,14 @@ import net.minecraft.network.play.client.C0BPacketEntityAction;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.MovementInputFromOptions;
 import net.minecraft.util.ResourceLocation;
-import api.player.client.ClientPlayerAPI;
-import api.player.client.ClientPlayerBase;
 
 public class BasePlayer extends ClientPlayerBase
 {
 	private final Minecraft mc = Minecraft.getMinecraft();
 	private final CustomMovementHandler customMovementInput = new CustomMovementHandler();
-	private final GameSettings settings = mc.gameSettings;
+	private final GameSettings settings = this.mc.gameSettings;
 
-	public BasePlayer(ClientPlayerAPI api)
+	public BasePlayer(final ClientPlayerAPI api)
 	{
 		super(api);
 	}
@@ -50,7 +50,7 @@ public class BasePlayer extends ClientPlayerBase
 			this.player.posX = this.player.posZ = 0.5D;
 			this.player.posX = 0.0D;
 			this.player.posZ = 0.0D;
-			this.player.rotationYaw = (float)this.player.ticksExisted / 12.0F;
+			this.player.rotationYaw = this.player.ticksExisted / 12.0F;
 			this.player.rotationPitch = 10.0F;
 			this.player.posY = 68.5D;
 		}
@@ -66,7 +66,7 @@ public class BasePlayer extends ClientPlayerBase
 
 				if(this.player.timeInPortal == 0.0F)
 				{
-					this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("portal.trigger"), this.player.getRNG().nextFloat() * 0.4F + 0.8F));
+					this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("portal.trigger"), (this.player.getRNG().nextFloat() * 0.4F) + 0.8F));
 				}
 
 				this.player.timeInPortal += 0.0125F;
@@ -78,7 +78,7 @@ public class BasePlayer extends ClientPlayerBase
 
 				this.playerAPI.setInPortalField(false);
 			}
-			else if(this.player.isPotionActive(Potion.confusion) && this.player.getActivePotionEffect(Potion.confusion).getDuration() > 60)
+			else if(this.player.isPotionActive(Potion.confusion) && (this.player.getActivePotionEffect(Potion.confusion).getDuration() > 60))
 			{
 				this.player.timeInPortal += 0.006666667F;
 				if(this.player.timeInPortal > 1.0F)
@@ -105,10 +105,10 @@ public class BasePlayer extends ClientPlayerBase
 				--this.player.timeUntilPortal;
 			}
 
-			boolean isJumping = this.player.movementInput.jump;
+			final boolean isJumping = this.player.movementInput.jump;
 
-			float minSpeed = 0.8F;
-			boolean isMovingForward = this.player.movementInput.moveForward >= minSpeed;
+			final float minSpeed = 0.8F;
+			final boolean isMovingForward = this.player.movementInput.moveForward >= minSpeed;
 			this.customMovementInput.update(this.mc, (MovementInputFromOptions)this.player.movementInput, this.player);
 
 			if(this.player.isUsingItem() && !this.player.isRiding())
@@ -118,29 +118,29 @@ public class BasePlayer extends ClientPlayerBase
 				this.playerAPI.setSprintToggleTimerField(0);
 			}
 
-			if(this.player.movementInput.sneak && this.player.ySize < 0.2F)
+			if(this.player.movementInput.sneak && (this.player.ySize < 0.2F))
 			{
 				this.player.ySize = 0.2F;
 			}
 
-			this.playerAPI.localPushOutOfBlocks(this.player.posX - (double)this.player.width * 0.35D, this.player.boundingBox.minY + 0.5D, this.player.posZ + (double)this.player.width * 0.35D);
-			this.playerAPI.localPushOutOfBlocks(this.player.posX - (double)this.player.width * 0.35D, this.player.boundingBox.minY + 0.5D, this.player.posZ - (double)this.player.width * 0.35D);
-			this.playerAPI.localPushOutOfBlocks(this.player.posX + (double)this.player.width * 0.35D, this.player.boundingBox.minY + 0.5D, this.player.posZ - (double)this.player.width * 0.35D);
-			this.playerAPI.localPushOutOfBlocks(this.player.posX + (double)this.player.width * 0.35D, this.player.boundingBox.minY + 0.5D, this.player.posZ + (double)this.player.width * 0.35D);
-			boolean enoughHunger = (float)this.player.getFoodStats().getFoodLevel() > 6.0F || this.player.capabilities.isFlying;
+			this.playerAPI.localPushOutOfBlocks(this.player.posX - (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ + (this.player.width * 0.35D));
+			this.playerAPI.localPushOutOfBlocks(this.player.posX - (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ - (this.player.width * 0.35D));
+			this.playerAPI.localPushOutOfBlocks(this.player.posX + (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ - (this.player.width * 0.35D));
+			this.playerAPI.localPushOutOfBlocks(this.player.posX + (this.player.width * 0.35D), this.player.boundingBox.minY + 0.5D, this.player.posZ + (this.player.width * 0.35D));
+			final boolean enoughHunger = (this.player.getFoodStats().getFoodLevel() > 6.0F) || this.player.capabilities.isFlying;
 
 			/*
 			 * 		Begin ToggleSneak Changes - ToggleSprint
 			 */
 
-			boolean isSprintDisabled	= false;
-			boolean canDoubleTap		= SneakManager.optionDoubleTap;
+			final boolean isSprintDisabled	= false;
+			final boolean canDoubleTap		= SneakManager.optionDoubleTap;
 
 			// Detect when ToggleSprint was disabled in the in-game options menu
 			if(SneakManager.wasSprintDisabled)
 			{
 				this.player.setSprinting(false);
-				customMovementInput.UpdateSprint(false, false);
+				this.customMovementInput.UpdateSprint(false, false);
 				SneakManager.wasSprintDisabled = false;
 			}
 
@@ -148,60 +148,60 @@ public class BasePlayer extends ClientPlayerBase
 			if(isSprintDisabled)
 			{
 				//Utils.LOG_INFO("Sprint pressed");
-				if(SneakManager.optionDoubleTap && this.player.onGround && !isMovingForward && this.player.movementInput.moveForward >= minSpeed && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
+				if(SneakManager.optionDoubleTap && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
 				{
-					if(this.playerAPI.getSprintToggleTimerField() <= 0 && !this.settings.keyBindSprint.getIsKeyPressed())
+					if((this.playerAPI.getSprintToggleTimerField() <= 0) && !this.settings.keyBindSprint.getIsKeyPressed())
 					{
 						this.playerAPI.setSprintToggleTimerField(7);
 					}
 					else
 					{
 						if (SneakManager.Sprinting()){
-						this.player.setSprinting(true);
-						customMovementInput.UpdateSprint(true, false);
+							this.player.setSprinting(true);
+							this.customMovementInput.UpdateSprint(true, false);
 						}
 						else {
 							this.player.setSprinting(false);
-							customMovementInput.UpdateSprint(false, false);
+							this.customMovementInput.UpdateSprint(false, false);
 						}
 					}
 				}
 
-				if(!this.player.isSprinting() && this.player.movementInput.moveForward >= minSpeed && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && this.settings.keyBindSprint.getIsKeyPressed())
+				if(!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed) && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && this.settings.keyBindSprint.getIsKeyPressed())
 				{
 					if (SneakManager.Sprinting()){
-					this.player.setSprinting(true);
-					customMovementInput.UpdateSprint(true, false);
+						this.player.setSprinting(true);
+						this.customMovementInput.UpdateSprint(true, false);
 					}
 					else {
 						this.player.setSprinting(false);
-						customMovementInput.UpdateSprint(false, false);
+						this.customMovementInput.UpdateSprint(false, false);
 					}
 				}
 			}
 			else
 			{
-				boolean state = this.customMovementInput.sprint;
+				final boolean state = this.customMovementInput.sprint;
 
 				// Only handle changes in state under the following conditions:
-					// On ground, not hungry, not eating/using item, not blind, and not Vanilla
-					//
-					// 5/6/14 - onGround check removed to match vanilla's 'start sprint while jumping' behavior.
+				// On ground, not hungry, not eating/using item, not blind, and not Vanilla
+				//
+				// 5/6/14 - onGround check removed to match vanilla's 'start sprint while jumping' behavior.
 				//if(this.player.onGround && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
 
 				if(enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
 				{
-					if(canDoubleTap && !this.player.isSprinting() || !canDoubleTap)
+					if((canDoubleTap && !this.player.isSprinting()) || !canDoubleTap)
 					{
 						if (SneakManager.Sprinting()){
 							this.player.setSprinting(state);
-						}
-						else
+						} else {
 							this.player.setSprinting(false);
+						}
 					}
 				}
 
-				if(canDoubleTap && !state && this.player.onGround && !isMovingForward && this.player.movementInput.moveForward >= minSpeed && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
+				if(canDoubleTap && !state && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() && enoughHunger && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness))
 				{
 					if(this.playerAPI.getSprintToggleTimerField() == 0)
 					{
@@ -210,9 +210,9 @@ public class BasePlayer extends ClientPlayerBase
 					else
 					{
 						if (SneakManager.Sprinting()){
-						this.player.setSprinting(true);
-						customMovementInput.UpdateSprint(true, true);
-						this.playerAPI.setSprintToggleTimerField(0);
+							this.player.setSprinting(true);
+							this.customMovementInput.UpdateSprint(true, true);
+							this.playerAPI.setSprintToggleTimerField(0);
 						}
 					}
 				}
@@ -220,14 +220,14 @@ public class BasePlayer extends ClientPlayerBase
 
 			// If sprinting, break the sprint in appropriate circumstances:
 			// Player stops moving forward, runs into something, or gets too hungry
-			if(this.player.isSprinting() && (this.player.movementInput.moveForward < minSpeed || this.player.isCollidedHorizontally || !enoughHunger))
+			if(this.player.isSprinting() && ((this.player.movementInput.moveForward < minSpeed) || this.player.isCollidedHorizontally || !enoughHunger))
 			{
 				this.player.setSprinting(false);
 
 				// Undo toggle if we resumed vanilla operation due to Hold&Release, DoubleTap, Fly, Ride
-				if (customMovementInput.sprintHeldAndReleased == true || isSprintDisabled || customMovementInput.sprintDoubleTapped || this.player.capabilities.isFlying || this.player.isRiding())
+				if ((this.customMovementInput.sprintHeldAndReleased == true) || isSprintDisabled || this.customMovementInput.sprintDoubleTapped || this.player.capabilities.isFlying || this.player.isRiding())
 				{
-					customMovementInput.UpdateSprint(false, false);
+					this.customMovementInput.UpdateSprint(false, false);
 				}
 			}
 
@@ -324,11 +324,11 @@ public class BasePlayer extends ClientPlayerBase
 					this.playerAPI.setHorseJumpPowerCounterField(this.playerAPI.getHorseJumpPowerCounterField() + 1);
 					if(this.playerAPI.getHorseJumpPowerCounterField() < 10)
 					{
-						this.playerAPI.setHorseJumpPowerField((float)this.playerAPI.getHorseJumpPowerCounterField() * 0.1F);
+						this.playerAPI.setHorseJumpPowerField(this.playerAPI.getHorseJumpPowerCounterField() * 0.1F);
 					}
 					else
 					{
-						this.playerAPI.setHorseJumpPowerField(0.8F + 2.0F / (float)(this.playerAPI.getHorseJumpPowerCounterField() - 9) * 0.1F);
+						this.playerAPI.setHorseJumpPowerField(0.8F + ((2.0F / (this.playerAPI.getHorseJumpPowerCounterField() - 9)) * 0.1F));
 					}
 				}
 			}
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index d5a126ff39..405578857e 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.core.common;
 
 import static gtPlusPlus.core.lib.CORE.DEBUG;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.*;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.*;
@@ -17,13 +20,11 @@ import gtPlusPlus.core.util.player.PlayerCache;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.entity.Entity;
 import net.minecraftforge.common.MinecraftForge;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.*;
 
 public class CommonProxy {
-	
+
 	public static Meta_GT_Proxy GtProxy;
-	
+
 	public CommonProxy(){
 		//Should Register Gregtech Materials I've Made
 		MinecraftForge.EVENT_BUS.register(this);
@@ -36,19 +37,19 @@ public class CommonProxy {
 				Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork.");
 			}
 			Utils.LOG_INFO("Setting up our own GT_Proxy.");
-			GtProxy = new Meta_GT_Proxy();	
+			GtProxy = new Meta_GT_Proxy();
 		}
 		else {
 			GtProxy = null;
 		}
 	}
 
-	public void preInit(FMLPreInitializationEvent e) {
-		Utils.LOG_INFO("Doing some house cleaning.");		
+	public void preInit(final FMLPreInitializationEvent e) {
+		Utils.LOG_INFO("Doing some house cleaning.");
 		LoadedMods.checkLoaded();
 		Utils.LOG_INFO("Making sure we're ready to party!");
-		
-		
+
+
 		if (!DEBUG){
 			Utils.LOG_WARNING("Development mode not enabled.");
 		}
@@ -57,18 +58,18 @@ public class CommonProxy {
 		}
 		else {
 			Utils.LOG_WARNING("Development mode not set.");
-		}		
+		}
 		AddToCreativeTab.initialiseTabs();
 		COMPAT_IntermodStaging.preInit();
 		//Apparently I should do this here. Might put it in Init for a test.
 		//Growthcraft_Handler.run();
 	}
 
-	public void init(FMLInitializationEvent e) {
+	public void init(final FMLInitializationEvent e) {
 		//Debug Loading
 		if (CORE.DEBUG){
-					DEBUG_INIT.registerHandlers();
-		}		
+			DEBUG_INIT.registerHandlers();
+		}
 		ModItems.init();
 		ModBlocks.init();
 		RECIPE_CONSTANTS.initialise();
@@ -76,25 +77,25 @@ public class CommonProxy {
 		MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler());
 		//Block Handler for all events.
 		MinecraftForge.EVENT_BUS.register(new BlockEventHandler());
-		
-		//Compat Handling		
+
+		//Compat Handling
 		COMPAT_HANDLER.registerMyModsOreDictEntries();
 		COMPAT_HANDLER.intermodOreDictionarySupport();
 		COMPAT_IntermodStaging.init();
 	}
 
-	public void postInit(FMLPostInitializationEvent e) {
+	public void postInit(final FMLPostInitializationEvent e) {
 		Utils.LOG_INFO("Cleaning up, doing postInit.");
-		PlayerCache.initCache();		
+		PlayerCache.initCache();
 		//Compat Handling
 		COMPAT_HANDLER.InitialiseHandlerThenAddRecipes();
 		COMPAT_HANDLER.RemoveRecipesFromOtherMods();
 		COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
 		COMPAT_IntermodStaging.postInit();
 	}
-	
-	
-	public void serverStarting(FMLServerStartingEvent e)
+
+
+	public void serverStarting(final FMLServerStartingEvent e)
 	{
 		COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes();
 	}
@@ -111,11 +112,11 @@ public class CommonProxy {
 
 	}
 
-	public int addArmor(String armor) {
+	public int addArmor(final String armor) {
 		return 0;
 	}
 
-	public void generateMysteriousParticles(Entity entity) {		
+	public void generateMysteriousParticles(final Entity entity) {
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
index 7f4aa0541a..c0536acada 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
@@ -9,11 +9,11 @@ public class COMPAT_BigReactors {
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private static final void run(){
 		GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
 		GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
 		GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index c64e332c50..9efd2b4a6c 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.common.compat;
 
 import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue;
 import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
@@ -73,14 +74,14 @@ public class COMPAT_CompactWindmills {
 
 	//Wooden Rotor
 	public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject(
-			rotorBlade1, "ore:plateAnyIron", "ore:plateAnyIron", 
-			"ore:screwAluminium", rotorIC1, "ore:screwAluminium", 
+			rotorBlade1, "ore:plateAnyIron", "ore:plateAnyIron",
+			"ore:screwAluminium", rotorIC1, "ore:screwAluminium",
 			rotorBlade1, "plateAnyIron", rotorBlade1,
 			rotor1);
 	//Alloy Rotor
 	public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject(
-			plateAlloy, plateAlloy, plateAlloy, 
-			plateAlloy, rotorIC3, plateAlloy, 
+			plateAlloy, plateAlloy, plateAlloy,
+			plateAlloy, rotorIC3, plateAlloy,
 			plateAlloy,plateAlloy, plateAlloy,
 			rotor3);
 	//Carbon Rotor
@@ -92,50 +93,50 @@ public class COMPAT_CompactWindmills {
 
 	//Kinetic Wind Turbine
 	public static ShapedRecipeObject KWT = new ShapedRecipeObject(
-		plateCarbon, shaftIron, plateCarbon,
-		cableCopper, mvCasing, cableCopper,
-		plateRubber, plateCarbon, plateRubber,
-		kineticWind);
-		
+			plateCarbon, shaftIron, plateCarbon,
+			cableCopper, mvCasing, cableCopper,
+			plateRubber, plateCarbon, plateRubber,
+			kineticWind);
+
 	//ELV Windmill
 	public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject(
-	
-		circuitTier1, elvTransformer, circuitTier1,
-		plateTier1, lvCasing, plateTier1,
-		plateTier1, rotor1, plateTier1,
-		elvWindmill);
-		
-		
+
+			circuitTier1, elvTransformer, circuitTier1,
+			plateTier1, lvCasing, plateTier1,
+			plateTier1, rotor1, plateTier1,
+			elvWindmill);
+
+
 	//LV Windmill
 	public static ShapedRecipeObject WM_LV = new ShapedRecipeObject(
-		circuitTier2, lvTransformer, circuitTier2,
-		plateTier2, mvCasing, plateTier2,
-		plateTier2, rotor2, plateTier2,
-		lvWindmill);
-		
+			circuitTier2, lvTransformer, circuitTier2,
+			plateTier2, mvCasing, plateTier2,
+			plateTier2, rotor2, plateTier2,
+			lvWindmill);
+
 	//MV Windmill
 	public static ShapedRecipeObject WM_MV = new ShapedRecipeObject(
-		circuitTier3, mvTransformer, circuitTier3,
-		plateTier3, hvCasing, plateTier3,
-		plateTier3, rotor3, plateTier3,
-		mvWindmill);
-		
+			circuitTier3, mvTransformer, circuitTier3,
+			plateTier3, hvCasing, plateTier3,
+			plateTier3, rotor3, plateTier3,
+			mvWindmill);
+
 	//HV Windmill
 	public static ShapedRecipeObject WM_HV = new ShapedRecipeObject(
-		circuitTier4, hvTransformer, circuitTier4,
-		plateTier4, evCasing, plateTier4,
-		plateTier4, rotor4, plateTier4,
-		hvWindmill);
-		
+			circuitTier4, hvTransformer, circuitTier4,
+			plateTier4, evCasing, plateTier4,
+			plateTier4, rotor4, plateTier4,
+			hvWindmill);
+
 	//EV Windmill
 	public static ShapedRecipeObject WM_EV = new ShapedRecipeObject(
-		circuitTier5, evTransformer, circuitTier5,
-		plateTier5, ivCasing, plateTier5,
-		plateTier5, rotor5, plateTier5,
-		evWindmill);
+			circuitTier5, evTransformer, circuitTier5,
+			plateTier5, ivCasing, plateTier5,
+			plateTier5, rotor5, plateTier5,
+			evWindmill);
 
 	public static void OreDict(){
-		run();		
+		run();
 	}
 
 	private static final void run(){
@@ -144,7 +145,7 @@ public class COMPAT_CompactWindmills {
 		//RemoveRecipeQueue.add("CompactWindmills:ALLOY");
 		//RemoveRecipeQueue.add("CompactWindmills:CARBON");
 		//RemoveRecipeQueue.add("CompactWindmills:IRIDIUM");
-		
+
 		//Remove Recipes
 		RemoveRecipeQueue.add(kineticWind);
 		RemoveRecipeQueue.add(elvWindmill);
@@ -155,7 +156,7 @@ public class COMPAT_CompactWindmills {
 		RemoveRecipeQueue.add(rotor1);
 		RemoveRecipeQueue.add(rotor3);
 		RemoveRecipeQueue.add(rotor4);
-		
+
 		//Add Recipes
 		AddRecipeQueue.add(Wooden_Rotor);
 		AddRecipeQueue.add(Alloy_Rotor);
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
index 7a5389e37c..f5eee3e8c5 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -10,7 +10,7 @@ public class COMPAT_EnderIO {
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private static final void run(){
 		ItemUtils.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2);
 		GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
@@ -22,5 +22,5 @@ public class COMPAT_EnderIO {
 		GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium));
 		GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy));
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 960afc1ea1..ce62eaac5a 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.common.compat;
 
 
 import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+
 import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
@@ -15,13 +16,13 @@ public class COMPAT_IC2 {
 	private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
 
 	public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
-			"ore:cableGt02Copper", "ore:cableGt02Copper", null, 
-			"minecraft:redstone", "ore:blockGlass", "minecraft:redstone", 
-			"minecraft:redstone", "ore:circuitBasic", "minecraft:redstone", 
+			"ore:cableGt02Copper", "ore:cableGt02Copper", null,
+			"minecraft:redstone", "ore:blockGlass", "minecraft:redstone",
+			"minecraft:redstone", "ore:circuitBasic", "minecraft:redstone",
 			itemCropnalyzer);
 	public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject(
-			"ore:plateIron", "ore:plateIron", "ore:plateIron", 
-			"ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron", 
+			"ore:plateIron", "ore:plateIron", "ore:plateIron",
+			"ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron",
 			"ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper",
 			itemSolarHelmet);
 
@@ -29,7 +30,7 @@ public class COMPAT_IC2 {
 
 	public static void OreDict(){
 		//Get ItemStacks for results
-		/*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);	
+		/*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);
 		itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);	*/
 		run();
 	}
@@ -50,7 +51,7 @@ public class COMPAT_IC2 {
 				RemoveRecipeQueue.add("IC2:itemCable:6");
 				RemoveRecipeQueue.add("IC2:itemCable:10");
 				RemoveRecipeQueue.add("IC2:itemCable:13");
-				//RemoveRecipeQueue.add(itemCropnalyzer);		
+				//RemoveRecipeQueue.add(itemCropnalyzer);
 				//RemoveRecipeQueue.add(itemSolarHelmet);
 
 				//AddRecipeQueue.add(Cropnalyzer);
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
index 9e29458bce..bf47d2eb4b 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
@@ -4,11 +4,11 @@ import gtPlusPlus.core.util.item.ItemUtils;
 
 public class COMPAT_MorePlanets {
 
-	
+
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private final static void run(){
 		//Metals
 		ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0);
@@ -25,7 +25,7 @@ public class COMPAT_MorePlanets {
 		ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4);
 		ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
 		ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
-		
+
 		//Gems
 		ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2);
 		ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0);
@@ -33,5 +33,5 @@ public class COMPAT_MorePlanets {
 		ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0);
 		ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1);
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
index d471535e81..9c4161b88d 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
@@ -9,9 +9,9 @@ public class COMPAT_PneumaticCraft {
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private static final void run(){
-		GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));		
+		GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
index 4db8006a89..f8c69cc4b7 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
@@ -9,10 +9,10 @@ public class COMPAT_RFTools {
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private static final void run(){
 		GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
-		
+
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
index 6d7f08b55d..ea9374d1c2 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
@@ -9,10 +9,10 @@ public class COMPAT_SimplyJetpacks {
 	public static void OreDict(){
 		run();
 	}
-	
+
 	private static final void run(){
 		GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
-		
+
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index b1b7464dd2..a257766e38 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.util.item.ItemUtils;
 public class COMPAT_Thaumcraft {
 
 	public static void OreDict(){
-		
+
 		if (configSwitches.enableThaumcraftShardUnification){
 			run();
 		}
@@ -22,7 +22,7 @@ public class COMPAT_Thaumcraft {
 			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
 			ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
 			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
-			//System.out.println("TC Shard registration count is: "+i);        
+			//System.out.println("TC Shard registration count is: "+i);
 		}
 
 		if (LoadedMods.ForbiddenMagic){
@@ -32,12 +32,12 @@ public class COMPAT_Thaumcraft {
 				GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
 				ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
 				GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
-				//System.out.println("TC Shard registration count is: "+i);        
+				//System.out.println("TC Shard registration count is: "+i);
 			}
 			ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
 			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
 			ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
-			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));	
+			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
 		}
 	}