mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Merge branch 'master' into development
Conflicts: src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/item/ItemBlockMachine.java src/main/java/mekanism/generators/common/MekanismGenerators.java
This commit is contained in:
commit
29e50a34fa
4 files changed
+23
-11
No files matched your search
@@ -982,7 +982,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
if(doFill)
|
||||
{
|
||||
int fillAmount = toFill + (stored == null ? 0 : stored.amount);
|
||||
setFluidStack(new FluidStack(resource.getFluid(), fillAmount), container);
|
||||
setFluidStack(new FluidStack(resource.getFluid(), (stored != null ? stored.amount : 0)+toFill), container);
|
||||
}
|
||||
|
||||
return toFill;
|
||||
|
||||
Reference in new issue
Block a user