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

10 files changed, 447 insertions, 254 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
index 6967c8eb33..5ccbd8cb2d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
@@ -15,6 +15,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
+import gtPlusPlus.xmod.gregtech.api.interfaces.IBaseCustomMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import ic2.api.Direction;
@@ -22,7 +23,7 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class BaseCustomTileEntity extends BaseMetaTileEntity {
+public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCustomMetaTileEntity {
 		
 	protected NBTTagCompound mRecipeStuff2;
 	private static final Field ENTITY_ITEM_HEALTH_FIELD_2;
@@ -49,6 +50,10 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity {
 		super();
 		Logger.MACHINE_INFO("Created new BaseCustomTileEntity");
 	}
+	
+	public boolean doesExplode() {
+		return true;
+	}
 
 	public void writeToNBT(NBTTagCompound aNBT) {
 		try {
@@ -70,6 +75,10 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity {
 	}
 
 	public void doEnergyExplosion() {
+		if (!doesExplode()) {
+			Logger.INFO("Machine tried to explode, let's stop that. xo [doEnergyExplosion]");
+			return;
+		}
 		if (this.getUniversalEnergyCapacity() > 0L
 				&& this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 5L) {
 			this.doExplosion(
@@ -83,6 +92,12 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity {
 	}
 
 	public void doExplosion(long aAmount) {
+		
+		if (!doesExplode()) {
+			Logger.INFO("Machine tried to explode, let's stop that. xo [doExplosion]");
+			return;
+		}
+		
 		if (this.canAccessData()) {
 			if (GregTech_API.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
 				try {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
index a4440114e8..d600d0baca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
@@ -10,34 +10,38 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
 
 	public BaseCustomPower_MTE() {
 		super();
-		Logger.MACHINE_INFO("Created new BaseCustomPower_MTE");
+		Logger.INFO("Created new BaseCustomPower_MTE");
+	}
+	
+	public boolean doesExplode() {
+		return false;
 	}
 
 	public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) {		
 		if (mMetaTileEntity == null) {
-			Logger.MACHINE_INFO("Bad Tile");			
+			Logger.INFO("Bad Tile");			
 		}		
 		if (this.canAccessData() && this.mMetaTileEntity.isElectric() && this.inputEnergyFrom(aSide) && aAmperage > 0L
 				&& aVoltage > 0L && this.getStoredEU() < this.getEUCapacity()
 				&& this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()) {
-			Logger.MACHINE_INFO("Injecting Energy Units");			
+			Logger.INFO("Injecting Energy Units");			
 			return super.injectEnergyUnits(aSide, aVoltage, aAmperage);			
 		} else {
-			Logger.MACHINE_INFO("canAccessData(): "+canAccessData());
-			Logger.MACHINE_INFO("isElectric(): "+this.mMetaTileEntity.isElectric());
-			Logger.MACHINE_INFO("InputEnergyFromSide("+aSide+"): "+this.inputEnergyFrom(aSide));
-			Logger.MACHINE_INFO("aAmperage: "+aAmperage);
-			Logger.MACHINE_INFO("aVoltage: "+aVoltage);
-			Logger.MACHINE_INFO("this.getStoredEU() < this.getEUCapacity(): "+(this.getStoredEU() < this.getEUCapacity()));
-			Logger.MACHINE_INFO("this.mMetaTileEntity.maxAmperesIn() >= this.mAcceptedAmperes: "+(this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()));
-			Logger.MACHINE_INFO("this.mMetaTileEntity.maxAmperesIn(): "+(this.mMetaTileEntity.maxAmperesIn()));
-			Logger.MACHINE_INFO("this.mAcceptedAmperes: "+(this.getInputAmperage()));
+			Logger.INFO("canAccessData(): "+canAccessData());
+			Logger.INFO("isElectric(): "+this.mMetaTileEntity.isElectric());
+			Logger.INFO("InputEnergyFromSide("+aSide+"): "+this.inputEnergyFrom(aSide));
+			Logger.INFO("aAmperage: "+aAmperage);
+			Logger.INFO("aVoltage: "+aVoltage);
+			Logger.INFO("this.getStoredEU() < this.getEUCapacity(): "+(this.getStoredEU() < this.getEUCapacity()));
+			Logger.INFO("this.mMetaTileEntity.maxAmperesIn() >= this.mAcceptedAmperes: "+(this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()));
+			Logger.INFO("this.mMetaTileEntity.maxAmperesIn(): "+(this.mMetaTileEntity.maxAmperesIn()));
+			Logger.INFO("this.mAcceptedAmperes: "+(this.getInputAmperage()));
 			return 0L;
 		}
 	}
 
 	public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
-		Logger.MACHINE_INFO("Draining Energy Units 4");
+		Logger.INFO("Draining Energy Units 4");
 		if (this.canAccessData() && this.mMetaTileEntity.isElectric() && this.outputsEnergyTo(aSide)
 				&& this.getStoredEU() - aVoltage * aAmperage >= this.mMetaTileEntity.getMinimumStoredEU()) {
 			if (this.decreaseStoredEU(aVoltage * aAmperage, false)) {
@@ -54,7 +58,7 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
 
 	@Override
 	public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {
-		Logger.MACHINE_INFO("Draining Energy Units 3");
+		Logger.INFO("Draining Energy Units 3");
 		// TODO Auto-generated method stub
 		return super.decreaseStoredEnergyUnits(aEnergy, aIgnoreTooLessEnergy);
 	}
@@ -73,7 +77,7 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
 
 	@Override
 	public boolean outputsEnergyTo(byte aSide) {
-		Logger.MACHINE_INFO("Draining Energy Units 2");
+		Logger.INFO("Draining Energy Units 2");
 		// TODO Auto-generated method stub
 		return super.outputsEnergyTo(aSide);
 	}
@@ -134,7 +138,7 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
 
 	@Override
 	public boolean decreaseStoredEU(long aEnergy, boolean aIgnoreTooLessEnergy) {
-		Logger.MACHINE_INFO("Draining Energy Units 1");
+		Logger.INFO("Draining Energy Units 1");
 		// TODO Auto-generated method stub
 		return super.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy);
 	}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
index 785c4698db..8110037c46 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
@@ -79,7 +79,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
 
     @Override
     public String[] getDescription() {
-
 		AutoMap<String> aTooltip = new AutoMap<String>();
 		String []s1 = null;
 		s1 = new String[aTooltip.size()];
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
index 8b7ccc202a..31d24ff343 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
@@ -4,7 +4,6 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.entity.Entity;
@@ -16,6 +15,7 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
 	public MetaTileEntityCustomPower(int aID, String aBasicName, String aRegionalName, int aInvSlotCount) {
 		super(aID, aBasicName, aRegionalName, aInvSlotCount);
 		this.setBaseMetaTileEntity(Meta_GT_Proxy.constructBaseMetaTileEntityCustomPower());
+		this.getBaseMetaTileEntity().setMetaTileID((short) aID);
 	}
 	
 	public MetaTileEntityCustomPower(String aStack, int aInvSlotCount) {
@@ -25,11 +25,17 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
 	public long getMinimumStoredEU() {
 		return 0L;
 	}
+	
+	public boolean doesExplode() {
+		return this.getBaseCustomMetaTileEntity().doesExplode();
+	}
+	
+	
 
 	public void doExplosion(long aExplosionPower) {
 		
-		if (MathUtils.randInt(1, 10) > 0) {
-			//Logger.INFO("Machine tried to explode, let's stop that. xo");
+		if (!doesExplode()) {
+			Logger.INFO("Machine tried to explode, let's stop that. xo [doExplosion]");
 			return;
 		}
 		
@@ -68,12 +74,10 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
 
 	@Override
 	public void onExplosion() {
-		
-		if (MathUtils.randInt(1, 10) > 0) {
-			//Logger.INFO("Machine tried to explode, let's stop that. xo");
+		if (!doesExplode()) {
+			Logger.INFO("Machine tried to explode, let's stop that. xo [onExplosion]");
 			return;
 		}
-		// TODO Auto-generated method stub
 		super.onExplosion();
 	}
 
@@ -84,7 +88,6 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
 
 	@Override
 	public long getEUVar() {
-		// TODO Auto-generated method stub
 		return super.getEUVar();
 	}
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
index e6bf4b8486..3821b2a95c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
@@ -9,8 +9,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.GTPP_MTE_TieredMachineBlock;
 import ic2.api.item.ElectricItem;
@@ -19,9 +17,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
 
 public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock {
-	
+
 	public boolean mCharge = false;
 	public boolean mDecharge = false;
 	public int mBatteryCount = 0;
@@ -30,53 +29,50 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 	private long mStored = 0L;
 	private long mMax = 0L;
 
-	public GT_MetaTileEntity_BasicBreaker(int aID, String aName, String aNameRegional, int aTier,
-			String aDescription, int aSlotCount) {
+	public GT_MetaTileEntity_BasicBreaker(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
 		super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription, new ITexture[0]);
 	}
 
-	public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
-			int aSlotCount) {
+	public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
 		super(aName, aTier, aSlotCount, aDescription, aTextures);
 	}
 
-	public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String[] aDescription,
-			ITexture[][][] aTextures, int aSlotCount) {
+	public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) {
 		super(aName, aTier, aSlotCount, aDescription, aTextures);
 	}
 
 	public String[] getDescription() {
-		String []s1 = super.getDescription();		
-		s1 = new String[0];
-		return s1;
+		final String[] desc = new String[6];
+		int tTier = this.mTier;
+		desc[0] = "" + EnumChatFormatting.BOLD + "16 Fuse Slots";
+		desc[1] = "Per each fuse, you may insert " + EnumChatFormatting.YELLOW + (GT_Values.V[tTier]) + EnumChatFormatting.GRAY + " EU/t";
+		desc[2] = "However this " + EnumChatFormatting.ITALIC + EnumChatFormatting.RED + "MUST" + EnumChatFormatting.GRAY + " be in a single Amp";
+		desc[3] = "This machine can accept upto a single amp of " + GT_Values.VN[Math.min(tTier + 2, 15)] + " as a result";
+		desc[4] = "Breaker Loss: " + EnumChatFormatting.RED + "" + (GT_Values.V[tTier] / 16) + EnumChatFormatting.GRAY + " EU/t";
+		desc[5] = CORE.GT_Tooltip;
+		return desc;
 	}
 
 	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
 		ITexture[][][] rTextures = new ITexture[2][17][];
 
 		for (byte i = -1; i < 16; ++i) {
-			rTextures[0][i + 1] = new ITexture[]{BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
-					this.mInventory.length > 4
-							? BlockIcons.OVERLAYS_ENERGY_IN_MULTI[Math.min(12, mTier)]
-							: BlockIcons.OVERLAYS_ENERGY_IN[Math.min(12, mTier)]};
-			
-			rTextures[1][i + 1] = new ITexture[]{BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
-					this.mInventory.length > 4
-							? BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
-							: BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};
+			rTextures[0][i + 1] = new ITexture[]{BlockIcons.MACHINE_CASINGS[this.mTier][i
+					+ 1], this.mInventory.length > 4 ? BlockIcons.OVERLAYS_ENERGY_IN_MULTI[Math.min(12, mTier)] : BlockIcons.OVERLAYS_ENERGY_IN[Math.min(12, mTier)]};
+
+			rTextures[1][i + 1] = new ITexture[]{BlockIcons.MACHINE_CASINGS[this.mTier][i
+					+ 1], this.mInventory.length > 4 ? BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] : BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]};
 		}
 
 		return rTextures;
 	}
 
-	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
-			boolean aActive, boolean aRedstone) {
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
 		return this.mTextures[aSide == aFacing ? 1 : 0][aColorIndex + 1];
 	}
 
 	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_BasicBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures,
-				this.mInventory.length);
+		return new GT_MetaTileEntity_BasicBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mInventory.length);
 	}
 
 	public boolean isSimpleMachine() {
@@ -132,11 +128,11 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 	}
 
 	public long maxAmperesIn() {
-		return (long) (1);
+		return 16;
 	}
 
 	public long maxAmperesOut() {
-		return (long) 16;
+		return 16;
 	}
 
 	public int rechargerSlotStartIndex() {
@@ -176,7 +172,8 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
 		if (aBaseMetaTileEntity.isClientSide()) {
 			return true;
-		} else {
+		}
+		else {
 			aBaseMetaTileEntity.openGUI(aPlayer);
 			return true;
 		}
@@ -199,14 +196,14 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 			this.mChargeableCount = 0;
 			ItemStack[] arg3 = this.mInventory;
 			int arg4 = arg3.length;
-
+			
 			for (int arg5 = 0; arg5 < arg4; ++arg5) {
 				ItemStack tStack = arg3[arg5];
 				if (GT_ModHandler.isElectricItem(tStack, this.mTier)) {
 					if (GT_ModHandler.isChargerItem(tStack)) {
 						++this.mBatteryCount;
 					}
-
+			
 					++this.mChargeableCount;
 				}
 			}*/
@@ -254,7 +251,8 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 
 							tStored += tStep;
 						}
-					} else if (aStack.getItem() instanceof IElectricItem) {
+					}
+					else if (aStack.getItem() instanceof IElectricItem) {
 						tStored += (long) ElectricItem.manager.getCharge(aStack);
 						tScale += (long) ((IElectricItem) aStack.getItem()).getMaxCharge(aStack);
 					}
@@ -273,11 +271,15 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
 		return new long[]{tStored, tScale};
 	}
 
-	public String[] getInfoData() {		
-		return new String[]{};
+	public String[] getInfoData() {
+		return new String[]{"Tile Type: " + this.getTileEntityBaseType()};
 	}
 
 	public boolean isGivingInformation() {
 		return true;
 	}
-}
\ No newline at end of file
+
+	public boolean doesExplode() {
+		return true;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
index a892346463..67a6fc7aeb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
@@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import java.util.ArrayList;
 
-import gregtech.api.gui.GT_Container_4by4;
-import gregtech.api.gui.GT_GUIContainer_4by4;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,7 +9,11 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_DataHatch;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_DataHatch;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -22,28 +24,30 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 	public GT_Recipe_Map mRecipeMap = null;
 
 	public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) {
-		super(aID, aName, aNameRegional, aTier, 16, new String[]{
+		super(aID, aName, aNameRegional, aTier, 17, new String[]{
 				"Holds Data Orbs for the Elemental Duplicator",
+				"Can insert/extract the circuit slot",
+				"Use Circuit to select a slot (1-16)",
 				CORE.GT_Tooltip
 		});
 	}
 
 	public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-		super(aName, aTier, 16, aDescription, aTextures);
+		super(aName, aTier, 17, aDescription, aTextures);
 	}
 
 	public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
-		super(aName, aTier, 16, aDescription, aTextures);
+		super(aName, aTier, 17, aDescription, aTextures);
 	}
 
 	@Override
 	public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-		return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Cyber_Interface)};
+		return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
 	}
 
 	@Override
 	public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-		return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Cyber_Interface)};
+		return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
 	}
 
 	@Override
