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

Conflicts:
	common/bspkrs/briefcasespeakers/config/ConfigHandler.java
	common/bspkrs/briefcasespeakers/item/ItemList.java

1 files changed, 5 insertions, 5 deletions

diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
index e2f4307..66bd276 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemList.java
@@ -19,11 +19,11 @@ public class ItemList
     {
         if (!isInitialized)
         {
-            thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves");
-            briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers");
-            speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers");
-            remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote");
-            shadowIngot = new Item(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials).setTextureName("briefcasespeakers:shadowIngot");
+            thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(CreativeTabs.tabCombat);
+            speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(CreativeTabs.tabMisc);
+            remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(CreativeTabs.tabMisc);
+            shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials);
+
         }
     }
 }