mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'master' into development
Conflicts: src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java src/main/java/mekanism/tools/common/MekanismTools.java
This commit is contained in:
commit
3561f9fe59
5 files changed
+30
-7
No files matched your search
@@ -238,7 +238,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
for(Coord4D coord : ((Map<Coord4D, TileEntity>)possibleAcceptors.clone()).keySet())
|
||||
for(Coord4D coord : possibleAcceptors.keySet())
|
||||
{
|
||||
EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
|
||||
TileEntity acceptor = coord.getTileEntity(getWorld());
|
||||
|
||||
Reference in new issue
Block a user