aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items/ItemComb.java
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2017-06-01 20:59:40 +0500
committerTechlone <techlone.mc@gmail.com>2017-06-01 20:59:40 +0500
commit067f4491a812497f6bd013690cf9d8b13f8fc4b3 (patch)
tree2d2fb412e2f503b9ba5fafa073e0afec6580c464 /src/main/java/gregtech/common/items/ItemComb.java
parent7c48590a49242bb26eddafa26d2cd7b4ce3546d8 (diff)
parentf2f74c09f931b5e6647037b40d56672d3b605cb2 (diff)
downloadGT5-Unofficial-067f4491a812497f6bd013690cf9d8b13f8fc4b3.tar.gz
GT5-Unofficial-067f4491a812497f6bd013690cf9d8b13f8fc4b3.tar.bz2
GT5-Unofficial-067f4491a812497f6bd013690cf9d8b13f8fc4b3.zip
Merge branch 'unstable' into advminer2_improvements
Diffstat (limited to 'src/main/java/gregtech/common/items/ItemComb.java')
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index ee314c8e31..6ee6d790db 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -187,15 +187,15 @@ public class ItemComb extends Item {
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.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.MeteoricSteel, 100);
+ addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
addProcess(tComb, Materials.Molybdenite, 100);
addProcess(tComb, Materials.Molybdenum, 100);
tComb = getStackForType(CombType.NICKEL);