Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java
This commit is contained in:
Aidan Brady committed 2014-07-31 19:00:54 -04:00
commit ed4aa7671c
8 files changed
+16 -16

No files matched your search

@@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf;
import java.io.IOException;
import mekanism.api.gas.FuelHandler;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasRegistry;
import mekanism.common.FuelHandler;
import mekanism.common.IModule;
import mekanism.common.Mekanism;
import mekanism.common.Version;