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

@@ -101,7 +101,22 @@ public interface IFactory
}
else if(this == INFUSING)
{
return getRecipe(slotStack, infuse);
if(infuse.type != null)
{
return RecipeHandler.getMetallurgicInfuserRecipe(new InfusionInput(infuse, slotStack));
}
else {
for(Object obj : Recipe.METALLURGIC_INFUSER.get().entrySet())
{
Map.Entry entry = (Map.Entry)obj;
InfusionInput input = (InfusionInput)entry.getKey();
if(input.inputStack.isItemEqual(slotStack))
{
return (MetallurgicInfuserRecipe)entry.getValue();
}
}
}
}
return getRecipe(slotStack);