fix a lot of the pluggable rewrite issues
Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x