Ben Spiers 51c1bd4500 Merge branch 'master' into development		2014-04-14 17:07:36 +01:00
..
api	Add tiers to Mechanical Pipe, primarily to allow pumping out greater volumes of fluid per connection, for mods that require massive amounts of fluid per tick, for example AS' turbines need ten buckets per tick to spin up. Also fix capacity updating.	2014-04-01 19:16:07 +01:00
client	A few tiny fixes	2014-03-22 12:24:09 -04:00
common	Merge branch 'master' into development	2014-04-14 17:07:36 +01:00
generators	Fixed Solar Generator generation	2014-03-18 17:18:54 -04: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