diff options
| author | Technus <daniel112092@gmail.com> | 2017-06-17 17:10:25 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-06-17 17:10:25 +0200 |
| commit | 9dcb8a857994860c4effb5ab1e6f10ab7cf9f85a (patch) | |
| tree | 87e88791654c4044d40c31db2f0aae8599675502 /src/main/java/gregtech/api/metatileentity/MetaTileEntity.java | |
| parent | 5b77ed49f740dc8251e2b5bffe34c6832f2cd6fa (diff) | |
| parent | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (diff) | |
| download | GT5-Unofficial-9dcb8a857994860c4effb5ab1e6f10ab7cf9f85a.tar.gz GT5-Unofficial-9dcb8a857994860c4effb5ab1e6f10ab7cf9f85a.tar.bz2 GT5-Unofficial-9dcb8a857994860c4effb5ab1e6f10ab7cf9f85a.zip | |
Merge branch 'unstable_BLOOD' into reMerge
# Conflicts:
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/MetaTileEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/MetaTileEntity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index e266ff89d1..4c67740b00 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -86,10 +86,10 @@ public abstract class MetaTileEntity implements IMetaTileEntity { GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName); mInventory = new ItemStack[aInvSlotCount]; - if (GT.isClientSide()) { - ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID); - tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true); - } +// if (GT.isClientSide()) { +// ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID); +// tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true); +// } } /** |