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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
index 6ea7453..6fc14db 100644
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
@@ -7,12 +7,15 @@ public class ConfigHandler
 {
     private static Configuration config;
     public static int            idThiefGloves       = 17493;
-    public static int            idSpeaker           = 17494;
-    public static int            idRemote            = 17495;
-    public static int            idShadowIngot       = 17496;
+
+    public static int            idSpeaker           = 17495;
+    public static int            idRemote            = 17496;
+    public static int            idShadowIngot       = 17497;
     
     public static int            idBriefcaseSpeakers = 1749;
     
+    public static int            idShadowOre         = 200;
+    
     private static boolean       isInitialized       = false;
     
     public static void preInit(FMLPreInitializationEvent e)
@@ -31,6 +34,7 @@ public class ConfigHandler
             idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt();
             idRemote = config.getItem("id.Remote", idRemote).getInt();
             idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
+            idShadowOre = config.getBlock("id.ShadowOre", idShadowOre).getInt();
             
             config.save();