try to fix #2326
Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x