diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
| commit | d415df7ea26c0424abf8df9797fb1c4467c62d12 (patch) | |
| tree | 412dc40b356adf727637c7a9633fa039e7ae19f5 /src/main/java/gregtech/api/enums/Materials.java | |
| parent | 46f4473de67d66676f3ecc36c6e441db3d1eebfe (diff) | |
| download | GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.gz GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.bz2 GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.zip | |
merge of GT5.09 fixes into 5.08 branch
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 494195a861..f48f736e3a 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -704,7 +704,6 @@ 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); @@ -730,6 +729,7 @@ 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); |