fix a Derp
Merge branch 'v3.0' of https://github.com/Universal-Electricity/Voltz-Mod-Pack into v3.0

Conflicts:
	build.gradle