Version 4.2.1
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft
Merge remote-tracking branch 'upstream/master' into marmot