aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-05-22 19:02:03 +0200
committerTechnus <daniel112092@gmail.com>2017-05-22 19:02:03 +0200
commit3102ff64a1e0eb6f819787aa02093a625f31a7d8 (patch)
treed026caf2f542eb8318523d6b2ea22433b22b5854 /src/main/java/gregtech/api/objects
parent9d0c87020d9b7c402bfd75b92f76b1381fb6a3f6 (diff)
parent104d3f942491b47b7a33d88f7c72214c03850afa (diff)
downloadGT5-Unofficial-3102ff64a1e0eb6f819787aa02093a625f31a7d8.tar.gz
GT5-Unofficial-3102ff64a1e0eb6f819787aa02093a625f31a7d8.tar.bz2
GT5-Unofficial-3102ff64a1e0eb6f819787aa02093a625f31a7d8.zip
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r--src/main/java/gregtech/api/objects/MaterialStack.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index df087a2225..3553be91c7 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -34,7 +34,6 @@ public class MaterialStack implements Cloneable {
@Override
public String toString() {
String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
- System.out.println("EPIK "+mMaterial.mDefaultLocalName+" "+mMaterial.mElement);
if (mAmount > 1) {
temp4 = String.valueOf(mAmount);
if (mMaterial.mMaterialList.size() > 1 || (mMaterial.mMaterialList.size() == 1 && mMaterial.mElement == null)) {