Cherry Pick

41b93ae85dfe8e15f7d46a09cb49b65991901fed
RedAlloy, TungstenCarbide now have the correct formula.
Changed the formula of Lignite, it no longer contains Ash

Fixed the algorithm for determining whether or not to put brackets
around a partial Material.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 62adefa35b..8dbcbd6dd6 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -1,5 +1,7 @@
 package gregtech.api.objects;
 
+import java.util.List;
+
 import gregtech.api.enums.Materials;
 
 public class MaterialStack implements Cloneable {
@@ -35,7 +37,8 @@ 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 || (mMaterial.mMaterialList.size() == 1 && mMaterial.mElement == null)) {
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
                 temp3 = ")";
              }
@@ -43,6 +46,16 @@ public class MaterialStack implements Cloneable {
         return String.valueOf(new StringBuilder().append(temp1).append(temp2).append(temp3).append(temp4));
     }
 
+    private boolean isMaterialListComplex(MaterialStack materialStack){
+    	if (materialStack.mMaterial.mMaterialList.size() > 1) {
+    		return true;
+    	}
+    	if (materialStack.mMaterial.mMaterialList.size() == 0) {
+    		return false;
+    	}
+    	return isMaterialListComplex(materialStack.mMaterial.mMaterialList.get(0));
+    }
+    
     @Override
     public int hashCode() {
         return mMaterial.hashCode();