mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
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:
commit
d5656b0264
15 files changed
+1129
-984
No files matched your search
@@ -210,7 +210,7 @@ public class RecipeUtils
|
||||
{
|
||||
ItemStack itemstack = inv.getStackInSlot(i);
|
||||
|
||||
if(BasicBlockType.get(itemstack) == BasicBlockType.BIN)
|
||||
if(itemstack != null && BasicBlockType.get(itemstack) == BasicBlockType.BIN)
|
||||
{
|
||||
InventoryBin binInv = new InventoryBin(itemstack);
|
||||
|
||||
|
||||
Reference in new issue
Block a user