Fix Engine dupe

Closes #1361
Merge branch 'marmot' of https://github.com/BuildCraft/BuildCraft into marmot