General stuff, going to start working on the structure reader in a second.
Merge branch 'master' of https://github.com/Anon10W1z/Cybertron

Conflicts:
	src/main/java/com/melanistic/cybertron/Cybertron.java
	src/main/java/com/melanistic/cybertron/common/block/CyberBlocks.java