From 98ee002472f021cd8ae4e4e1ea2b7109e7f42604 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Sat, 9 Aug 2014 13:43:59 -0400
Subject: [PATCH] Merge back the network fixes

---
 src/main/java/mekanism/api/gas/GasNetwork.java   | 3 ++-
 src/main/java/mekanism/common/EnergyNetwork.java | 3 ++-
 src/main/java/mekanism/common/FluidNetwork.java  | 3 ++-
 src/main/java/mekanism/common/Mekanism.java      | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java
index aaf7efdc9..3bb38b9af 100644
--- a/src/main/java/mekanism/api/gas/GasNetwork.java
+++ b/src/main/java/mekanism/api/gas/GasNetwork.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import mekanism.api.Coord4D;
@@ -279,7 +280,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
 		Gas type = (Gas)data[0];
 		Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
 
-		for(IGasHandler acceptor : possibleAcceptors.values())
+		for(IGasHandler acceptor : ((Map<Coord4D, IGasHandler>)possibleAcceptors.clone()).values())
 		{
 			if(acceptorDirections.get(acceptor) == null)
 			{
diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java
index 2cfd5c4e7..2cf736015 100644
--- a/src/main/java/mekanism/common/EnergyNetwork.java
+++ b/src/main/java/mekanism/common/EnergyNetwork.java
@@ -9,6 +9,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import mekanism.api.Coord4D;
@@ -233,7 +234,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
 			return toReturn;
 		}
 
-		for(TileEntity acceptor : possibleAcceptors.values())
+		for(TileEntity acceptor : ((Map<Coord4D, TileEntity>)possibleAcceptors.clone()).values())
 		{
 			ForgeDirection side = acceptorDirections.get(acceptor);
 
diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java
index 4dabef481..329aafb84 100644
--- a/src/main/java/mekanism/common/FluidNetwork.java
+++ b/src/main/java/mekanism/common/FluidNetwork.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import mekanism.api.Coord4D;
@@ -291,7 +292,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 		FluidStack fluidToSend = (FluidStack)data[0];
 		Set<IFluidHandler> toReturn = new HashSet<IFluidHandler>();
 
-		for(IFluidHandler acceptor : possibleAcceptors.values())
+		for(IFluidHandler acceptor : ((Map<Coord4D, IFluidHandler>)possibleAcceptors.clone()).values())
 		{
 			if(acceptorDirections.get(acceptor) == null)
 			{
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index 206949276..92b8f7e37 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -1088,6 +1088,7 @@ public class Mekanism
 		OreDictionary.registerOre("universalCable", new ItemStack(PartTransmitter, 8, 0));
 		OreDictionary.registerOre("battery", EnergyTablet.getUnchargedItem());
 		OreDictionary.registerOre("pulpWood", Sawdust);
+		OreDictionary.registerOre("dustWood", Sawdust);
 		OreDictionary.registerOre("blockSalt", SaltBlock);
 		
 		//Alloys!