diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-24 00:23:01 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-24 00:23:01 +0200 |
| commit | e765214bfde5ff2425c7be576a16a162fb434013 (patch) | |
| tree | 193b2674622d1ef0a5b330d93ea786aa1c217968 | |
| parent | b0309a2ebd12f090c104c48f6e66d0446fbb6bb1 (diff) | |
| parent | 2f4830b7ab97ae7a431d9835c90bc07f19b5c9c4 (diff) | |
| download | GT5-Unofficial-e765214bfde5ff2425c7be576a16a162fb434013.tar.gz GT5-Unofficial-e765214bfde5ff2425c7be576a16a162fb434013.tar.bz2 GT5-Unofficial-e765214bfde5ff2425c7be576a16a162fb434013.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index aa7248492f..afd9ac6040 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1111,7 +1111,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Tartarite, /**Thyrium,**/ Tritanium, Vulcanite, Vyroxeres, Yellorium, Zectium, AluminiumBrass, Osmiridium, Sunnarium, AnnealedCopper, BatteryAlloy, Brass, Bronze, ChromiumDioxide, Cupronickel, DeepIron, Electrum, Invar, /**IronCompressed,**/ Kanthal, Magnalium, Nichrome, NiobiumNitride, NiobiumTitanium, PigIron, SolderingAlloy, StainlessSteel, Steel, Ultimet, VanadiumGallium, WroughtIron, YttriumBariumCuprate, IronWood, Alumite, Manyullyn, ShadowIron, ShadowSteel, Steeleaf, SterlingSilver, RoseGold, BlackBronze, BismuthBronze, BlackSteel, RedSteel, BlueSteel, DamascusSteel, - TungstenSteel, AstralSilver, Midasium, Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal, HSSG, HSSE, HSSS, TungstenCarbide, Endium, VanadiumSteel, Kalendrite, Ignatius); + TungstenSteel, AstralSilver, Midasium, Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal, HSSG, HSSE, HSSS, TungstenCarbide, HeeEndium, VanadiumSteel, Kalendrite, Ignatius); SubTag.FOOD.addTo(MeatRaw, MeatCooked, Ice, Water, Salt, Chili, Cocoa, Cheese, Coffee, Chocolate, Milk, Honey, FryingOilHot, FishOil, SeedOil, SeedOilLin, SeedOilHemp, Wheat, Sugar, FreshWater); |