Merge branch 'development' into 1.8.9

* development:
  Fixed Turbine Stats crash
  Fixed Turbine container crash
  Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/RecipeUtils.java
This commit is contained in:
aidancbrady committed 2016-05-21 15:31:26 -04:00
commit d5656b0264
15 files changed
+1129 -984

No files matched your search

@@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -38,7 +38,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(9, 0, 0);
public static Version versionNumber = new Version(9, 0, 1);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;