diff options
| author | JohannesGaessler <johannesg@balance.gg> | 2017-06-01 10:22:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 10:22:10 +0200 |
| commit | 7eb176f3a2334246229c6fc556c806e5f6a1ff03 (patch) | |
| tree | 5ae4926dc018b68734b38a7e3b6a7c7579a9bc51 /src/main/java/gregtech/common/items/ItemComb.java | |
| parent | 3c45c2accb08c37016ccd3f3217c09d18beb3326 (diff) | |
| parent | 9a69e1978db321e8f1462dd982c5a199911ca334 (diff) | |
| download | GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.gz GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.tar.bz2 GT5-Unofficial-7eb176f3a2334246229c6fc556c806e5f6a1ff03.zip | |
Merge branch 'unstable' into ChemistryUpdate
Diffstat (limited to 'src/main/java/gregtech/common/items/ItemComb.java')
| -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); |