aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/materialprocessing
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-13 07:02:42 +0200
committerTechnus <daniel112092@gmail.com>2017-09-13 07:02:42 +0200
commitf8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35 (patch)
treedd7e4001a76b39d2515d29643749523e08ce5572 /src/main/java/gregtech/loaders/materialprocessing
parent025e525441a11acf66504f406571ea1697ec9c6b (diff)
parent09013db3ddb09aa908980a5d6324b126c3aab05f (diff)
downloadGT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.gz
GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.bz2
GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.zip
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/materialprocessing')
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index 7ef9b42ef9..6304755e85 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -79,6 +79,7 @@ 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) {