Merge branch 'mergeGTNH' into experimental

1 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 0b7b68875a..7776ccf465 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -13,6 +13,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gregtech.loaders.materialprocessing.ProcessingModSupport;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -96,7 +97,7 @@ public class ItemComb extends Item {
 
 	public void initCombsRecipes() {
 		ItemStack tComb;
-		
+
 	    //Organic
 		tComb = getStackForType(CombType.LIGNIE);
 		addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), 90);
@@ -183,16 +184,18 @@ public class ItemComb extends Item {
 		addProcess(tComb, Materials.VanadiumMagnetite, 100);
 		addProcess(tComb, Materials.BandedIron, 100);
 		addProcess(tComb, Materials.Pyrite, 100);
-		addProcess(tComb, Materials.MeteoricIron, 100);
+		if (ProcessingModSupport.aEnableGCMarsMats)
+			addProcess(tComb, Materials.MeteoricIron, 100);
 		tComb = getStackForType(CombType.STEEL);
-		addProcess(tComb, Materials.Iron, Materials.Steel, 100);
-		addProcess(tComb, Materials.Magnetite, Materials.Steel, 100);
-		addProcess(tComb, Materials.BrownLimonite, Materials.Steel, 100);
-		addProcess(tComb, Materials.YellowLimonite, Materials.Steel, 100);
-		addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumSteel, 100);
-		addProcess(tComb, Materials.BandedIron, Materials.Steel, 100);
-		addProcess(tComb, Materials.Pyrite, Materials.Steel, 100);
-		addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricSteel, 100);
+		addProcess(tComb, Materials.Iron, Materials.Iron, 100);
+		addProcess(tComb, Materials.Magnetite, Materials.Magnetite, 100);
+		addProcess(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 100);
+		addProcess(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 100);
+		addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 100);
+		addProcess(tComb, Materials.BandedIron, Materials.BandedIron, 100);
+		addProcess(tComb, Materials.Pyrite, Materials.Pyrite, 100);
+		if (ProcessingModSupport.aEnableGCMarsMats)
+			addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
 		addProcess(tComb, Materials.Molybdenite, 100);
 		addProcess(tComb, Materials.Molybdenum, 100);
 		tComb = getStackForType(CombType.NICKEL);