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
Update de_DE.lang
Update de_DE.lang
Update de_DE.lang
Attempt better jump on space stations (work in progress).
Add textures for gases and liquid gases. Fixes #682.
Fixed tools harvest level
Fixed tools harvest level
Improved jump motion on space stations.
Add descriptions for two gas machines.
Merge pull request #835 from Vexatos/patch-3

Update de_DE.lang
Merge pull request #837 from SteveMCCommander/patch-46

Fixed tools harvest level
Fix some multiblocks not dropping item when breaking "fake" parts. Fixes #820.
Merge remote-tracking branch 'origin/master'
Fix crash when unable to edit space race.
Fix wire attaching to telepad base.
Prevent Methane Synthesizer from being held overhead.
Add Power Required tooltip to all machines in item form.