Merge branch 'development' into v9

* development:
  Fixed Digital Miner redstone slot interaction
This commit is contained in:
aidancbrady 2016-02-15 20:28:28 -05:00
commit 78c0453225

View file

@ -75,14 +75,14 @@ public class ContainerDigitalMiner extends Container
if(ChargeUtils.canBeDischarged(slotStack))
{
if(slotID != 27)
if(slotID > 27)
{
if(!mergeItemStack(slotStack, 27, 28, false))
{
return null;
}
}
else if(slotID == 27)
else if(slotID <= 27)
{
if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true))
{