Merge branch 'master' into 'master'

asset orientation fix See merge request veloren/fresh-assets/voxygen!6

Merge branch 'master' into 'master'
0a176c40 · Justin Shipsey · e3083ec8 · ae039376 · 0a176c40 · 0a176c40
Commit 0a176c40 authored 6 years ago by Justin Shipsey
--- a/voxel/belt.vox
+++ b/voxel/belt.vox
--- a/voxel/chest.vox
+++ b/voxel/chest.vox
--- a/voxel/foot.vox
+++ b/voxel/foot.vox
--- a/voxel/hand.vox
+++ b/voxel/hand.vox
--- a/voxel/head.vox
+++ b/voxel/head.vox
--- a/voxel/pants.vox
+++ b/voxel/pants.vox
--- a/voxel/sword.vox
+++ b/voxel/sword.vox