Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass

This commit is contained in:
Tom Elfring committed 2017-07-23 13:56:41 +02:00
commit df68b1e36a
299 files changed
+514 -9448

No files matched your search

@@ -245,7 +245,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
if(type.isElectric)
{
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
}
if(hasTank(itemstack) && type != MachineType.FLUID_TANK)
@@ -972,4 +972,18 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
}
}
}
@Override
public int getItemStackLimit(ItemStack stack)
{
if(MachineType.get(stack) == MachineType.FLUID_TANK)
{
if(getFluidStack(stack) != null)
{
return 1;
}
return 16;
}
return super.getItemStackLimit(stack);
}
}