improved file format, and reverted part of #1471
Merge remote-tracking branch 'origin/BuildCraft-5.0.x' into BuildCraft-5.0.x