Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

common/mekanism/client/render/MekanismRenderer.java

@@ -82,9 +82,15 @@ public class MekanismRenderer
 			{
 				if(gas instanceof OreGas)
 				{
+					if(gas.getUnlocalizedName().contains("clean"))
+					{
+						gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre"));
+					}
+					else {
 						gas.setIcon(event.map.registerIcon("mekanism:LiquidOre"));
 					}
 				}
+			}
 
 			FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:LiquidBrine"));
 		}

common/mekanism/common/multipart/PartSidedPipe.java

@@ -461,13 +461,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
 			}
 		}
 		
-		onRefresh();
-		
 		if(!world().isRemote)
 		{
 			currentTransmitterConnections = possibleTransmitters;
 			currentAcceptorConnections = possibleAcceptors;
+		}
 		
+		onRefresh();
+		
+		if(!world().isRemote)
+		{			
 			sendDesc = true;
 		}
 	}
@@ -611,7 +614,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
 	
 	public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive)
 	{
-		if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side))
+		if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side) || !connectionMapContainsSide(currentAcceptorConnections, side))
 		{
 			return false;
 		}

resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}