aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/GT_Mod.java
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-06-21 00:17:12 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-06-21 00:17:12 +0100
commit660105ba28d6dd912160a9dc800c876f72e6873f (patch)
tree8021e21b16d4b2b6f2a02ec5771d47fe9ff210ac /src/main/java/gregtech/GT_Mod.java
parent8e25705a3d5f623214af06bd0645dfaaf3a72c15 (diff)
parentf708fc5ff8faca68dcc334bcf85560630157cbf1 (diff)
downloadGT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.tar.gz
GT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.tar.bz2
GT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.zip
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
-rw-r--r--src/main/java/gregtech/GT_Mod.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index f4dcd27871..c9868a9396 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -389,6 +389,9 @@ public class GT_Mod
e.printStackTrace(GT_Log.err);
}
}
+
+ new GT_Bees();
+
gregtechproxy.onLoad();
if (gregtechproxy.mSortToTheEnd) {
new GT_ItemIterator().run();
@@ -437,7 +440,6 @@ public class GT_Mod
new GT_CropLoader().run();
new GT_Worldgenloader().run();
new GT_CoverLoader().run();
- new GT_Bees();
GT_RecipeRegistrator.registerUsagesForMaterials(new ItemStack(Blocks.planks, 1), null, false);
GT_RecipeRegistrator.registerUsagesForMaterials(new ItemStack(Blocks.cobblestone, 1), null, false);