aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-10-04 04:32:51 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-10-04 04:32:51 +0100
commitd2efd7ae5478d65b2b95c5d22f8fb2200e4b9e80 (patch)
tree65870182e32c8e7fcdc3e4ccb2f29967e0f7be5b /src
parentb457c539153facb772918eb12fc55aea9db880f9 (diff)
downloadGT5-Unofficial-d2efd7ae5478d65b2b95c5d22f8fb2200e4b9e80.tar.gz
GT5-Unofficial-d2efd7ae5478d65b2b95c5d22f8fb2200e4b9e80.tar.bz2
GT5-Unofficial-d2efd7ae5478d65b2b95c5d22f8fb2200e4b9e80.zip
Small fixes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java2
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 7a30249cb6..ee314c8e31 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -97,7 +97,7 @@ public class ItemComb extends Item {
public void initCombsRecipes() {
ItemStack tComb;
- System.out.println("#####" + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1));
+
//Organic
tComb = getStackForType(CombType.LIGNIE);
addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), 90);
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index 07ad46c3f0..b10a87c2f9 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -23,6 +23,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
@Override
public void onMaterialsInit() {
+ //Disable Materials if Parent Mod is not loaded
if (!aTGregSupport) {
Materials.Dysprosium.mHasParentMod = false;
Materials.Erbium.mHasParentMod = false;
@@ -129,6 +130,9 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
if (!aEnableRailcraftMats) {
Materials.Firestone.mHasParentMod = false;
}
+
+ //Enable Materials is correct mod is Loaded
+ Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics");
}
@Override