fix a lot of engine code, close #2048
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x