@@ -80,12 +84,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 
 	@Override
 	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_Container_4by4(aPlayerInventory, aBaseMetaTileEntity);
+		return new CONTAINER_DataHatch(aPlayerInventory, aBaseMetaTileEntity);
 	}
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, "Data Orb Repository");
+		return new GUI_DataHatch(aPlayerInventory, aBaseMetaTileEntity, "Data Orb Repository");
 	}
 
 	@Override
@@ -96,13 +100,13 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 	}
 
 	public void updateSlots() {
-		for (int i = 0; i < mInventory.length; i++)
+		for (int i = 0; i < mInventory.length-1; i++)
 			if (mInventory[i] != null && mInventory[i].stackSize <= 0) mInventory[i] = null;
 		fillStacksIntoFirstSlots();
 	}
 
 	protected void fillStacksIntoFirstSlots() {
-		for (int i = 0; i < mInventory.length; i++) {
+		for (int i = 0; i < mInventory.length-1; i++) {
 			if (mInventory[i] != null && mInventory[i].stackSize <= 0) {
 				mInventory[i] = null;				
 			}
@@ -130,20 +134,47 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 
 	@Override
 	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		return true;
+		Logger.INFO("Checking if we can pull "+aStack.getDisplayName()+" from slot "+aIndex);
+		if (aIndex == mInventory.length-1 && ItemUtils.isControlCircuit(aStack) && aSide == getBaseMetaTileEntity().getFrontFacing()) {
+			return true;
+		}
+		return false;
 	}
 
 	@Override
 	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		return aSide == getBaseMetaTileEntity().getFrontFacing() && (mRecipeMap == null || mRecipeMap.containsInput(aStack));
+		Logger.INFO("Checking if we can put "+aStack.getDisplayName()+" into slot "+aIndex);
+		if (aIndex == mInventory.length-1 && ItemUtils.isControlCircuit(aStack) && aSide == getBaseMetaTileEntity().getFrontFacing()) {
+		return true;
+	}
+	return false;
 	}
 	
 	public ArrayList<ItemStack> getInventory(){
 		ArrayList<ItemStack> aContents = new ArrayList<ItemStack>();
-		for (int i=0;i<this.getSizeInventory();i++) {
-			aContents.add(this.getStackInSlot(i));
-		}
+		for (int i = getBaseMetaTileEntity().getSizeInventory() - 2; i >= 0; i--) {
+            if (getBaseMetaTileEntity().getStackInSlot(i) != null)
+            	aContents.add(getBaseMetaTileEntity().getStackInSlot(i));
+        } 
 		return aContents;
 	}
 
+	@Override
+	public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
+		if (aIndex == mInventory.length-1 && ItemUtils.isControlCircuit(aStack) && aSide == getBaseMetaTileEntity().getFrontFacing()) {
+			Logger.INFO("Putting "+aStack.getDisplayName()+" into slot "+aIndex);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) {
+		if (aIndex == mInventory.length-1 && ItemUtils.isControlCircuit(aStack)) {
+			Logger.INFO("Pulling "+aStack.getDisplayName()+" from slot "+aIndex);
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index a9cd179214..a4040c1c5e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -1,18 +1,21 @@
-/*
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.CONTAINER_1by1_Turbine;
 import gtPlusPlus.xmod.gregtech.api.gui.hatches.GUI_1by1_Turbine;
@@ -21,15 +24,16 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextu
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+@SuppressWarnings("deprecation")
 public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 
 	public boolean mHasController = false;
 	public boolean mUsingAnimation = true;
 	private String mControllerLocation;
+	public int mEUt = 0;
 
 	public GT_MetaTileEntity_Hatch_Turbine(int aID, String aName, String aNameRegional, int aTier) {
 		super(aID, aName, aNameRegional, aTier, 16, "Turbine Rotor holder for XL Turbines");
@@ -42,6 +46,18 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 	public GT_MetaTileEntity_Hatch_Turbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, 1, aDescription[0], aTextures);
 	}
+	
+	@Override
+	public String[] getDescription() {
+		return new String[]{
+				this.mDescription,
+				"Right Click with a soldering iron to reset controller link",
+				"Right Click with a wrench to remove turbine",
+				"Right Click with a screwdriver for technical information",
+				"Sneak + Right Click with a wrench to rotate",
+				"Sneak + Right Click with a screwdriver to disable animations",
+                CORE.GT_Tooltip};
+	}
 
 	@Override
 	public ITexture[] getTexturesActive(ITexture aBaseTexture) {
@@ -53,6 +69,14 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 		return new ITexture[]{aBaseTexture, getFrontFacingTurbineTexture()};
 	}
 
+	public int getEU() {
+		return this.mEUt;
+	}
+
+	public void setEU(int aEU) {
+		this.mEUt = aEU;
+	}
+
 	@Override
 	public boolean isSimpleMachine() {
 		return true;
@@ -73,6 +97,31 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 		return false;
 	}
 
+	public boolean hasTurbine() {
+		ItemStack aStack = this.mInventory[0];
+		boolean aIsValid = GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aStack);
+		return aIsValid;
+	}
+
+	public ItemStack getTurbine() {
+		if (hasTurbine()) {
+			return this.mInventory[0];
+		}
+		return null;
+	}
+
+	public boolean canWork() {
+		return hasTurbine();
+	}
+
+	public boolean insertTurbine(ItemStack aTurbine) {
+		if (GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aTurbine)) {
+			this.mInventory[0] = aTurbine;
+			return true;
+		}
+		return false;
+	}
+
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT_MetaTileEntity_Hatch_Turbine(mName, mTier, StaticFields59.getDescriptionArray(this), mTextures);
@@ -80,32 +129,23 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 
 	@Override
 	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
-		if (aBaseMetaTileEntity.isClientSide()) return true;
-		//aBaseMetaTileEntity.openGUI(aPlayer);
-		PlayerUtils.messagePlayer(aPlayer, "[Turbine Assembly Data] Using Animations? "+usingAnimations());
-		PlayerUtils.messagePlayer(aPlayer, "[Turbine Assembly Data] Has Controller? "+this.mHasController);
-		if (mHasController) {
-			PlayerUtils.messagePlayer(aPlayer, "[Turbine Assembly Data] Controller Location: "+BlockPos.generateBlockPos(mControllerLocation).getLocationString());
-			PlayerUtils.messagePlayer(aPlayer, "[Turbine Assembly Data] Controller Active? "+this.isControllerActive());
+		if (aBaseMetaTileEntity.isClientSide()) {
+			return true;
+		}
+		else {			
+			aBaseMetaTileEntity.openGUI(aPlayer);	
 		}
-		PlayerUtils.messagePlayer(aPlayer, "[Turbine Assembly Data] Is Active? "+this.getBaseMetaTileEntity().isActive());
 		return true;
 	}
 
 	@Override
 	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		switch (mTier) {
-		default:
-			return new CONTAINER_1by1_Turbine(aPlayerInventory, aBaseMetaTileEntity);
-		}
+		return new CONTAINER_1by1_Turbine(aPlayerInventory, aBaseMetaTileEntity);
 	}
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		switch (mTier) {
-		default:
-			return new GUI_1by1_Turbine(aPlayerInventory, aBaseMetaTileEntity, "Turbine Rotor Hatch");
-		}
+		return new GUI_1by1_Turbine(aPlayerInventory, aBaseMetaTileEntity, "Turbine Rotor Hatch");
 	}
 
 	@Override
@@ -122,6 +162,20 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 	public int getInventoryStackLimit() {
 		return 1;
 	}
+	
+	public void damageTurbine(int aEUt, int damageFactorLow, float damageFactorHigh) {
+		if (hasTurbine() && MathUtils.randInt(0, 1) == 0) {
+			ItemStack aTurbine = getTurbine();                  
+			((GT_MetaGenerated_Tool) aTurbine.getItem()).doDamage(aTurbine, (long)getDamageToComponent(aTurbine) * (long) Math.min(aEUt / damageFactorLow, Math.pow(aEUt, damageFactorHigh)));
+			if (aTurbine.stackSize == 0) {
+				aTurbine = null;
+			}
+		}
+	}
+    
+	private final int getDamageToComponent(ItemStack aStack) {
+		return 1;
+	}
 
 	@Override
 	public void saveNBTData(NBTTagCompound aNBT) {
@@ -138,22 +192,6 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);		
-		this.mUsingAnimation = Utils.invertBoolean(mUsingAnimation);
-		if (this.mUsingAnimation) {
-			PlayerUtils.messagePlayer(aPlayer, "Using Animated Turbine Texture.");
-		}
-		else {
-			PlayerUtils.messagePlayer(aPlayer, "Using Static Turbine Texture.");			
-		}	
-		PlayerUtils.messagePlayer(aPlayer, "Has Controller: "+this.mHasController);
-		if (mHasController) {
-			PlayerUtils.messagePlayer(aPlayer, "Controller Location: "+this.mControllerLocation);
-		}
-	}
-
-	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {		
 		super.onPostTick(aBaseMetaTileEntity, aTick);