aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/materialprocessing
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-09-13 11:18:35 +0200
committerDream-Master <dream-master@gmx.net>2017-09-13 11:20:47 +0200
commit1f8415223bc693eafedb9a145ec228004890cb28 (patch)
treebe44bc1e781dc094503d4c0e452a88a6a3d7fe96 /src/main/java/gregtech/loaders/materialprocessing
parentf8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35 (diff)
downloadGT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.tar.gz
GT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.tar.bz2
GT5-Unofficial-1f8415223bc693eafedb9a145ec228004890cb28.zip
Revert "cherry pick"
This reverts commit 493cce8427b46fd27c77e822297491acb9b42fe6.
Diffstat (limited to 'src/main/java/gregtech/loaders/materialprocessing')
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index 6304755e85..7ef9b42ef9 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -79,7 +79,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
Materials.ShadowIron.mHasParentMod = false;
Materials.ShadowSteel.mHasParentMod = false;
Materials.AstralSilver.mHasParentMod = false;
- Materials.Adamantium.mHasParentMod = false;
Materials.Trinium.mHasParentMod = false;
}
if (!aEnableThaumcraftMats) {