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:
Aidan C. Brady committed 2015-02-16 14:40:10 -05:00
commit 3561f9fe59
5 files changed
+30 -7

No files matched your search

@@ -57,7 +57,7 @@ public class InventoryNetwork extends DynamicNetwork<IInventory, InventoryNetwor
{
List<AcceptorData> toReturn = new ArrayList<AcceptorData>();
for(Coord4D coord : ((Map<Coord4D, IInventory>)possibleAcceptors.clone()).keySet())
for(Coord4D coord : possibleAcceptors.keySet())
{
EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
IInventory acceptor = (IInventory)coord.getTileEntity(getWorld());