Ben Spiers 8786b16b58 Merge branch 'development' into greylocke ... Conflicts: resources/assets/mekanism/lang/pl_PL.lang		2014-04-14 17:11:48 +01:00
..
api	Lots of GUI element work. Fixed Crystallizer typo.	2014-04-12 02:51:02 +01:00
client	Discover native block colouring support within normal block rendering code.	2014-04-13 23:40:51 +01:00
common	Merge branch 'development' into greylocke	2014-04-14 17:11:48 +01:00
generators	Update ComputerCraft API. No idea if I've implemented IPeripheral.equals() correctly, its documentation is not the most helpful.	2014-04-12 18:49:25 +01:00
tools	Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed.	2014-04-14 16:42:00 +01:00