aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-08 19:27:17 +0200
committerDream-Master <dream-master@gmx.net>2018-09-08 19:27:17 +0200
commitd0fd32d985ce95e22ad0ad388aaa0c20e986c76a (patch)
tree27d10c080993f6024996561d5138549b5cb81a49 /src/main/java/gregtech/loaders
parentd46e4bbb6962485d4957f566f1e88776e92c0c53 (diff)
parent2aeb6e2ca7fb090d2392490aff6d6f87be48fd19 (diff)
downloadGT5-Unofficial-d0fd32d985ce95e22ad0ad388aaa0c20e986c76a.tar.gz
GT5-Unofficial-d0fd32d985ce95e22ad0ad388aaa0c20e986c76a.tar.bz2
GT5-Unofficial-d0fd32d985ce95e22ad0ad388aaa0c20e986c76a.zip
Merge branch 'experimental' into GT_Bees_dev
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java2
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
index e8e8dea769..512a01f1ff 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
@@ -3,10 +3,12 @@ package gregtech.loaders.materialprocessing;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.GTNH_ExtraMaterials;
import gregtech.api.enums.TextureSet;
public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler {
public ProcessingConfig() {
+ new GTNH_ExtraMaterials();
Materials.add(this);
}
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index fe9cde5f62..3e2751a430 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -566,7 +566,7 @@ public class GT_Achievements {
// issueAchievement(player, "stepforward");
}
}
-// System.out.println(stack.getUnlocalizedName());
+// GT_FML_LOGGER.info(stack.getUnlocalizedName());
if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) {
if (stack.getUnlocalizedName().equals("gt.metaitem.02.32500")) {
issueAchievement(player, "havestlead");