diff options
| author | Daniel <daniel112092@gmail.com> | 2017-06-18 11:30:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 11:30:32 +0200 |
| commit | 80a56026b16d49a18fd3d42a2d3dfa06de167c82 (patch) | |
| tree | 8112db284de8e9240865e05577bd19c14ecc71f1 /src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | |
| parent | d7f24f3e68826adb1a15369628ded0744c123fca (diff) | |
| parent | 6f7e5063c0552c01dcc412ca01f0a243776dd9a1 (diff) | |
| download | GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.tar.gz GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.tar.bz2 GT5-Unofficial-80a56026b16d49a18fd3d42a2d3dfa06de167c82.zip | |
Merge pull request #26 from GTNewHorizons/reMerge
Re merge
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 1f91f30c59..5a3f8c2227 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -808,7 +808,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { if (mWorks) disableWorking(); else enableWorking(); - GT_Utility.sendChatToPlayer(aPlayer, "Machine Processing: " + (isAllowedToWork() ? "Enabled" : "Disabled")); + GT_Utility.sendChatToPlayer(aPlayer, trans("090","Machine Processing: ") + (isAllowedToWork() ? trans("088","Enabled") : trans("087","Disabled"))); GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(101), 1.0F, -1, xCoord, yCoord, zCoord); } return true; @@ -817,7 +817,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) { if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) { mStrongRedstone ^= (1 << tSide); - GT_Utility.sendChatToPlayer(aPlayer, "Redstone Output at Side " + tSide + " set to: " + ((mStrongRedstone & (1 << tSide)) != 0 ? "Strong" : "Weak")); + GT_Utility.sendChatToPlayer(aPlayer, trans("091","Redstone Output at Side ") + tSide + trans("092"," set to: ") + ((mStrongRedstone & (1 << tSide)) != 0 ? trans("093","Strong") : trans("094","Weak"))); GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(103), 3.0F, -1, xCoord, yCoord, zCoord); } return true; |