Acid/Grog related bucket fix from 1.6, forgot the code migrated to another class in 1.7 while merging.
Fixed potential NPE.
Bump version.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	build.properties