diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index f682fd72c6..50e3e853b2 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -196,7 +196,9 @@ public enum CombType { CAELESTISGREEN(155, "caelestisgreen", true, Materials._NULL, 100, 0x00FF00, 0xB233FF), CAELESTISBLUE(156, "caelestisblue", true, Materials._NULL, 100, 0x0000FF, 0xFF99A5), UNKNOWNWATER(157, "unknownwater", true, Materials._NULL, 100, 0x36ABFF, 0x4333A5), + //ESSENTIA gets a use soon. Dont remove. ESSENTIA(158, "essentia", true, Materials._NULL, 100, 0xED3601, 0xFF6D50), + INDIUM(159, "indium", true, Materials.Indium, 100, 0x8F5D99, 0xFFA9FF), //ALWAYS KEEP _NULL AT THE BOTTOM _NULL(-1, "INVALIDCOMB", false, Materials._NULL, 0, 0, 0); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 7957bdd33a..b6484d394f 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -232,6 +232,7 @@ public class ItemComb extends Item { addProcessGT(CombType.COPPER, new Materials[] {Materials.Copper}, Voltage.LV); addProcessGT(CombType.TIN, new Materials[] {Materials.Tin}, Voltage.LV); addProcessGT(CombType.LEAD, new Materials[] {Materials.Lead}, Voltage.LV); + addProcessGT(CombType.INDIUM, new Materials[] {Materials.Indium}, Voltage.ZPM); addProcessGT(CombType.NICKEL, new Materials[] {Materials.Nickel}, Voltage.LV); addProcessGT(CombType.ZINC, new Materials[] {Materials.Zinc}, Voltage.LV); addProcessGT(CombType.SILVER, new Materials[] {Materials.Silver}, Voltage.LV); |