gradle ate my manifest, so i made it give it back to me
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7