aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2018-01-13 14:21:29 +0800
committerDream-Master <dream-master@gmx.net>2018-01-13 11:30:41 +0100
commit9eb514105715135af17081aa26ae3b6a3d165877 (patch)
treec7068095be0b97939b017a46b6ada76384040260 /src/main/java/gregtech
parentfb43070ec67dc64cdf8a69a408675788e3538fa3 (diff)
downloadGT5-Unofficial-9eb514105715135af17081aa26ae3b6a3d165877.tar.gz
GT5-Unofficial-9eb514105715135af17081aa26ae3b6a3d165877.tar.bz2
GT5-Unofficial-9eb514105715135af17081aa26ae3b6a3d165877.zip
cherry pick
Commit: fce9104d49920eadbaabc48e33bfcb39b5ae8340 [fce9104] Fix custom enchantment for materials
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/GT_Mod.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 2ce3b111f3..b1f546145f 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -325,6 +325,10 @@ public class GT_Mod implements IGT_Mod {
tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(16, tMainConfig.get("features", "MaxOtherBlockStackSize", 64).getInt())));
}
}
+
+ new Enchantment_EnderDamage();
+ new Enchantment_Radioactivity();
+
//GT_Config.troll = (Calendar.getInstance().get(2) + 1 == 4) && (Calendar.getInstance().get(5) >= 1) && (Calendar.getInstance().get(5) <= 2);
Materials.init();
@@ -460,9 +464,6 @@ public class GT_Mod implements IGT_Mod {
}else{System.out.println("noMaterial "+reEnable);}
}else{System.out.println("noPrefix "+reEnable);}}
- new Enchantment_EnderDamage();
- new Enchantment_Radioactivity();
-
new GT_Loader_OreProcessing().run();
new GT_Loader_OreDictionary().run();
new GT_Loader_ItemData().run();