From 494e06532c749ba87280ef68f342eb6dea13851b Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sun, 22 Mar 2020 18:51:23 +0100
Subject: [PATCH] small fixes, weapon models

---
 assets/voxygen/item_image_manifest.ron        |   2 +-
 .../voxel/armor/hand/leather_right-0.vox      | Bin 55723 -> 1240 bytes
 assets/voxygen/voxel/weapon/axe/orc-0.vox     | Bin 0 -> 1556 bytes
 assets/voxygen/voxel/weapon/hammer/orc-0.vox  | Bin 0 -> 1968 bytes
 assets/voxygen/voxel/weapon/staff/orc-0.vox   | Bin 0 -> 1392 bytes
 5 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 assets/voxygen/voxel/weapon/axe/orc-0.vox
 create mode 100644 assets/voxygen/voxel/weapon/hammer/orc-0.vox
 create mode 100644 assets/voxygen/voxel/weapon/staff/orc-0.vox

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 7294505cb3..c0f91482e4 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -181,7 +181,7 @@
         "voxel.armor.hand.cloth_green_right-0",
         (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
     ),
-    Armor(Shoulder(Leather1)): VoxTrans(
+    Armor(Shoulder(ClothGreen0)): VoxTrans(
         "voxel.armor.shoulder.cloth_green_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
diff --git a/assets/voxygen/voxel/armor/hand/leather_right-0.vox b/assets/voxygen/voxel/armor/hand/leather_right-0.vox
index cb8da5f70ad0262dab543dc232a0c0126462586a..d9c46954240d675f51f9ddacace51b04620814e5 100644
GIT binary patch
delta 110
zcmWlRu?>Sz5JPSMy8?+Oe*zYuPaBDbf+Q7Ufq(nZBtxWRg$$8#aun9{E9}oveqCK3
z+wcOg+~#`%U)$?=p$JMKGeC*`Ib9(O!Wv*9S|crx)ajs$Y!W@Eo(GPzlYYF_+aI?-
B4UYf-

literal 55723
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

diff --git a/assets/voxygen/voxel/weapon/axe/orc-0.vox b/assets/voxygen/voxel/weapon/axe/orc-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..351ab2569eea3fa3f1cbb4983813854506460931
GIT binary patch
literal 1556
zcmeH_OKTHR6vyv5Co@xReWl6FWFF!|5*L+<5L9ZwM#KhRpwz_FjqxM+SP6m)MZqpq
zL?Hty8tlqd*InpB+La48f(5^V&_!H?>wl(j5rZpn*TtE0{^!N--nmyVwGO;gN?n+3
zT!d4~R_aQleP$vPN{zt_Y(K1Zt=;%cTZLP2If{}T#a#<#Q~cVYc*#P}rZBN6>{(Pq
zTudAa-Z~U5*;y?>Ex=rWe5r3!3A)sC$VcoW_Aysjw#Y>;>^oFMzOd|&3-6)sVW*3E
z5A$B1Rgf^{HWay=OfqDSpm~!}XCj#DF<IZ3Y?$+%Y3wW04)pH)z%>4mX###1{BHO?
z=-Io$v=4oG^i86#Fk~tY3GA#=!(L8z`^c9DgmVzi&zy3E17^f3?h3dBTm&vjxyT&|
zxENdlE&-Q-OTZ=I5^xE)1Y80x0hfSFz$M@ka0$2sTmmiumw-#Mz21s|OTZ=I5^yoN
zgn|_Tmw-zs8c52O@_|<<{vqjka4x}}T|Qf%Rk^Kyi?80c?K}8iZ=l&~n)g*ZUDMT*
zRimRyq*vEhjeefI&<__M8NJZCZsLFCdsi<1b=P8kM!yP<j?}yH^hoaZ-TQjl9?$ag
z&CW>uPtKq3@0p%2PjBi^586h*>D2XHIW#(*Jy<znbP!hbsrq@Nrw$)8aoSt+3;NEv
j<0f}wX3E5AeXbnowYBvucVaTHA3u4f7pjMT?@_-1B%+6y

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/weapon/hammer/orc-0.vox b/assets/voxygen/voxel/weapon/hammer/orc-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..35503f01fcb3b828faee1dff7d95c33c7e9e6bdd
GIT binary patch
literal 1968
zcmeH`y=xRv5WwG?nca;hekJj4Z*u_)xmZLZLQshT6A=^q0!0%O8)IvCY9$C3ih?Or
z#KSuXSlIa|q>Lm*AjHZpg`GuOu~>g^i$x4pV&}o!y!m{;nR|ER%Iu*x&bdny)0a`M
zoj7-GdhT3LF!*#K5i*F(-kh7hs~q@zK@v^diPhSXRy#40SlUT6YbBPo;zHxoT06$}
z#63C*npo^>8=~n(?9+`1i6#3QyR;o4v7=`p^mWyaarRd2h^O8Yqc)<KNM$|oY1?aU
z!_&)gmxD>L9b6{al7q<`IoPh~K~J=U!%5bP!kNC#g?`m$1e-5x*tysFkQee{mb58F
zAM%Bmq{Lyy@8EJS?YO{7O~P5YSLo}dx+L7=rPdU34Srwv(`HoMTif)^85h3nn`Z}}
zorq-bjC&(^JbfkXvDjOffjtlx;t6q~KA}FsA2Yv%`cM;giXBO9Q>cw$NkVR5WG)N)
zXOE_p^(g!vLEwz(8N;72XTqEj`EgMb?g%qin<~1kVp}Q^68}(1&|Szb{JW8Ed_Cwr
zh_qEa;+9nQ;@^jFKXQO`FVe@kAAN9LeFe!{3X4i*Q+;*Cm_x&z%%aSwFevjX`&4+9
z{VMxWt*$7uD0@-n)KJHa%IwN}P<CQ)8{7uB!EJCG+y=M7ZEzdh2Dia&a2wnPx4~_2
z8{7uB!EJCG+y=M7ZEzdhR&cXpxD9TD+u%01ExZG`4Q_+m;1;QGi41H<=m@Q7L$02m
zoN!kB?ZQ|7U;gjlU%i2u*_rZvjh`LQM^BHIc73RxFRv|^_N&h8{K?|e(w<+qRi6Kr
z??a>U$6kxQWBJ?c_>OpcaAb$?-h)T^NZeicug@&(i2u&{{o}(j=ktp@`KQNorTu<k
zGM{P;ly;~+JanwIvw@-f%;d$=9zJ@aJcr!zv_HRp;biH%JvLmPLwu@H&sSI13g4-|
Q-u&6~m-+nYkzaG%PsC2wwg3PC

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/weapon/staff/orc-0.vox b/assets/voxygen/voxel/weapon/staff/orc-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bfe3bcc75e59632a872c205f391caec4b583dc1e
GIT binary patch
literal 1392
zcmeH_&rcIk5XTqyJF5czDj=|1jR(^jQ$<ONKS~vfNK3^ZAa>h=#A-C$Ohk>psDMBy
zP!mz(0TUAs9z1$7CM3YY6tDgx{sCs3x6v1g81BYRW@o-L^X7f_?Ynf&-Sg5gjIP$i
zS#d@m8AeYc(_X2BJmo)aw|F<5NrcK&)-XE7fbt2TVjS2!36$jldH`&?2N;im4Z{E)
z!nCJ>jrRfbkqPS?P&Eelo&eROfPV_8n+0k{2(?9+VyK@XuW#p5m`=e|c~mX~Tb6*W
z;<t(4E`G-nOqoZ*K*B)6K*B)6K*B)6K*B)6K-PDVFpw~iS|bc33?vLB3?vLxGXl#g
zz>@u_eg>qxFj)4q>BYi8!a%}6!a%}6!XT`qW?JgoYKx?LVV6MmBFOm&IE&pKu~q}#
zv8fmTw}1Bx-sWPg?EPQ|f4JGjpYC?^^03Qa#{2o}>{Sl;1o>3&e!iGG$k)=1d@I|;
zWBtc@Zs3Hs?#7!W54>n+x6r~D@)7PFYT~xR!`ys1<gH!r?xft5zF*O{D2JQFTKj{3
zURYVsdhYdeo+wUgoz3;>c)fl8R=*xU@6C7@2&_3PeeyIHeGz_TH~vwd-_^j$aAZ|}
z=uVy+tO_sJo64=Kt;L|u_*Y)VpGPxVtN#)YI9jW|y}?6T+fI;MVrR4t9XO(6)f=s=
k=G)1mI(H=!(y^+?1AZ=*R=nJ?Dj!c3o^dw3@An?#2bQCGH2?qr

literal 0
HcmV?d00001