Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

38 files changed, 2816 insertions, 1620 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index a8ee2e24ad..7e81f1c514 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -105,6 +105,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 	//Computer Cube
 	Gregtech_Computer_Cube, 
+	Gregtech_Computer_Cube_Machine, 
 
 	//Casings for batteries
 	Battery_Casing_Gem_1, Battery_Casing_Gem_2,
@@ -301,7 +302,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 
 	//Tesla Tower
-	/*TelsaTower,*/
+	TelsaTower,
 	Casing_TeslaTower, 
 
 
@@ -334,7 +335,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_Adv_DistillationTower,
 
 	//Advanced Assembly Line
-	/*Machine_Adv_AssemblyLine,*/
+	Machine_Adv_AssemblyLine,
 	
 	//Advanced Vacuum Freezer
 	Industrial_Cryogenic_Freezer, 
@@ -363,13 +364,14 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Casing_Industrial_Arc_Furnace, 
 	
 	//Solar Tower
-	/*Industrial_Solar_Tower,*/
+	Industrial_Solar_Tower,
 	Casing_SolarTower_Structural, 
 	Casing_SolarTower_SaltContainment, 
 	Casing_SolarTower_HeatContainment, 
 	
 	//Larger Turbines
-	/*Large_Steam_Turbine, Large_HPSteam_Turbine, */
+	Large_Steam_Turbine, Large_HPSteam_Turbine,
+	Large_Gas_Turbine, Large_Plasma_Turbine,
 	Casing_Turbine_Shaft, 
 	Casing_Turbine_LP, Casing_Turbine_HP,
 	Casing_Turbine_Gas, Casing_Turbine_Plasma,
@@ -407,6 +409,16 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Controller_ElementalDuplicator,
 	Casing_ElementalDuplicator,
 	
+	// Forge Hammer
+	Controller_IndustrialForgeHammer,
+	Casing_IndustrialForgeHammer,
+
+	// Molecular Transformer
+	Controller_MolecularTransformer,
+	Casing_Molecular_Transformer_1,
+	Casing_Molecular_Transformer_2,
+	Casing_Molecular_Transformer_3,
+	
 	// Big Steam Macerator
 	Controller_SteamMaceratorMulti,
 	
@@ -444,7 +456,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Hatch_Reservoir,
 	
 	//XL Turbine Rotor Hatch
-	/*Hatch_Turbine_Rotor,*/
+	Hatch_Turbine_Rotor,
 	
 	//Standard Turbine Rotor Hatch
 	Hatch_Input_TurbineHousing,
@@ -500,12 +512,25 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Hatch_SuperBus_Output_MAX,  
 	
 
-
-
 	//----------------------------------------------------------------------------
 
 
+	/**
+	 * Blocks
+	 */
+	
+	
+	ResonanceChamber_I,
+	ResonanceChamber_II,
+	ResonanceChamber_III,
+	ResonanceChamber_IV,
 
+	Modulator_I,
+	Modulator_II,
+	Modulator_III,
+	Modulator_IV,
+
+	//----------------------------------------------------------------------------
 
 
 	/**
@@ -528,10 +553,44 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//infinite Items
 	Infinite_Item_Chest, 
 
+	//GT4 Redstone
+	GT4_Redstone_Lamp,
+	GT4_Redstone_Button_Panel,
+	GT4_Redstone_Scale,
+	GT4_Redstone_Display,
+	GT4_Redstone_Circuit,
 
 	//Gt4 Workbenches
 	GT4_Workbench_Bronze,
 	GT4_Workbench_Advanced,
+	
+	//GT4 automation
+	GT4_Electric_Auto_Workbench_LV,
+	GT4_Electric_Auto_Workbench_MV,
+	GT4_Electric_Auto_Workbench_HV,
+	GT4_Electric_Auto_Workbench_EV,
+	GT4_Electric_Auto_Workbench_IV,
+	GT4_Electric_Auto_Workbench_LuV,
+	GT4_Electric_Auto_Workbench_ZPM,
+	GT4_Electric_Auto_Workbench_UV,
+	GT4_Electric_Inventory_Manager_LV,
+	GT4_Electric_Inventory_Manager_MV,
+	GT4_Electric_Inventory_Manager_HV,
+	GT4_Electric_Inventory_Manager_EV,
+	GT4_Electric_Inventory_Manager_IV,
+	GT4_Electric_Inventory_Manager_LuV,
+	GT4_Electric_Inventory_Manager_ZPM,
+	GT4_Electric_Inventory_Manager_UV,
+	
+	//GT4 Crop Harvester
+	GT4_Crop_Harvester_LV,
+	GT4_Crop_Harvester_MV,
+	GT4_Crop_Harvester_HV,
+	GT4_Crop_Harvester_EV,
+	GT4_Crop_Harvester_IV,
+	GT4_Crop_Harvester_LuV,
+	GT4_Crop_Harvester_ZPM,
+	GT4_Crop_Harvester_UV,
 
 
 	//Geothermal Engines
@@ -573,7 +632,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	SimpleDustWasher_UV, 
 	
 	//Solar Tower Reflector
-	/*Solar_Tower_Reflector,*/
+	Solar_Tower_Reflector,
 
 	//Super Tier Chests
 	Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java
