Ben Spiers 514b6962d2 Merge branch 'development' into 1.8 ... Conflicts: src/main/java/mekanism/common/tile/TileEntitySalinationController.java src/main/java/mekanism/common/util/MekanismUtils.java src/main/java/mekanism/generators/common/block/BlockGenerator.java		2014-08-28 22:18:31 +01:00
..
CableUtils.java	Fixed cable functionality	2014-08-09 13:29:04 -04:00
ChargeUtils.java	Make the mod classes significantly less godlike.	2014-08-01 01:35:06 +01:00
DebugUtils.java	Logistical Transporter path caching.	2014-08-21 20:46:51 -04:00
FluidContainerUtils.java	Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules	2014-07-10 22:28:04 -04:00
InventoryUtils.java	Reorganized package structure to separate content from base code	2014-08-20 15:22:55 -04:00
LangUtils.java	Greatly improved localization	2014-06-10 11:35:54 +02:00
MekanismUtils.java	Merge branch 'development' into 1.8	2014-08-28 22:18:31 +01:00
MinerUtils.java	Make the mod classes significantly less godlike.	2014-08-01 01:35:06 +01:00
PipeUtils.java	Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.	2014-04-20 04:34:19 +01:00
TransporterUtils.java	Work on path caching	2014-08-20 15:54:05 -04:00