diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 3e4a33e21d..3c85bd8040 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -56,19 +56,19 @@ public enum CombType { OLIVINE("olivine", true, Materials.Olivine, 100), EMERALD("emerald", true, Materials.Emerald, 100), PYROPE("pyrope", true, Materials.Pyrope, 100), - GROSSULAR("grassular", true, Materials.Grossular, 100), + GROSSULAR("grossular", true, Materials.Grossular, 100), FIRESTONE("firestone", true, Materials.Firestone, 100), //Metals Line SLAG("slag", true, Materials._NULL, 50), COPPER("coppon", true, Materials.Copper, 100), - TIN("tine", true, Materials.Tin, 100), + TIN("tin", true, Materials.Tin, 100), LEAD("lead", true, Materials.Lead, 100), IRON("iron", true, Materials.Iron, 100), STEEL("steel", true, Materials.Steel, 95), NICKEL("nickel", true, Materials.Nickel, 100), ZINC("zinc", true, Materials.Zinc, 100), - SILVER("argentia", true, Materials.Silver, 100), + SILVER("silver", true, Materials.Silver, 100), GOLD("gold", true, Materials.Gold, 100), SULFUR("sulfur", true, Materials.Sulfur, 100), GALLIUM ("gallium", true, Materials.Gallium, 75), @@ -127,10 +127,10 @@ public enum CombType { //gems {0x808080, 0x999999}, {0x57CFFB, 0xBBEEFF}, - {0x7D0F0F, 0xD11919}, {0xA375FF, 0xB591FF}, - {0x1947D1, 0x476CDA}, + {0x7D0F0F, 0xD11919}, {0x555643, 0x343428}, + {0x1947D1, 0x476CDA}, {0xE6005C, 0xCC0052}, {0xBD4C4C, 0xECCECE}, {0xA3A341, 0xEDEDCE}, |