aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2015-12-05 00:55:46 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2015-12-05 00:55:46 +0100
commit1ef11f2ae42f8a4cfa0e41faa585c9bba6cddefd (patch)
tree8900b6719117450fd5a144e62e09b71017cec0ba /src/main/java/gregtech/api
parenta625088776675f9baec9149728f2b622281391e6 (diff)
downloadGT5-Unofficial-1ef11f2ae42f8a4cfa0e41faa585c9bba6cddefd.tar.gz
GT5-Unofficial-1ef11f2ae42f8a4cfa0e41faa585c9bba6cddefd.tar.bz2
GT5-Unofficial-1ef11f2ae42f8a4cfa0e41faa585c9bba6cddefd.zip
More recycler blacklisted items and ignored additional oredict because of crossmod issue
Diffstat (limited to 'src/main/java/gregtech/api')
-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 2ecab18ebc..bf0ab99516 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -754,6 +754,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);