Merge branch 'master' of https://github.com/aidancbrady/Mekanism

build.xml

@@ -65,6 +65,7 @@
 		<copy todir="coreContents">
 			<fileset dir="${dir.mcp}/reobf/minecraft">
 				<exclude name="**/mekanism/generators/**"/>
+				<exclude name=“**/mekanism/induction/**”/>
 				<exclude name="**/mekanism/tools/**"/>
 			</fileset>
 

common/mekanism/induction/client/SoundHandler.java

@@ -27,7 +27,5 @@ public class SoundHandler
 		{
 			event.manager.addSound(MekanismInduction.PREFIX + SOUND_FILES[i]);
 		}
-
-		MekanismInduction.LOGGER.fine("Loaded sound fxs");
 	}
 }

common/mekanism/induction/common/MekanismInduction.java

@@ -55,8 +55,6 @@ public class MekanismInduction implements IModule
 	/**
 	 * Mod Information
 	 */
-	public static final String ID = "mekanism";
-	public static final String NAME = "MekanismInduction";
 
 	public static final String MAJOR_VERSION = "@MAJOR@";
 	public static final String MINOR_VERSION = "@MINOR@";
@@ -73,8 +71,6 @@ public class MekanismInduction implements IModule
 	/** MekanismInduction version number */
 	public static Version versionNumber = new Version(5, 6, 0);
 
-	public static final Logger LOGGER = Logger.getLogger(NAME);
-
 	/**
 	 * Directory Information
 	 */
@@ -130,7 +126,6 @@ public class MekanismInduction implements IModule
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt)
 	{
-		LOGGER.setParent(FMLLog.getLogger());
 		NetworkRegistry.instance().registerGuiHandler(this, MekanismInduction.proxy);
 		MinecraftForge.EVENT_BUS.register(new MultimeterEventHandler());
 		Mekanism.configuration.load();
@@ -230,14 +225,9 @@ public class MekanismInduction implements IModule
 				nameToClassMap.put(findTileID, replaceTile);
 				classToNameMap.put(replaceTile, findTileID);
 				classToNameMap.remove(findTile);
-				LOGGER.fine("Replaced TileEntity: " + findTile);
-			}
-			else {
-				LOGGER.severe("Failed to replace TileEntity: " + findTile);
 			}
 		}
 		catch(Exception e) {
-			LOGGER.severe("Failed to replace TileEntity: " + findTile);
 			e.printStackTrace();
 		}
 	}

resources/assets/mekanism/lang/de_DE.lang

@@ -211,3 +211,18 @@ item.SteelHelmet.name=Stahlhelm
 item.SteelChestplate.name=Stahlbrustpanzer
 item.SteelLeggings.name=Stahlbeinschutz
 item.SteelBoots.name=Stahlstiefel
+
+//*********//
+//INDUCTION//
+//*********//
+
+//Blocks
+tile.Tesla.name=Teslaspule
+tile.Multimeter.name=Multimeter
+tile.ElectromagneticContractor.name=Elektromagnetischer Kontraktor
+tile.Battery.name=Modulare Batterie
+
+//Items
+item.Capacitor.name=Kondensatorenzelle
+item.InfiniteCapacitor.name=Unendliche Kondensatorenzelle
+item.Linker.name=Elektrostatischer Linker