new file mode 100644
index 0000000000..fe100955e0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java
@@ -0,0 +1,82 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_DataHatch extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 15, 107, 62));
+        addSlotToContainer(new SlotIntegratedCircuit(mTileEntity, 16, 19, 35));
+        
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 17;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 0;
+    }
+    
+	@Override
+	public void putStackInSlot(int par1, ItemStack par2ItemStack) {	
+		/*Logger.INFO("Slot: "+par1);
+		if (par1 < 16 && ItemList.Tool_DataOrb.isStackEqual(par2ItemStack)) {
+			super.putStackInSlot(par1, par2ItemStack);
+		}
+		if (par1 == 16 && ItemUtils.isControlCircuit(par2ItemStack)) {
+			super.putStackInSlot(par1, par2ItemStack);			
+		}*/		
+		super.putStackInSlot(par1, par2ItemStack);			
+	}
+
+	@Override
+	public boolean canDragIntoSlot(Slot par1Slot) {
+		return super.canDragIntoSlot(par1Slot);
+	}
+
+    public class GT_Slot_DataOrb extends Slot {
+        public GT_Slot_DataOrb(IInventory par1iInventory, int par2, int par3, int par4) {
+            super(par1iInventory, par2, par3, par4);
+        }
+
+        @Override
+        public boolean isItemValid(ItemStack aStack) {
+            return ItemList.Tool_DataOrb.isStackEqual(aStack, false, true);
+        }
+    }
+
+
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java
index 937513751b..94cfa5236d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java
@@ -1,34 +1,44 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
 import gtPlusPlus.core.slots.SlotNoInput;
-
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.*;
 
 public class CONTAINER_PowerSubStation extends GT_Container_MultiMachine {
-	
+
+	public long mStoredEU;
+	public int mStoredEU1;
+	public int mStoredEU2;
+	public long mMaxStoredEU;
+	public int mMaxStoredEU1;
+	public int mMaxStoredEU2;
+	public long mAverageEuAdded;
+	public int mAverageEuAdded1;
+	public int mAverageEuAdded2;
+	public long mAverageEuConsumed;
+	public int mAverageEuConsumed1;
+	public int mAverageEuConsumed2;
+
 	public CONTAINER_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
 		super(aInventoryPlayer, aTileEntity);
 	}
 
