diff options
author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
---|---|---|
committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
commit | 34474480f73ca5ab1c711d73bdb4bd809673e063 (patch) | |
tree | 794ef12002b88e2f01b5f6d76c9c1f9b62a48961 /src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java | |
parent | c3f2b2b49dc3911a377fd062908d4df78bd3e58d (diff) | |
parent | 08c75fd813a4b48ba7a6b58391767161791c96e7 (diff) | |
download | GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.gz GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.bz2 GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.zip |
Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
Diffstat (limited to 'src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java')
-rw-r--r-- | src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java | 5 |
1 files changed, 5 insertions, 0 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 |