Commit work on advanced block descriptions.
Fix bad armor texture locations.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockCargoLoader.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockFuelLoader.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockMachine.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockMachine2.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockMachineTiered.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockOxygenCollector.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockOxygenCompressor.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockOxygenDistributor.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockOxygenSealer.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockRefinery.java
	src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockSolar.java
	src/main/java/micdoodle8/mods/galacticraft/planets/asteroids/blocks/BlockBeamReceiver.java
	src/main/java/micdoodle8/mods/galacticraft/planets/asteroids/blocks/BlockWalkway.java
	src/main/java/micdoodle8/mods/galacticraft/planets/mars/blocks/BlockMachineMars.java
	src/main/java/micdoodle8/mods/galacticraft/planets/mars/blocks/BlockMachineMarsT2.java