Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

Conflicts:
	resources/assets/briefcasespeakers/lang/en_US.lang

1 files changed, 4 insertions, 0 deletions

diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
index f5dc840..758e371 100644
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
@@ -5,10 +5,12 @@ import net.minecraft.network.NetLoginHandler;
 import net.minecraft.network.packet.NetHandler;
 import net.minecraft.network.packet.Packet1Login;
 import net.minecraft.server.MinecraftServer;
+import bspkrs.briefcasespeakers.block.BlockList;
 import bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient;
 import bspkrs.briefcasespeakers.config.ConfigHandler;
 import bspkrs.briefcasespeakers.item.ItemList;
 import bspkrs.briefcasespeakers.lib.Reference;
+import bspkrs.briefcasespeakers.recipes.CraftingRecipes;
 import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -45,6 +47,8 @@ public class BriefcaseSpeakersMod implements IConnectionHandler
     {
         ConfigHandler.preInit(e);
         ItemList.preInit(e);
+        CraftingRecipes.preInit(e);
+        BlockList.preInit(e);
     }
     
     @EventHandler