-	public CONTAINER_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity,
-			final boolean bindInventory) {
+	public CONTAINER_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
 		super(aInventoryPlayer, aTileEntity, bindInventory);
 	}
 
 	public void addSlots(final InventoryPlayer aInventoryPlayer) {
 		this.addSlotToContainer(new Slot((IInventory) this.mTileEntity, 1, 155, 5));
 		this.addSlotToContainer(new SlotNoInput((IInventory) this.mTileEntity, 2, 155, 23));
-		
-		for (int i = 0; i < 9; ++i) {
-			this.addSlotToContainer(new Slot((IInventory) aInventoryPlayer, i, 8 + i * 18, 167));
-		}
-		
+
+		for (int i = 0; i < 9; ++i) { this.addSlotToContainer(new Slot((IInventory) aInventoryPlayer, i, 8 + i * 18, 167)); }
+
 	}
 
 	public int getSlotCount() {
@@ -38,4 +48,78 @@ public class CONTAINER_PowerSubStation extends GT_Container_MultiMachine {
 	public int getShiftClickSlotCount() {
 		return 1;
 	}
-}
\ No newline at end of file
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+
+		mStoredEU = mTileEntity.getStoredEU();
+		mMaxStoredEU = mTileEntity.getEUCapacity();
+		GregtechMetaTileEntity_PowerSubStationController aPSS = (GregtechMetaTileEntity_PowerSubStationController) mTileEntity.getMetaTileEntity();		
+		mAverageEuAdded = aPSS.getAverageEuAdded();
+		mAverageEuConsumed = aPSS.getAverageEuConsumed();
+		int[] aStored = MathUtils.splitLongIntoTwoIntegers(mStoredEU);
+		int[] aMaxStorage = MathUtils.splitLongIntoTwoIntegers(mMaxStoredEU);
+		int[] aAvgIn = MathUtils.splitLongIntoTwoIntegers(mAverageEuAdded);
+		int[] aAvgOut = MathUtils.splitLongIntoTwoIntegers(mAverageEuConsumed);
+		mStoredEU1 = aStored[0];
+		mStoredEU2 = aStored[1];
+		mMaxStoredEU1 = aMaxStorage[0];
+		mMaxStoredEU2 = aMaxStorage[1];
+		mAverageEuAdded1 = aAvgIn[0];
+		mAverageEuAdded2 = aAvgIn[1];
+		mAverageEuConsumed1 = aAvgOut[0];
+		mAverageEuConsumed2 = aAvgOut[1];
+
+		for (Object crafter : this.crafters) {
+			ICrafting var1 = (ICrafting) crafter;
+			if (mTimer % 20 == 0) {
+				var1.sendProgressBarUpdate(this, 21, mStoredEU1);
+				var1.sendProgressBarUpdate(this, 22, mStoredEU2);
+				var1.sendProgressBarUpdate(this, 23, mMaxStoredEU1);
+				var1.sendProgressBarUpdate(this, 24, mMaxStoredEU2);
+				var1.sendProgressBarUpdate(this, 25, mAverageEuAdded1);
+				var1.sendProgressBarUpdate(this, 26, mAverageEuAdded2);
+				var1.sendProgressBarUpdate(this, 27, mAverageEuConsumed1);
+				var1.sendProgressBarUpdate(this, 28, mAverageEuConsumed2);
+			}
+		}
+
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {
+			case 21 :
+				mStoredEU1 = par2;
+				break;
+			case 22 :
+				mStoredEU2 = par2;
+				mStoredEU = MathUtils.combineTwoIntegersToLong(mStoredEU1, mStoredEU2);
+				break;
+			case 23 :
+				mMaxStoredEU1 = par2;
+				break;
+			case 24 :
+				mMaxStoredEU2 = par2;
+				mMaxStoredEU = MathUtils.combineTwoIntegersToLong(mMaxStoredEU1, mMaxStoredEU2);
+				break;
+			case 25 :
+				mAverageEuAdded1 = par2;
+				break;
+			case 26 :
+				mAverageEuAdded2 = par2;
+				mAverageEuAdded = MathUtils.combineTwoIntegersToLong(mAverageEuAdded1, mAverageEuAdded2);
+				break;
+			case 27 :
+				mAverageEuConsumed1 = par2;
+				break;
+			case 28 :
+				mAverageEuConsumed2 = par2;
+				mAverageEuConsumed = MathUtils.combineTwoIntegersToLong(mAverageEuConsumed1, mAverageEuConsumed2);
+				break;
+		}
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java
new file mode 100644
index 0000000000..77cb0d71a2
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_DataHatch extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new CONTAINER_DataHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "HatchDataOrb.png");
+        mName = aName;
+    }
+
+    public GUI_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(new CONTAINER_DataHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "HatchDataOrb.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+		/*String[] aName = mName.trim().split("\\s+");
+		int aY = 4;
+		for (String s : aName) {
+		    fontRendererObj.drawString(s, 120, (aY += 12), 4210752);    		
+		}*/
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
index c78e7789b8..61cf59f6c9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -112,18 +112,32 @@ public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 				mInfo.add(StatCollector.translateToLocal("GTPP.machines.output")+" "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+ EnumChatFormatting.GREEN +GT_Values.VOLTAGE_NAMES[aOutputTier]);
 			}			
 
