diff options
| author | Teteros <Teteros@openmailbox.org> | 2016-02-29 03:29:04 +0000 |
|---|---|---|
| committer | Teteros <Teteros@openmailbox.org> | 2016-02-29 03:32:40 +0000 |
| commit | cd3357c73f21e06d38320322c367fcff37591994 (patch) | |
| tree | ff3a8f762f5af40a517e50f2055247acc8edae9a /src/main/java/gregtech/api/enums/Materials.java | |
| parent | 51bf5d55d62a62bfd2060e64c0b291e7f89dc466 (diff) | |
| download | GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.tar.gz GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.tar.bz2 GT5-Unofficial-cd3357c73f21e06d38320322c367fcff37591994.zip | |
Omit already applied fixes
This reverts commit d415df7ea26c0424abf8df9797fb1c4467c62d12.
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
| -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 f48f736e3a..494195a861 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -704,6 +704,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { * List of all Materials. */ public static final Collection<Materials> VALUES = new HashSet<Materials>(Arrays.asList(values())); + public static volatile int VERSION = 508; static { SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM.addTo(Bastnasite, Monazite, Forcicium, Forcillium); @@ -729,7 +730,6 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Snow.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.NO_RECYCLING); Ice.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.NO_RECYCLING); Water.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.NO_RECYCLING); - Silicon.add(SubTag.NO_RECYCLING); Sulfur.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE); Saltpeter.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE); Graphite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.NO_SMELTING); |