From d415df7ea26c0424abf8df9797fb1c4467c62d12 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Wed, 9 Dec 2015 00:52:00 +0100 Subject: merge of GT5.09 fixes into 5.08 branch --- src/main/java/gregtech/api/enums/Materials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/enums') 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 VALUES = new HashSet(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); -- cgit