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

5 files changed, 35 insertions, 34 deletions

diff --git a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
index 12ee893de4..4ea3fed295 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
@@ -39,27 +39,27 @@ public class GT_Container_ChestBuffer
             if (aSlotIndex == 27) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));
                 }
                 return null;
             }
             if (aSlotIndex == 28) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("118","Emit Redstone if no Slot is free"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("119","Don't emit Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 29) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));
                 }
                 return null;
             }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Filter.java b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
index 0355aa1753..bfe8578623 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Filter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
@@ -71,45 +71,45 @@ public class GT_Container_Filter
             if (aSlotIndex == 18) {
                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput);
                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));
                 }
                 return null;
             }
             if (aSlotIndex == 19) {
                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("122","Emit Redstone if slots contain something"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("123","Don't emit Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 20) {
                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert);
                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 21) {
                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter);
                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("124","Invert Filter"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("125","Don't invert Filter"));
                 }
                 return null;
             }
             if (aSlotIndex == 22) {
                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT);
                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Ignore NBT");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("126","Ignore NBT"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "NBT has to match");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("127","NBT has to match"));
                 }
                 return null;
             }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
index c9e51ecb81..b4e8e7aebb 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;

 import gregtech.api.gui.GT_Slot_Holo;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.tileentities.automation.GT_MetaTileEntity_Regulator;

 import net.minecraft.entity.player.EntityPlayer;

@@ -73,9 +74,9 @@ public class GT_Container_Regulator
             if (aSlotIndex == 28) {

                 ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116", "Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117", "Don't emit Energy"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
index 8380baacf0..3a0bd80bf3 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
@@ -34,27 +34,27 @@ public class GT_Container_SuperBuffer
             if (aSlotIndex == 0) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));
                 }
                 return null;
             }
             if (aSlotIndex == 1) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("118","Emit Redstone if no Slot is free"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("119","Don't emit Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 2) {
                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert);
                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));
                 }
                 return null;
             }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java b/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
index 2f21b7b98a..59c6edfeea 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
@@ -53,45 +53,45 @@ public class GT_Container_TypeFilter
             if (aSlotIndex == 10) {
                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput);
                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));
                 }
                 return null;
             }
             if (aSlotIndex == 11) {
                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("122","Emit Redstone if slots contain something"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("123","Don't emit Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 12) {
                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert);
                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));
                 }
                 return null;
             }
             if (aSlotIndex == 13) {
                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter);
                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("124","Invert Filter"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("125","Don't invert Filter"));
                 }
                 return null;
             }
             if (aSlotIndex == 14) {
                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed);
                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed) {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Allow Items with NBT");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("126","Ignore NBT"));
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't allow Items with NBT");
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("127","NBT has to match"));
                 }
                 return null;
             }