Merge branch 'master-1.11' into master-1.12

Conflicts:
	build.properties
	src/main/java/org/cyclops/structuredcrafting/Reference.java

Author: rubensworks

resources/changelog/1.11.2-0.1.8.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 0.10.6 or higher.
+
+Fixes:
+* Fix empty inventories not being ignored during crafting, Closes #5

src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java

@@ -48,15 +48,18 @@ public boolean isValidForResults(World world, BlockPos pos, EnumFacing side) {
     public boolean hasItemStack(World world, BlockPos pos, EnumFacing side) {
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
         IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
-        return (itemHandler != null && getFirstItem(itemHandler, side) != null)
-                || (inventory != null && getFirstItem(inventory, side) != null);
+        return itemHandler != null || inventory != null;
     }
 
     @Override
     public ItemStack getItemStack(World world, BlockPos pos, EnumFacing side) {
         IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        return itemHandler != null ? getFirstItem(itemHandler, side).getRight() : getFirstItem(inventory, side).getRight();
+        Pair<Integer, ItemStack> result = itemHandler != null ? getFirstItem(itemHandler, side) : getFirstItem(inventory, side);
+        if (result != null) {
+            return result.getRight();
+        }
+        return ItemStack.EMPTY;
     }
 
     @Override