mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
This commit is contained in:
commit
69874de9d2
10 files changed
+111
-47
No files matched your search
@@ -738,7 +738,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
|
||||
{
|
||||
TileEntityElectricChest electricChest = (TileEntityElectricChest)tileEntity;
|
||||
|
||||
if(!entityplayer.isSneaking())
|
||||
if(!(entityplayer.isSneaking() || world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN)))
|
||||
{
|
||||
if(electricChest.canAccess())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user