upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 16:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 1.8 (hopefully I didn't miss anything)

Browse Source 
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
This commit is contained in:
Aidan C. Brady committed 2014-09-27 14:40:25 -04:00
2 parents cde5755ee3 f72f462c63
commit 9bf4baab49
19 files changed
+980 -136
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/api/MekanismConfig.java
+1
View File
@@ -75,6 +75,7 @@ public class MekanismConfig
public static double pressurizedReactionBaseUsage;
public static double fluidicPlenisherUsage;
public static double laserUsage;
public static double salinationPlantWaterUsage;
}
public static class generators