aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2015-12-10 01:12:42 +0100
committerDream-Master <dream-master@gmx.net>2015-12-10 01:12:42 +0100
commit55ed43f4ce02da937bc6104bbcea08c8d0377796 (patch)
tree1b939ae3538d675c8d89a0a2bfcd40961ee6f0de /src/main/java/gregtech/api/enums
parent2cab6b81666d27f4212b5dfbb2919969cfe52e31 (diff)
downloadGT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.gz
GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.bz2
GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.zip
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 50a979bfe3..8de4db5a28 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -726,6 +726,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);