Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
This commit is contained in:
Aidan Brady committed 2014-08-07 12:29:43 -04:00
commit 81d3d53d76
19 files changed
+459 -196

No files matched your search

@@ -42,22 +42,15 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
public EnergyNetwork(IGridTransmitter<EnergyNetwork>... varCables)
{
transmitters.addAll(Arrays.asList(varCables));
updateCapacity();
register();
}
public EnergyNetwork(Collection<IGridTransmitter<EnergyNetwork>> collection)
{
transmitters.addAll(collection);
updateCapacity();
register();
}
public static double round(double d)
{
return Math.round(d * 10000)/10000;
}
public EnergyNetwork(Set<EnergyNetwork> networks)
{
for(EnergyNetwork net : networks)
@@ -79,9 +72,13 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
}
}
fullRefresh();
register();
}
public static double round(double d)
{
return Math.round(d * 10000)/10000;
}
@Override
protected synchronized void updateMeanCapacity()