diff options
| author | boubou19 <miisterunknown@gmail.com> | 2021-12-17 00:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 00:43:23 +0100 |
| commit | d4b115e542bfb58bf2db0014496378dc07a3949a (patch) | |
| tree | 436bfd273d139c9be959e74350099e361474af4f | |
| parent | 1a63c38bbdb47ecc733e3798c1f9b8b53d91cc1d (diff) | |
| parent | 3cc367f36f8fd5dbbd038cc61abfc8ec5ca0766c (diff) | |
| download | GT5-Unofficial-d4b115e542bfb58bf2db0014496378dc07a3949a.tar.gz GT5-Unofficial-d4b115e542bfb58bf2db0014496378dc07a3949a.tar.bz2 GT5-Unofficial-d4b115e542bfb58bf2db0014496378dc07a3949a.zip | |
Merge pull request #817 from GTNewHorizons/fix-cryolite-bee
Fix Cryoliote Combs to avoid meta id issues
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 626f38c494..2c86306676 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -73,7 +73,6 @@ public enum CombType { NICKEL("nickel", true, Materials.Nickel, 100,0x8585AD, 0x9D9DBD), ZINC("zinc", true, Materials.Zinc, 100,0xF0DEF0, 0xF2E1F2), SILVER("silver", true, Materials.Silver, 100,0xC2C2D6, 0xCECEDE), - CRYOLITE("cryolite", true, Materials.Cryolite, 90, 0xBFEFFF, 0x73B9D0), GOLD("gold", true, Materials.Gold, 100,0xE6B800, 0xCFA600), SULFUR("sulfur", true, Materials.Sulfur, 100,0x6F6F01, 0x8B8B8B), GALLIUM ("gallium", true, Materials.Gallium, 75,0x8B8B8B, 0xC5C5E4), @@ -160,7 +159,10 @@ public enum CombType { ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff), RUNEI("rune1", true, Materials._NULL, 10,0x0104D9, 0xE31010), RUNEII("rune2", true, Materials._NULL, 10,0xE31010, 0x0104D9), - FIREESSENSE("fireessence", true, Materials._NULL, 30,0xFFA157, 0xD41238); + FIREESSENSE("fireessence", true, Materials._NULL, 30,0xFFA157, 0xD41238), + + //New Combs to avoid meta id issues + CRYOLITE("cryolite", true, Materials.Cryolite, 90, 0xBFEFFF, 0x73B9D0); public boolean showInList; public Materials material; |