From a3f40c239e5085084935fc1f4214c9c12bde6ae6 Mon Sep 17 00:00:00 2001
From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:34:11 +0200
Subject: [PATCH] Ore Visual Change (#23618)

* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d8dad78661cb2511113184ced30d073.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
---
 .../Entities/Objects/Materials/ore.yml        |  15 +++++++++++++++
 .../Objects/Materials/ore.rsi/adamantine.png  | Bin 191 -> 0 bytes
 .../Objects/Materials/ore.rsi/ammonia.png     | Bin 365 -> 0 bytes
 .../Objects/Materials/ore.rsi/bananium.png    | Bin 18531 -> 462 bytes
 .../Objects/Materials/ore.rsi/coal.png        | Bin 199 -> 423 bytes
 .../Objects/Materials/ore.rsi/copper.png      | Bin 191 -> 0 bytes
 .../Objects/Materials/ore.rsi/gold.png        | Bin 191 -> 507 bytes
 .../Objects/Materials/ore.rsi/iron.png        | Bin 200 -> 297 bytes
 .../Objects/Materials/ore.rsi/meta.json       |  11 +----------
 .../Objects/Materials/ore.rsi/plasma.png      | Bin 375 -> 528 bytes
 .../Objects/Materials/ore.rsi/silver.png      | Bin 209 -> 408 bytes
 .../Objects/Materials/ore.rsi/spacequartz.png | Bin 219 -> 522 bytes
 .../Objects/Materials/ore.rsi/uranium.png     | Bin 510 -> 450 bytes
 13 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Materials/ore.rsi/adamantine.png
 delete mode 100644 Resources/Textures/Objects/Materials/ore.rsi/ammonia.png
 delete mode 100644 Resources/Textures/Objects/Materials/ore.rsi/copper.png

diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 2159f3abb2..ae90962523 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -95,6 +95,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawPlasma: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 0.6
+    castShadows: false
+    color: "#e592e7"
 
 - type: entity
   parent: PlasmaOre
@@ -164,6 +169,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawUranium: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 0.8
+    castShadows: false
+    color: "#9be792"
 
 - type: entity
   parent: UraniumOre
@@ -187,6 +197,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawBananium: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 1
+    castShadows: false
+    color: "#eef066"
 
 - type: entity
   parent: BananiumOre
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png
deleted file mode 100644
index 1664f1a3affbe96901d7ecf32946ef26318a2edf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{SD(y6LuZTV^r-6gO0P&S
zc|FaOlLU2vvWz7`e!&b5&u*jvInkajjv*QolM^J$8Uh0X7+f7ZB0U9N8#is-D6~mP
zQP@3L*)@e#uW#8QHxAVvH9ft)rb8TzVdCP`9UKobh%h>)Ft!PZhdVk3szgVy#s-QQ
h7_=}kYT8Ky&HlBA>!-5WO+Fx#!PC{xWt~$(699YBF~|S_

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png
deleted file mode 100644
index 024045a145c54a4b206eff04497d6b3016f5d424..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SA4x<(RCt{2l|2f=KoEt;;0Xi^iM=2eTBZ}N?1PP7z)ldXEG(=9
zYcHUU7qBweS!yAIy&_(~Hu54P%c`&={t(#LWHMX4Z{BQ3lKw0UU;!+E1&Aj=xibv)
z-g4AU`~(2zZaPK9d@g$TN-mA3!5vBpA_9QPpzYIYeT<A*twts4-82j(5XJziIfSV>
z1&D#Xl21J%V+bPvHdjqCwJw~Wwg+;^Tt)!S`SR3MPk|Lo`k!BcYPi|$A7IeK84{4l
z7(ks?T?6;ImdXeKkye`hP>q|7^%d0WRXjq|HHcQgF+;jBz7F)}v&DDr0H>gvt5B$=
z5+%S8>P5>GvUg+jCDV%m7=mjZMr!^Rz$=({70=(X1+V}X;FG!n=b?ym59i;B00000
LNkvXXu0mjfCccvh

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png
index 72cbecad8a824db6b37c1f03e80401c7e2100139..ec4e716e10be1b55ba8343efaf0bdc16601ff5b2 100644
GIT binary patch
delta 438
zcmV;n0ZIPjkO9sEkRyKqlSxEDR9Hvtl(9?0Kp4fpE`?T0GX%6C#Z^TAgN}|}1SfaF
z$-zx=a_-=w;O^?u(b3f{h)WRKO>k&IDRim4lh<5Qo4d1tESIGzclW*D_wIeENXbv7
zWPR}f-U07`(Se<IdxlY6t5(&-zQnQdjLT@}7K1p1*K4(T&98sSWTE~lP)h-}!f>`3
z1S#=lo#{}nFu4GYdR;b}&AIOVQ>5Pej|ocmP~_xbFXfO6gb@Ih3BgV;Z(}96yPv@5
zAlPRMk(&Wr16*JLkp)6*w_0+1^_&9HAwI@qc^eLmfi-Sm7U(ep2@pWw0SMi2g|Gt1
zx_~TP9ChS#G?ITX2o@mvcfXmy+UsDD>x2;ih3LZfbgJ^uJ&gpN>JWfA>qYV&ivWON
zg#o|?29iSA3BWqm9<DoTFQ80WuyTMd`~`tE9fY0Rh~umi06t8(2Hgp~-<&6RZreFS
zZ4Hpk0{(M6ISuR@Yc?b3<N%5FK<W^5##Z=W4(JekXD%*Wg;xUL;Ua#WGEjtIwuT4r
g4tNJjci;zjf59P7bH1AZ0000<MNUMnLSTXb0JKERv;Y7A

literal 18531
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
VI|UW0D|%Mj&dSNM&|=-z{|1fwV)Xz3

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal.png b/Resources/Textures/Objects/Materials/ore.rsi/coal.png
index d89a0b4766d96af93c8f74a2087b0ddc22415f78..9a26c1059e99b8830cef98cbf96ba1e929befba9 100644
GIT binary patch
delta 409
zcmV;K0cQTk0jC3y7=H)`0001UdV2H#00C`DL_t(oN9~odYr;Sjho7rd0-=jkYoXxK
zL80{jpE@{nap@owYPGnOgJ5yBd<PFM2PW@YW1!?9M93xYyYGJQ>`BX`*K&R706GKz
z$H094bad{^H`QkIZeEyqVpY3Rd^Eb1q9|m&emgG!9}kN!mwzuMXr51}53<{R`e}^-
zu)2Q#$`@FzUL}NR9AG@YJI-d0l>h)T*n<7O5VBy+L2U*Am`v_vIJ}WO&&4@cvVeiX
zAd@W1ngyT$+fW6Ox_Ydc4CMK>sAjz{7SE+DU`oSk)t>~Qnt2I`?e@c8aaW}NyP6D;
z0rV;aTX8si`+r(7gdRv%3nl=zAPgFLU;sk@1E(f5l-BdW44`T`bQo&j6oj=EYXK-m
zz_7r;1T7gtgl7OIn18k{(3L9$0E{pbF+fTXO$I^;eutq{817c>Az%_f45Hywh>HQ7
zGIDW%7{nU9KW{-w$m-_)Dg$*NO?ln{bOu^C@B^!|0}?RKAn1$$0000<MNUMnLSTXb
DkM*#(

delta 183
zcmZ3^e4KHDL_G^L0|P^2NcwRgB^2Nj;_8!GC?hHq8WLb?q^BS&Ey}}v=v!eEP?oVI
z$S;_|;n|HeASc<=#W6%<;@R^Dc^eFPm=AnAD1U^_l>5RoMh_!~Rk!|zKa?(K{BT}f
zJILur<+hdXYj}3gu?f&L=?p8Z&hT`VW4{~J)V@s3%b+`mWqR{cCF#bK2N#GQz0VOl
jkyGsOgY;up?9X#Q2<LP2nRn9`Xdi>8tDnm{r-UW|juAn*

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/copper.png b/Resources/Textures/Objects/Materials/ore.rsi/copper.png
deleted file mode 100644
index 1ee4970668ae2b7491703d102b217f842bb8cdce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4SD(znW?jBxRW4h7Rj=-w
zC9UUH1(aee3GxeOaCmkj4akY}ba4#Pn0U7TplE{uhx2XTH9H(K#WM;R5B^R6q_Lsl
z*|GY@mY{#@W;x!Tl=y{Znak<I*IeQ+=F}~pcVvf*!r>`Tc@J?MIIyT9S*!8tnWyiV
n7b&`0C4IjZ_G{^rpV_w4B01kYuLzn1w28sf)z4*}Q$iB}6lzKB

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png
index b841dde0742bb98dcf4bbe2f2d60666bcf267b21..2999fb0722b61824a1231b3ef2db66460ea5915f 100644
GIT binary patch
delta 493
zcmV<J0TTYd0s8}x7=H)`0001UdV2H#00F^CL_t(oM`L6dV8A%Q_A`t+U^E0qLtyBK
zKyz);e^6Oc+uTQ%XUNh7vT#p6>;L0?xeO{QN(@rsf(-K)tzuZPY$M6$k)#1;DaZk3
z7K<6yy{Tt-`}RG9#=|CtC9l2U4giG;u^~c~17N|Nr+AZL@qY&kaOoW@aDw52R1}zP
z@N5~wgta>u>bL%71gRAi6l6Ga<_u9GLeK#q13|$I@+k<Us!wA0@zM-z`Jtm{8SdV_
z%Mc^FjlpH&Z?IV)^_HI|Gu)7`Bgzp39gq;^|6f^InZeH57+!B#{4HSUIuQ%D90ZW#
zzR{cce?^uMTz{TWx**yCu*7!x+C6aapT4+@0h9<qjzG5r<cRzHKGcZ<PzZp67-ShJ
zZb1poRNoEk0OW*6ZnaJ@1V9FZ95FNc7y}!hBEzTKqF8+oiu-@(CV~?pDUKmZF(^o_
zRhZyDM-O^fLiPH)9iAJAbp%lk02u~y1c(O3EqcNOIcA{7?Fhr(HRnl=7NQ-1%SW($
z4@#K%dsr|WM<^sHb^s`Sn3$L_ynhcVC$QxTe2$>l0kA|0vxHE-M|TWW96%_TX&wTj
j4j2uA(GVEYApijSA<`lK;mpPW0000<MNUMnLSTXbqNvij

delta 175
zcmey(yq|G`L_G^L0|P^2NcwRg#UJ1k;_8!G*z3*z`~CR``$JE+8>{jz4gg9qmIV0)
zGdMiEkp|?%dAc};XiU7?znk}f0SD__-b3k3?W_tq3A6vEds#i!N}ZzZzg%78>H83i
zvPR$U5BB7EUzqhpX2y{RQ$qODeYIbx+|5)yv8MKfkcvj4a8l<fo1>q#40bx%vB<^!
b|2<7w{xxUWp2++hpj8Z>u6{1-oD!M<cb7zJ

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png
index 693963eacb32cb07763b5831a2a9a40ebb4f7e7d..ec2a56e5bb87dca94016377bfd1c535706504ccb 100644
GIT binary patch
delta 282
zcmV+#0p<S40jUCz7=H)`0001UdV2H#008evL_t(oM`L6dV8A%Q_A`t+U^E0qLtr!n
zMniz25ODHv`;T6fKYsWKEOh(&4Wi5@N)fjD0%W<Ah#13v4mJjPMFqH$6Nit0*&v4y
z;|Q`G0J2<CMh0%Nmb?<fwTJf@9^QYz@chXWxMPTM1knya4u5Wt&*e1L7(f<-0Lb!3
z*KaXAd-Dn<u&Cw$n2$lGGyeDmw*(aYFfnAyVd;RFv_LQfU~vsH3>M#@poTdFo5jS$
zJ<Jyb9iXbI0Z-|&@^U!aFT?~lHq8VbfUF7GG3bVo;%j8RBsqW<&9_kpjE2By2#kin
gXb22=2mk<fMiX2ircsl100000NkvXXu0mjf0A@;bMF0Q*

delta 184
zcmZ3<bb@h$L_G^L0|P^2NcwRgB^2Nj;_8!G=%A$+?Cu_FYMPatY$~H>c68HYpe$oa
zkY6x^!?PP{Ku(IMi(`n!#H(jE3N|S4v?gl2X|-neVB&7!eBiX6>Gyi2xrxlRPs{(?
zCfAw0zQZ-|^*$CI(JeO`A{`v{MK-K>;?%CeCAGl6#Bg6h`MCv&8&YgUa(pH(x_ID5
kh=Knlp))Bxsy`mc8I<z|JHAr81GJFA)78&qol`;+0IP>YRsaA1

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 6cc7ee9938..0751cf76d3 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,18 +1,12 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/210/commits/d188de4d110a4f433ce3d30211be30d8257dc4c3 modified by HoofedEar, bananium made by brainfood1183 (github) for ss14, uranium edited by Alekshhh",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "adamantine"
-    },
-    {
-      "name": "ammonia"
-    },
     {
       "name": "bananium"
     },
@@ -34,9 +28,6 @@
     {
       "name": "silver"
     },
-    {
-      "name": "copper"
-    },
     {
       "name": "coal"
     }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png
index 7b5882364d61493d8fc1d20499e34b155542092b..f9f77e64fc8c42c60b20bdf04722ec9d3d321174 100644
GIT binary patch
delta 514
zcmV+d0{#8>0+0ld7=H)`0001UdV2H#00GuXL_t(oM`L6dV8A%Q_A`t+U^E0qLtyBK
zfTf+s|93C%gNqX(aYcsXhjx(UDUuW;7h1j{N&jJdy{)Va`%E7)Ji2?CK~7m0Oeeha
zVQBq6lc4zo6`+@t)tu@7FM0oFc=PHRgVSkwu*IMd`10io1Ah+>4@1Z!2e6h1R!;^G
z-fS@Y>C>k;?IGF$pr95JlL8wEvK$udAU@1e5POZ>0dQ1+90vjmgtp*y1W^uvS&q+Q
zkdHxN#qaH4N5C8fVuL~lS190h0L)@o9K(DKGrXmzje()}4a1c;*TEKp908(1pe3}L
z;mU?{U_K}mNPl(!EOmo|69hn(!z~W2W?(SqW~eEtf+rD}uR)H`2{2-)S=|bjBRd4t
z)z$yQEQiG>*l-a|hMMPn7_~UaBINXd%qJ@ZKn{Qzh#bGjHp7A$7WXhYnB}0jhXInK
z0OkO6UxA{5kb__e5#|80vLSK^z_J#4B7}(_3ttNMD0?hTz~Y@y832+em<^Fb0u~yu
zAV!W3P{^PMJwBhq^b&LcOd%{$!b&~#R0t{siHUP`eMCC|q)}R08eaaR8$^t6F|rOZ
zQGiVoHN{8@0cu)IavGq8<wWHIT3I|A0;3@?XhHx0vCi`$ZBQ+?00000NkvXXu0mjf
E0G;#GF8}}l

literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAsXNl;tHfa7#bc#yjUS|
zqCw+;0YgE7#EwrEG37uB#*!evU<QY0H_||yByV>Y)*tyVLDsUDc>21sKV#<ORpHxe
z$Djuk3i5Pu4AD5BoFGxw5Evj3>Tu#l1cR%C%gGx8GtaMjwPZ=l8kHNWuBMg@o(e~f
z9yJw>RM0u9%H!H#de&5zC$d3N$Mmeo(Wq+yBE|=mm}Mh?uD4C#G4$<W2YFnz#5JNM
zC9x#cD!C{XNHG{07#Zmr80#9EgcurI8Jk%dm}wgrSQ!|wK4G|xq9HdwB{QuOw}z6P
SJJNv~7(8A5T-G@yGywo3(P&Tr

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver.png b/Resources/Textures/Objects/Materials/ore.rsi/silver.png
index a8da0b92cc13daf56790557d45feb6664165fa9b..62a6395fe401a2e959487d1ef56b03f109263e4d 100644
GIT binary patch
delta 394
zcmV;50d@Y-0hj}j7=H)`0001UdV2H#00Cb~L_t(oM`L6dV8A%Q_A`t+U^E0qLtr!n
zhIR<}d)WPd@#-yugqSb`jNZ885J{dQNilM<4YFKaS&re^%hwDtDuxVC?wn_k5*KB-
zdG`@Y=}yQ&WH|uY^3PwsgDnI(1{+whVK>90r!R5ZLy`kP7JtJmgZVrqC52(moH-2t
zK0m>*|KRcSV6o>f-{5ovQ4T=1xTbv?Lt9%L1IS_!09g(KuqXhrL5>4~+xH-jBHIDT
z7Q?&;G8`7{$X?bouwuA=;TQvm1~~?1`S<TX7(RUZLV5_m;yENfk3mRC2<}^u;UEWq
zEJ6<jkOM%u0e=Kw7K7Mir2&`&KtX=v#tnu^UA16?VJRLK3LuAo05;3<Squw3ylDUy
z1t7&RpMlt_N;2S3Ko*1f8bsp@a`co+R3b#zBquEn&JDN#F+L|M1n^lxEjhA6fLfM=
o%o%mSXb6mkz-R~zcnAOhzNxh#L0<d`00000NkvXXt^-0~g0@ziv;Y7A

delta 193
zcmV;y06zbi1JMDH7=Hu<0001iRA<Kk000$GOjJcoX>nO^n6%2^K}&V%@%4q7!CY*Z
z+_}{*00001bW%=J06^y0W&i*HYDq*vR49?v&cO|UAPhj!CS5>BkT3uV$^cRrKwty9
z{|eTFMK{oY>r2`c;P=haYc|p}X524`12zF`2Ow9XOzaeDYC2L@2(=x?EOZ0*R4q{~
vy3x5)YehF;<<2j_ASa7|Jc{0X2jA`l>){j=nm_yJ00000NkvXXu0mjfJ7rAd

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png
index c615636f9f2de70900cf5c859dc10173f02c1ade..f1c949006d0f9782cc73cef170ec6848d84751be 100644
GIT binary patch
delta 508
zcmV<Y0R#Tq0g42W7=H)`0001UdV2H#00GfSL_t(oN9~lcOF~f;#*b^zkd$BzLQu4n
zR7epn4ds%NlaXtS5cL<h)L#$;Ev-dOK~2``U<gIEL_y$Sf{6`5tMR*VE-#UK#tRAF
zncltk-1mLwJKsG4>2d_Rj4wU`Ujbi%|Diy3W2ecy*x$>2A%DEOwq^E-<D*@Brupse
zw9Xw@3h={tIw6IVytxk%!25#zG8&tbtNeu}KrVZs;Q^E1O8VCXGV3WR-ImS$$I`XD
zHR>`lIWECa*bsmW0XPwhM&$6|)H?#X?M*p3FW3Sg(H{v*y<9b9W)h3`ES-#-Tyi{9
zfXej8AgRQPs(+QU{xbq9ZTbB}9*TDc8wK!3?fKQLog_V1K&z#{`OBhNKHc0)GMljk
zICFZ%lNJD^FM)5WZPco^|Cn)Xc0wY(Jr-Qe>InhBF&xzbM&N!VCO9J!3$sFd2sclV
zJlAsolTkG!H1z2y2}o&<b1>NpZ9ZHP&=#oEos~mK2XzwQ>We=ifYek;IKh|!>IrR?
z=L7)N@vD;a1S^#nnO|A5eqeoey6;+9*NNJ`<y5vgG&E?IfDzHTY4ajF1$S-2R_{Q9
yJu202U4Lh|c4r+c&?&%A`91+(0bhZxEAR>VPysL-Q-%@%0000<MNUMnLSTXeH|IbA

delta 203
zcmV;+05t!K1ls|S7=Hu<0001iRA<Kk000tDOjJcoX>n<6gHTj%=I-&O!^)4LwUl8{
z)&Kwi0d!JMQvg8b*k%9#0C!15K~yM_&CcBo!ypU<;7cZ;Dgz)_8Gs)TkQf$#c>h(}
zr(!n9z4?<)XW-Fs*nrLb?>)M=gHIF2S>sE(f$G__0WD{&3q%a@vO+0YC*YI2u$q;m
zNplVpZt8>k1W+SUGOzDPVY)1gb~n@bb*`ghNuYp7<qHGC6GVzT=V<@{002ovPDHLk
FV1mOkRjmL3

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png
index 6a6b27db7d74cb29f8f08e6a8b914dbaf24a2a2f..4cab8569267f898d092dec5960629b292b747f95 100644
GIT binary patch
delta 424
zcmV;Z0ayP11HuE4B!7uXL_t(oN9~lqOT$1E$6r?!q)9rp2x4pnDYS#o4uXg}brt**
z9Nl$v7XJ*vwUZVXmw-bQagmCp=+s=IppKq=&t9aBnu`&#+*^*^kN5q&@4H-%GLBrv
z`lJE01KI)YKq3d$*OoaRF0=I_-mjw_H_`d;9zEp*5I0SWs(-uhVV>)=erkwB04oOu
zJ>D__z&o}WyWKlF?VKy;8FxYH;MQTCS663*xZy5|9E=4afK2)qkXV3?y;*M8ic~C{
zBh?4NGZ~u$@{bF|m=|fUDoiXuy|&0Jl`>JYM{q#~+<>?YK+JD*F_+IzE4M}o03waX
zr}e0OB$_>9?SCmDj(dT1z}WU2InD*Smp8v^C;?cOL7wM-K`dO6QJM@dW7v*|R{?{+
z1rRus8UQM210duZ;CoNRol>Olq6I?;EdCpSguqy6z0sgOK@vzp!4Zff0Ej(t)njjL
z3nFC>C*X<%f*Yt-exK~$E9X_-7zcuNm5Rsnqz3p2Od)k%184`d1KNSi9rytA->xBR
Sdm0=70000<MNUMnLSTZ@yu3#M

delta 484
zcmV<A0UQ3p1O5Y$B!9(8L_t(oN9~k5Pr^_X$4^BfLK-3k2|6H(^%+Ne#27ahCnrAw
zegWg)Copl=(b37>-S|kHjD)1|frApHt&#?UL998~+<G<C78r=hJqzvSwEy4v-R26=
z;SxHW4;+9S;0CyX|7jq-l`_MT?=w^_lwp4-)6y_aJ+!@>GJk1ogdxagat%*(H&Cts
z?1K9wKO9`<z<8{{%6I@+sG?c~H)b3G(wkG}!qOyQ*qx$Ulj8lcRsrQC2lC<&)Jk<&
z9Twq5s{joTM*{@n)ezut@48`@Bf$E`w3$r$K^}_}2n@i&@cjKVxekXU@CH2uLayn=
z1omQK|JnINdw&4)b8+%Ay4N__sbNAa(GOy_2*yN&gk!0?W?70A-pKV$p$r#Cx6K)t
zT^lhI(O$smaUxc$;ti1?1V9UNRRDe9Yt1r}eS&<n2g+BvZ8-MYZUF+smq#tN_;OY?
zJ1qhjr78);9twgVXO~uO4FCfWA}|yBp&BPfwaR-P#9cu@nI6Mwp>DS9)YBfvj}Rd~
zBp=A#9uR{*5{BWlaGmZm{yGKzJ}?{ssELLr4YSy6uxkTO!R`L<%0Rmze?89uxB+f}
a8~6k?&dnh<9ZCWK0000<MNUMnLSTXkaM=+6

-- 
2.51.2