diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
| commit | de42d1da4264bc0dd339020374b45138d8ddb691 (patch) | |
| tree | da598e6f87b136199542263f5c471934f9f2649b /src/main/java/gregtech/api/objects/MaterialStack.java | |
| parent | fcaefe2d2853651f05d83105ee1c7deba104bb9c (diff) | |
| parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
| download | GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.gz GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.bz2 GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.zip | |
Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
BrickedBlastFurnace
Conflicts:
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.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/objects/MaterialStack.java')
| -rw-r--r-- | src/main/java/gregtech/api/objects/MaterialStack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index 6066d3cf23..62adefa35b 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -35,7 +35,7 @@ public class MaterialStack implements Cloneable { String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = ""; if (mAmount > 1) { temp4 = String.valueOf(mAmount); - if (mMaterial.mMaterialList.size() > 1) { + if (mMaterial.mMaterialList.size() > 1 || (mMaterial.mMaterialList.size() == 1 && mMaterial.mElement == null)) { temp1 = "("; temp3 = ")"; } |