Merge branch 'unstable_BLOOD' into reMerge

# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
# src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_UndergroundOil.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Material_Casings.java
# src/main/java/gregtech/common/covers/GT_Cover_Arm.java
# src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
# src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Drain.java
# src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
# src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
# src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
# src/main/java/gregtech/common/covers/GT_Cover_Pump.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
# src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
# src/main/java/gregtech/common/covers/GT_Cover_Vent.java
# src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_Filter.java
# src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java

2 files changed, 27 insertions, 17 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
index c2fa1ab8ad..14d2db52dd 100644
--- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -3,6 +3,7 @@ package gregtech.api.gui;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
@@ -182,4 +183,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
     public boolean canInteractWith(EntityPlayer player) {
         return mTileEntity.isUseableByPlayer(player);
     }
+    
+    public String trans(String aKey, String aEnglish){
+    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
index 568fe85e47..6fab29e482 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
@@ -31,42 +32,46 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
 
         if (mContainer != null) {//(mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8) | (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64));
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 1) != 0)
-                fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
+                fontRendererObj.drawString(trans("132","Pipe is loose."), 10, 16, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 2) != 0)
-                fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
+                fontRendererObj.drawString(trans("133","Screws are missing."), 10, 24, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 4) != 0)
-                fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
+                fontRendererObj.drawString(trans("134","Something is stuck."), 10, 32, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 8) != 0)
-                fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
+                fontRendererObj.drawString(trans("135","Platings are dented."), 10, 40, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 16) != 0)
-                fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
+                fontRendererObj.drawString(trans("136","Circuitry burned out."), 10, 48, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 32) != 0)
-                fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
+                fontRendererObj.drawString(trans("137","That doesn't belong there."), 10, 56, 16448255);
             if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0)
-                fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+                fontRendererObj.drawString(trans("138","Incomplete Structure."), 10, 64, 16448255);
 
             if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) {
                 if (((GT_Container_MultiMachine) mContainer).mActive == 0) {
-                    fontRendererObj.drawString("Hit with Soft Mallet", 10, 16, 16448255);
-                    fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255);
-                    fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255);
+                    fontRendererObj.drawString(trans("139","Hit with Soft Mallet"), 10, 16, 16448255);
+                    fontRendererObj.drawString(trans("140","to (re-)start the Machine"), 10, 24, 16448255);
+                    fontRendererObj.drawString(trans("141","if it doesn't start."), 10, 32, 16448255);
                 } else {
-                    fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
+                    fontRendererObj.drawString(trans("142","Running perfectly."), 10, 16, 16448255);
                 }
                 	int id = mContainer.mTileEntity.getMetaTileID();
                     if (id == 1157 || id == 1158 || id == 1177 || id == 1178 || id == 1179) {
                     	ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
-                        if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-                    		fontRendererObj.drawString("Missing Mining Pipe", 10,((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
+                    	if(tItem==null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))){
+                    		fontRendererObj.drawString(trans("143","Missing Mining Pipe"), 10,((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
                     	}
-                    } else if (id == 1131 || id == 1151 || id == 1152 || id == 1153) {
+                    }else if(id == 1131 || id == 1151 || id == 1152 || id == 1153){
                     	ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
-                        if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) {
-                            fontRendererObj.drawString("Missing Turbine Rotor", 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
+                    	if(tItem==null || !(tItem.getItem()==GT_MetaGenerated_Tool_01.INSTANCE&&tItem.getItemDamage()>=170&&tItem.getItemDamage()<=177)){
+                    		fontRendererObj.drawString(trans("144","Missing Turbine Rotor"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255);
                     	}
-                    }
+                    }                
             }
         }
+    }  
+    
+    public String trans(String aKey, String aEnglish){
+    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);
     }
 
     @Override