Merge branch 'master' into development

This commit is contained in:
Aidan C. Brady committed 2015-03-17 17:27:17 -04:00
commit a5a9ab9daf
3 files changed
+13 -5

No files matched your search

@@ -182,8 +182,9 @@ public final class InventoryUtils
return toInsert;
}
public static boolean areItemsStackable(ItemStack toInsert, ItemStack inSlot) {
return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert);
public static boolean areItemsStackable(ItemStack toInsert, ItemStack inSlot)
{
return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert);
}
public static InvStack takeTopItem(IInventory inventory, int side)