Adding some stuff to sync with the repo
Merge branch 'master' of https://github.com/lukew156/Voltacraft

Conflicts:
	out/production/Voltacraft/assets/voltacraft/textures/blocks/OreVanadium.png