Aidan C. Brady 246c9426be Merge branch 'development' into 1.8		2014-07-12 18:50:05 -04:00
..
api	Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance.	2014-07-10 19:24:33 +01:00
client	Mekanism v7...official release.	2014-07-12 00:05:19 -04:00
common	Fix un-checked MFR API usage	2014-07-12 21:04:33 +01:00
generators	Merge branch 'development' into 1.8	2014-07-12 01:56:13 +01:00
tools	Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved.	2014-07-07 21:23:04 +01:00