From c9aacbff2b91440a04d61676a3d99aadedf08810 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 22 Jan 2021 21:37:17 +0300 Subject: [PATCH] Texture, lang & shader update --- .../blocks/complex/MetalMaterial.java | 16 +++++---- .../assets/betterend/lang/ru_ru.json | 7 +++- .../block/thallasium_chandelier.json | 2 +- .../item/thallasium_chandelier.json | 1 + .../betterend/materials/glow_green.json | 8 +++++ .../block/thallasium_chandelier_wall.json | 32 +++++++++--------- .../shaders/material/glow_green.frag | 9 +++++ .../textures/block/thallasium_bars_top.png | Bin 170 -> 258 bytes .../textures/block/thallasium_chandelier.png | Bin 346 -> 539 bytes .../block/thallasium_chandelier_ceil.png | Bin 240 -> 348 bytes .../block/thallasium_chandelier_wall.png | Bin 245 -> 394 bytes .../textures/item/thallasium_axe.png | Bin 224 -> 424 bytes .../item/thallasium_chandelier_item.png | Bin 0 -> 399 bytes .../textures/item/thallasium_door.png | Bin 272 -> 407 bytes .../textures/item/thallasium_hoe.png | Bin 221 -> 371 bytes .../textures/item/thallasium_pickaxe.png | Bin 262 -> 417 bytes .../textures/item/thallasium_shovel.png | Bin 202 -> 392 bytes .../textures/item/thallasium_sword.png | Bin 258 -> 442 bytes 18 files changed, 50 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json create mode 100644 src/main/resources/assets/betterend/materials/glow_green.json create mode 100644 src/main/resources/assets/betterend/shaders/material/glow_green.frag create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 0f8a3fbf..29d2e49e 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -74,14 +74,16 @@ public class MetalMaterial { FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build(); AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build(); - GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).build(); - GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).build(); + GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).setGroup("end_metal_blocks").build(); + GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).setGroup("end_metal_ingots").build(); - GridRecipe.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', block).build(); - GridRecipe.make(name + "_bars", bars).setOutputCount(16).setShape("###", "###").addMaterial('#', ingot).build(); - GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).build(); - GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).build(); - GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).build(); + GridRecipe.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', block).setGroup("end_metal_tiles").build(); + GridRecipe.make(name + "_bars", bars).setOutputCount(16).setShape("###", "###").addMaterial('#', ingot).setGroup("end_metal_bars").build(); + GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build(); + GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build(); + GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build(); + GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block).setGroup("end_metal_stairs").build(); + GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block).setGroup("end_metal_slabs").build(); GridRecipe.make(name + "_axe", axe).setShape("##", "#I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); GridRecipe.make(name + "_hoe", hoe).setShape("##", " I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 76f0b583..a1b1774c 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -595,5 +595,10 @@ "block.betterend.lumecorn_seed": "Семя люмекорна", "item.betterend.lumecorn_rod": "Стержень люмекорна", - "block.betterend.thallasium_chandelier": "Талласиевый канделябр" + "block.betterend.thallasium_chandelier": "Талласиевый канделябр", + + "block.betterend.thallasium_anvil": "Талласиевая наковальня", + "block.betterend.thallasium_chain": "Талласиевая цепь", + "block.betterend.thallasium_slab": "Талласиевая плита", + "block.betterend.thallasium_stairs": "Талласиевые ступени" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json index fde436df..73a05561 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json @@ -1,3 +1,3 @@ { - "defaultMaterial": "betterend:glow_65" + "defaultMaterial": "betterend:glow_green" } diff --git a/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materials/glow_green.json b/src/main/resources/assets/betterend/materials/glow_green.json new file mode 100644 index 00000000..382bc183 --- /dev/null +++ b/src/main/resources/assets/betterend/materials/glow_green.json @@ -0,0 +1,8 @@ +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_green.frag" + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json b/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json index 83efb04a..b3a77432 100644 --- a/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json +++ b/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json @@ -30,8 +30,8 @@ }, { "__comment": "Box4", - "from": [ 2, 6, 1 ], - "to": [ 4, 9, 3 ], + "from": [ 3, 6, 1 ], + "to": [ 5, 9, 3 ], "faces": { "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, @@ -43,8 +43,8 @@ }, { "__comment": "Box4", - "from": [ 12, 6, 1 ], - "to": [ 14, 9, 3 ], + "from": [ 11, 6, 1 ], + "to": [ 13, 9, 3 ], "faces": { "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, @@ -56,9 +56,9 @@ }, { "__comment": "PlaneX6", - "from": [ 1, 9, 0 ], - "to": [ 1.001, 15, 5.5 ], - "rotation": { "origin": [ 1, 9, 0 ], "axis": "y", "angle": 45 }, + "from": [ 2, 9, 0 ], + "to": [ 2.001, 15, 5.5 ], + "rotation": { "origin": [ 2, 9, 0 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, @@ -67,9 +67,9 @@ }, { "__comment": "PlaneX6", - "from": [ 5, 9, 0 ], - "to": [ 5.001, 15, 5.5 ], - "rotation": { "origin": [ 5, 9, 0 ], "axis": "y", "angle": -45 }, + "from": [ 6, 9, 0 ], + "to": [ 6.001, 15, 5.5 ], + "rotation": { "origin": [ 6, 9, 0 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, @@ -78,9 +78,9 @@ }, { "__comment": "PlaneX6", - "from": [ 11, 9, 0 ], - "to": [ 11.001, 15, 5.5 ], - "rotation": { "origin": [ 11, 9, 0 ], "axis": "y", "angle": 45 }, + "from": [ 10, 9, 0 ], + "to": [ 10.001, 15, 5.5 ], + "rotation": { "origin": [ 10, 9, 0 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, @@ -89,9 +89,9 @@ }, { "__comment": "PlaneX6", - "from": [ 15, 9, 0 ], - "to": [ 15.001, 15, 5.5 ], - "rotation": { "origin": [ 15, 9, 0 ], "axis": "y", "angle": -45 }, + "from": [ 14, 9, 0 ], + "to": [ 14.001, 15, 5.5 ], + "rotation": { "origin": [ 14, 9, 0 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, diff --git a/src/main/resources/assets/betterend/shaders/material/glow_green.frag b/src/main/resources/assets/betterend/shaders/material/glow_green.frag new file mode 100644 index 00000000..67bfbc03 --- /dev/null +++ b/src/main/resources/assets/betterend/shaders/material/glow_green.frag @@ -0,0 +1,9 @@ +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + float a = abs(fragData.spriteColor.g - fragData.spriteColor.r); + float b = abs(fragData.spriteColor.g - fragData.spriteColor.b); + float l = frx_luminance(fragData.spriteColor.rgb); + fragData.emissivity = ((l > 0.9) || (a > 0.1 && b > 0.1 && fragData.spriteColor.g > 0.5)) ? 1 : 0; +} diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png b/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png index fba8e1a81e3e41753feac57fc185ec01cde3b322..9036f5cae9adf0c6b5893071b09fd67db565592e 100644 GIT binary patch delta 230 zcmVpFmq|oHR5(v#zz1Art^W_gP%c)$1f{WpA0Iw4yt{oD%EJ!u8u0D) z8-`E!?m&6i0bT>RL`9%1+yJiu!~lW@u<;8(S=a%=FdzgNVPDY%3TXD@%q_r*@yX!@Mx{OfRf03fPe>yq8u1zciYh4!b0`lx gz-s{E+{nNH08DB|r6%I3qW}N^07*qoM6N<$f_s5i82|tP delta 142 zcmV;90CE3<0;&O!B!6*9L_t(|+GAkA0~}h`{I{xF^q+xT0McxdGl_fyK$2ACJl_^%UPJAf_#89>klu&4qB7|6*WHi$-MgJ@)NkXm>Y!!(0J8{}M&jWCRj w55gd|L`5;kHrj^)O%0&f3lt}1y5vRx*U^KoUI54`00000Ne4wvM6N<$f<)^$GXMYp diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png index a31edede51bb3019df894525ee99967a2e3c6fe4..04fc62d37ec0a673f670833c197ccca8f0631693 100644 GIT binary patch delta 514 zcmV+d0{#8k0-FSoBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0kBC#K~y+Tm6A;_LqQaVXD$gvHQEUAv8Yr?rIiqZorb-I#19a) z@gLO2A7G=w#!A}60y}IZDiwePYeC0-&o$S*(SIg9$-QUJnfILeIK!t7 zW5QEk%0Toi&6a!vrr2a-2d9CG5Q1ztxi3cTeH2$93~ipX)yO?-YOW#yV(^b2KFBwM zWLH@oS@_Cb_LJr9R+>z_Xe(eRZf7marQgVxAgRaZVm0Mf1`D5$@9YVSt&#*tz!AtP zKqwKR0+NGtoPR0UHn!}j=1dkUMk<$JsrQUFRxSLZs}&-6vjHP&EDlOm;r}WCWG5tg zf$57Qnwe?!aw!VLk7*Eac}U0A^`uUZ;RhCOPiO)iko30MsFlWUAO`#mZgT-V9tf}E zk9u33_6o9>$t+nVnPKhSEmUxEu%B|Z=caOc`Al|uVtYiZtZvsA-V#XiN1}Xed6r^% zHAcd3^c_fy=WnPeVR&eGU~^qwHUCF0bqf6rK!oq+`jzfuH}<6Ot`NTpNQPI|Iqrjw zu(@qo{mk^lez delta 320 zcmV-G0l)s61lj_SBYy!QNkl3-r5QX<2rAi|K30z^5E-5Y2rAZyMvCtx< z3pSD_Vv#`7h}Z~%jUc2EQlu1%bRnIkFy1%#j^j=*nt^5C&dqyoX7|F);L|QT6T5nz zTJ$im5J#!r^Bj9fg_-$!|D9R990v*^vR7X}oFL4e6@WZnEq@R&7r&f%Dd2`+*&JLjWAFQJvh-T2GL0H4*mc6!@R zzJketsi8I}z=zB3%qou~id}@<_Ut(@HRN*wDg;OOeJAKC!Q|8(wK;)woHyV63vMUZ zElcOJcd;{Y(K$G3TiqQbpph7X3k2_bjl#fr-`{zVfI9e>08dqJy!a&+jj#ccwrt-Q SH^?Ud0000pF@kvBMR5(v#WWWJ(&R+a4%*V(e#l_6n)?6$e};xTm;b|TfBWe_!(<~pMj(KyKmaBv&3{mT`_g|9hH@F6JpRIP z>gGp=!xvvMT)Y1oDvGHNZsg3TSHXfSk3R?VncjT{(=hN)h!;$UTS|iIbZKp{UbqV` zzxV^TabJiF%d&2Y?K*D49*3 zW)Se5vH!nS)gs~yDBp7p>|_wzrg8z;=^z6@E&#DXVjww?8jxBH13(fWCwolX2~rF; z1jGlq0K^7~f#hIegJA$vBUr+vV*^+N%mpAeNDSsWkXpRnaZPMq^&b|9`iU)YjYJ0? z%=sXjV9q8v20$7?UH}CkK_}x&2Si6Bwpg*RUj_~XvRwc&glx?t2mkpGA4x<(R5(v#AO-yY{~wH3zda75AZ#Y69MNFSyA%Ia*u}v#h|dTX zB@%#aHsx1=@)#ISf4oDw3(x^c2E70Nmf`)6&k#0{2JuPq!hftMTR_x*K~7`p+=g2;xNy7l6C~3kPKI z7BvmImr%oQXVFzd+{ux1zr@kuoRYzW9^5Dns!3}7(o^*LoooPIb;E9Xu5Q4_z%pGJxN4CR5(v#{Qv(y10{e7O2fg*q$(&20W2D4{Rd&|>cvnI1i&x= z9e^~>sPtq2;lFI(F`SFn0GQ^h?|*o0r$chC&SUw|_rj2w8fOacNr7|qBofEz#_U|;|M)EKJFGKaUn00000Ne4wvM6N<$f*hNmaR2}S delta 196 zcmV;#06YJv1K#9KHjl{fxQ(7y1hQCuo3*M;cr+hz&9zWWjMTUtNOfKQS%<8v?}) zAe)g50f`fG0UX1e4YC(vOUdkK^bv4#%lmp&BPjj y>}&=c0B0=Vw3!$Kh_M;30U(XUXvS#(xflTY@%ALNGX5q20000H& diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png b/src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png new file mode 100644 index 0000000000000000000000000000000000000000..77827afc5ec5af381c6c649ae61a120022f7f6f6 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Jw{4jv*HQ$$$R;w`W#u;Pjfzdw|Wr$f(J3 z3BwFI5%Dv1yT1OPRjz)Zj!Dzu*o#jF4G&pG%L>^RC~5EuFF1Xemtkg()`Fu7Ck}Ey zN@~&3tK7l(e*gYf&!(F%7^d4;NIBNc`I^Gr!Ea_6dQ1Av%Qoxj2mi2%#u~_ruqjA! zNL)^-kvLG5$kuS+%<}O6@pT{DAKvufvK;upWVB*`?aTcl;>L$J=hsW#tNX=YZe|1$ulV$X`-XSB{ywI5PCo`CR&j>P pgQ?f5=5Vce#JYj;2{RiTLsQ5$0WbEBGr&M(@O1TaS?83{1ORTqnlAtV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_door.png b/src/main/resources/assets/betterend/textures/item/thallasium_door.png index 914279d1eec411dc90a61e927b1412d6ecaa9408..b06c0796cd2978e9a29be1b192baada3d9cd38e3 100644 GIT binary patch delta 380 zcmV-?0fYXK0+$1jB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGEJ;K`R5(v#7;wM{rQyJ7&7S`tn(5tVFdrT4Nee{L!vv*KfT9o= zgSDeFL#VeJnAR{>Vvtu6XZZ2qBUA+fU^Re~pPS+E#a9d~kAFW0)7S35hRR?9tOf}4 zF*3Z^wuj-@y(eHAgh7UWd;JEg0s*iZAjQSZaCL4w*sm}eWGFU()qrQ;{xaBhF9ZiB zh!)b&02_)8U^U?Fr~eFxOXI;-g6MZQZZKSa@dqr24loP=Mc?<2Um2X&?)}fEBm<@; zyj-BNm;kE_Ky?8I0=D{M4B?iNU^Yo%08c2zdivJm#F8%kIxbuI_;XD6B799WY zH}e2koS*?lsU2|5AlkEU3s^IV4Z;KsFw2_+)@)lfAFLT9=GeRv%m*1nlmQ@TgERmE zSPVpi_#lG`8UXSq$j>kXU>L+F+6yp0JGZX~W2>q~q=f-YGi}HqSYYbKH4x_okO3es zfNVvMMvws{#R3R}G{G>@UH}Cm%-QH+KvFb<3;}6?c|j|r1WXeh1~6B^*hGf`C@I6D u5u^!ZGYG>BBPlb13<7C_X$E-*T|EG|cN^VFU-3%-0000pG2uVaiR5(v#{Qv(y10?{j0Tzw3;F8S0I2n(&#zJ`v3@ekW7{ceZ zF)%^-7yzVsMx`f1ZiXX6P^=BZU$*c6t*aM9Wf1_U0U#TL0)J{4Y7<)+K79HMH^j?a z?0=@eJlthC4FCa2Ll;Ko{~U}fs(RptI2Z~s9JufnssfJzApgEPcLdA^8FC@r8EnXD z&lwCqwS&RpAV5?sfSfHa!3nk*q#0yji=;6AK!gF1W|*`8|N73zc76%tol`5IvIN2a zX7l{*Pr#a?!ciyyrvd0TLxmY`Jpaq^|LsR84~GG`YzApY2N(w6vl$yeF@O}CVE}Fb qsW!s^+<^NpzL8`z3{aSz85jVtj-8g{b?E2-0000C2kPVrdF8yC!f{CyJAPm(E#vq$P zhJ-9Q4t5n$2EZ`P*&v&t-h#^!r5WaIAZ7qz1|dG;3_!LSraGBu1F+c)!szNqvKgCN vvTep{04X+O7(lAc7zRK!lB5~K3*=w`kYI8Hoc2XD00000NkvXXu0mjf=Y3UM diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png index 7a2f2209dce5a4b9d0fb53fcdb6318b7bf67df14..537321d8ee2982a4e7eee68c65932523bf4fed51 100644 GIT binary patch delta 390 zcmV;10eSw00-*ztB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGHc3Q5R5(v#{Qv(y10{e7N;9lXssdwdz`A-dl!Xacpfm=sXq<&` z8XK6;!2FAo@n~x-R1gAi8UO;h8IBCvf*epD14Bmp_WxeyVt)+s5}XXvH$G$piQxA>? zW&8ow)Gi^783u%G28BE*@IabDd=vxF{R|bx03g4^0Ne{On+a(K0gyLf0B(S$JP(*b kNHYw;3?Z11@B;=004La#)k~r;mjD0&07*qoM6N<$f($60)Bpeg delta 234 zcmVSB!A6GL_t(|+GF_t|33pI7^|RF)uR7sn0Ny~8m|2R^nc5%*Z*hT zcml@w48mpr*bo(uG%&6?dpG9Z5t%R5(v#{Qv(y10{e7N|Oypa)CwTEU@BNCyz2P|L0)5y?rJF z1IPekuzADG|L1=`0^`c_m;Nhy#sP)@6Xykx&AAzl47;9uW`9_9?E^!YmHx0Jv$ToBU((GU;#4vyR6NZqb7a5nfHT{R% z39YfEy6H@c@`% zx;+EzXKXeT^a3cF)=3r-bT%@88?f5nfpOo)<4_*)fTYZX2^bgvm^8PU3uW{$00000 LNkvXXu0mjfmn@vf delta 174 zcmV;f08#&l1IhuAB!7`fL_t(|+GF_t|33pIn1QYaSXC|h55g)QX&_9R0U(W6{(l1F zn!|U%h7fH4O!Jmkufdu@Y@!W7*9@Yu8h{G`4Pfvy=EBg75eB#bNb}Tm>Hq2yOei)J zWdO2fpbHpaHp4Jp13;P!eTBf9VPbgG0WO=7#fdTio6STS04LIj%Vwetz^9ogFMu?Y cZ2-9#08Dr(0AyfFD*ylh07*qoM6N<$f>mQi7ytkO diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_sword.png b/src/main/resources/assets/betterend/textures/item/thallasium_sword.png index 544cb1b2b53459c29e7bba6aa13a45bcc6ad5228..0683e273eb25b1d7f2ec06c9dcf625163fca3443 100644 GIT binary patch delta 416 zcmV;R0bl-t0=ff`B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGPf0{UR5(v#{Qv(y1F0Z%;{muPCMZob0BH`ekY=d%RAzX5;TCBI zz%*+MaxkpA_5mzLv;pXv_ia4R@b<)6MxqQr*1YS29O~Fe1FW~fCISztOyH$djX``!BB|dz=gLAvI=^PAg6;gBLh{>bSMh}SS%W6 zft_Fow0ZvaCk!_peP#T!Vm^b4XE5XTJU6f+5SV@QDU^i@z%Bqecjs>hhCf=-U@w9E zdT0Auu#L4x?t(Ecz-Znu^Z%=pN5LHC{~Ykph5=+}V;Ke_0|Nkqp1;wO%_?&M0000< KMNUMnLSTZ07_VOd delta 230 zcmVHyOxy|92-1Y4`9C(zC