+			
+			
+			
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.progress")+": "+
 					EnumChatFormatting.GREEN + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mProgressTime/20) + EnumChatFormatting.RESET +" s / "+
 					EnumChatFormatting.YELLOW + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mMaxProgressTime/20) + EnumChatFormatting.RESET +" s");
 
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy")+": "+
-					EnumChatFormatting.GREEN + Long.toString(aStoredEnergy) + EnumChatFormatting.RESET +" "+EU+" / "+
-					EnumChatFormatting.YELLOW + Long.toString(aMaxEnergy) + EnumChatFormatting.RESET +" "+EU+"");
+					
+
+				
+			
+			
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy")+":");
+			mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.GREEN + Long.toString(aStoredEnergy) + EnumChatFormatting.RESET +" EU / "+
+					EnumChatFormatting.YELLOW + Long.toString(aMaxEnergy) + EnumChatFormatting.RESET +" EU"));
 
 			if (aRecipeEU != 0 && aRecipeDuration > 0) {
-				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage")+": "+
-						EnumChatFormatting.RED + Integer.toString(-aRecipeEU) + EnumChatFormatting.RESET + " "+EU+"/t");			
+				if (aRecipeEU > 0) {
+					mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage")+":");
+					mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.RED + Integer.toString(-aRecipeEU) + EnumChatFormatting.RESET + " EU/t/parallel"));
+				}
+				else {
+					mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.generation")+":");
+					mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.GREEN + Integer.toString(aRecipeEU) + EnumChatFormatting.RESET + " EU/t/parallel"));
+				}			
 				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.duration")+": "+
 						EnumChatFormatting.RED + Integer.toString(aRecipeDuration) + EnumChatFormatting.RESET + " ticks");
 				if (aRecipeSpecial > 0) {
@@ -132,18 +146,16 @@ public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 				}	
 			}		
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei")+": "+
-					EnumChatFormatting.YELLOW+Long.toString(aMaxInputVoltage)+EnumChatFormatting.RESET+ " "+EU+"/t"+EnumChatFormatting.RESET);
-
-			mInfo.add(StatCollector.translateToLocal(StatCollector.translateToLocal("GTPP.machines.tier")+": "+
-					EnumChatFormatting.YELLOW+GT_Values.VN[GT_Utility.getTier(aMaxInputVoltage)]+ EnumChatFormatting.RESET));
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei")+":");
+			mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.YELLOW+Long.toString(aMaxInputVoltage)+EnumChatFormatting.RESET+ " EU/t(*2A) "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+
+					EnumChatFormatting.YELLOW+GT_Values.VN[GT_Utility.getTier(aMaxInputVoltage)]+ EnumChatFormatting.RESET));			
 
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.efficiency")+": "+ EnumChatFormatting.YELLOW+Float.toString(aEfficiency / 100.0F)+EnumChatFormatting.RESET + " %");
 
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollution")+": "+ EnumChatFormatting.RED + (aPollutionTick*20)+ EnumChatFormatting.RESET+"/sec");
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced")+": "+ EnumChatFormatting.GREEN + aPollutionReduction + EnumChatFormatting.RESET+" %");
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel")+": "+EnumChatFormatting.GREEN+(aMaxParallel)+EnumChatFormatting.RESET);
+			//mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel")+": "+EnumChatFormatting.GREEN+(aMaxParallel)+EnumChatFormatting.RESET);
 
 			mInfo.add("Total Time Since Built: ");
 			mInfo.add("" + EnumChatFormatting.DARK_GREEN + Integer.toString(weeks)+EnumChatFormatting.RESET+" Weeks,");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java
index 65ba8610dd..f8aaa1792d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java
@@ -1,175 +1,126 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Utility;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.IIcon;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 
 public class GUI_PowerSubStation extends GT_GUIContainerMetaTile_Machine {
 	public String mNEI;
 	String mName;
 	boolean[] mRepairStatus = new boolean[6];
-	private static IIcon[] mGregToolIcons = new IIcon[6];
+
+	public final CONTAINER_PowerSubStation mPowerContainer;
 
 	public GUI_PowerSubStation(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aNEI) {
 		super(new CONTAINER_PowerSubStation(aInventoryPlayer, aTileEntity, false), CORE.RES_PATH_GUI + "PowerSubStation.png");
 		this.mName = aName;
 		this.mNEI = aNEI;
+		mPowerContainer = (CONTAINER_PowerSubStation) mContainer;
 		/** The X size of the inventory window in pixels. */
 		this.xSize = 196;
 		/** The Y size of the inventory window in pixels. */
 		this.ySize = 191;		
-		for (IIcon g : mGregToolIcons) {
-			if (g == null) {
-				getToolTextures();
-			}
-		}		
-	}
-
-	private static final boolean getToolTextures() {
-		mGregToolIcons[0] = Textures.ItemIcons.WRENCH.getIcon();
-		mGregToolIcons[1] = Textures.ItemIcons.HANDLE_SCREWDRIVER.getIcon();
-		mGregToolIcons[2] = Textures.ItemIcons.MORTAR.getIcon();
-		mGregToolIcons[3] = Textures.ItemIcons.JACKHAMMER.getIcon();
-		mGregToolIcons[4] = Textures.ItemIcons.HANDLE_SOLDERING.getIcon();
-		mGregToolIcons[5] = Textures.ItemIcons.CROWBAR.getIcon();		
-		return true;
 	}
 
 	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
 		this.fontRendererObj.drawString(this.mName, 8, -10, 16448255);
-		if (this.mContainer != null) {	
+