tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1 from DEv0on/1.7.10

Browse source 
Fixes done by DEv0on and Ikevarez
This commit is contained in:
Magnar 2020-08-03 03:21:29 +02:00 committed by GitHub
commit 33f2fd94ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java
View file

@ -135,7 +135,7 @@ public class ContainerChemicalWasher extends Container
return null;
}
}
else if(slotID > 31)
else if(slotID > 30)
{
if(!mergeItemStack(slotStack, 4, 30, false))
{

2
src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java
View file

@ -81,7 +81,7 @@ public class ContainerFluidTank extends Container
}
}
else {
if(slotID >= 2 && slotID <= 8)
if(slotID >= 2 && slotID <= 28)
{
if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false))
{

2
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
View file

@ -390,7 +390,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
{
if(fluid == FluidRegistry.getFluid("steam"))
{
return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure));
return ((!worldObj.isRemote && structure != null) || (!worldObj.isRemote && clientHasStructure));
}
return false;