diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-06-01 20:59:20 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-06-01 20:59:20 +0500 |
| commit | f2f74c09f931b5e6647037b40d56672d3b605cb2 (patch) | |
| tree | 0bb366812afd8d8fe1473112b7ac7898e134d977 /src/main/java/gregtech/common/items | |
| parent | f19e920925aa5c85ec32e7e4b6e17588528eb3e3 (diff) | |
| parent | 0a928887eda8a9a3961d9b409e8ed7b2b1336995 (diff) | |
| download | GT5-Unofficial-f2f74c09f931b5e6647037b40d56672d3b605cb2.tar.gz GT5-Unofficial-f2f74c09f931b5e6647037b40d56672d3b605cb2.tar.bz2 GT5-Unofficial-f2f74c09f931b5e6647037b40d56672d3b605cb2.zip | |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 16 |
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); |