From 57f91f3159ad0c22a7fac26f8819c1fbb6ac1f56 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 6 Mar 2016 21:42:27 +0000 Subject: [PATCH 1/4] Cables now shock the entity's --- build.gradle | 2 +- .../java/techreborn/parts/CableMultipart.java | 22 ++++++++++++++---- .../damageSources/ElectrialShockSource.java | 12 ++++++++++ .../resources/assets/techreborn/sounds.json | 3 ++- .../assets/techreborn/sounds/cable_shock.ogg | Bin 0 -> 6135 bytes 5 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java create mode 100644 src/main/resources/assets/techreborn/sounds/cable_shock.ogg diff --git a/build.gradle b/build.gradle index 03fe41a95..afe56bbc7 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ dependencies { // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.4.+:universal' deobfCompile "mezz.jei:jei_1.8.9:2.27.+" - deobfCompile 'MCMultiPart:MCMultiPart:1.0.6:universal' + deobfCompile 'MCMultiPart:MCMultiPart:1.0.8:universal' println("Downloading dependencies that have no maven :/") //This is done becuase diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 18b57d32f..5c1e0ec3d 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -11,12 +11,10 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -25,13 +23,14 @@ import net.minecraftforge.common.property.Properties; import reborncore.api.power.IEnergyInterfaceTile; import reborncore.common.misc.Functions; import reborncore.common.misc.vecmath.Vecs3dCube; +import techreborn.utils.damageSources.ElectrialShockSource; import java.util.*; /** * Created by mark on 02/03/2016. */ -public abstract class CableMultipart extends Multipart implements IOccludingPart, ISlottedPart, ITickable, ICableType { +public abstract class CableMultipart extends Multipart implements IOccludingPart, ISlottedPart, ITickable, ICableType, ICollidableMultipart { public Vecs3dCube[] boundingBoxes = new Vecs3dCube[14]; public float center = 0.6F; @@ -277,4 +276,17 @@ public abstract class CableMultipart extends Multipart implements IOccludingPart } + @Override + public void onEntityCollided(Entity entity) { + if(getCableType().canKill && entity instanceof EntityLivingBase){ + entity.attackEntityFrom(new ElectrialShockSource(), 1F); + getWorld().playSoundAtEntity(entity, "techreborn:cable_shock", 0.6F, 1F); + getWorld().spawnParticle(EnumParticleTypes.CRIT, entity.posX, entity.posY, entity.posZ, 0, 0,0); + } + } + + @Override + public void onEntityStanding(Entity entity) { + + } } diff --git a/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java b/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java new file mode 100644 index 000000000..325877c6c --- /dev/null +++ b/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java @@ -0,0 +1,12 @@ +package techreborn.utils.damageSources; + +import net.minecraft.util.DamageSource; + +/** + * Created by mark on 06/03/2016. + */ +public class ElectrialShockSource extends DamageSource { + public ElectrialShockSource() { + super("shock"); + } +} diff --git a/src/main/resources/assets/techreborn/sounds.json b/src/main/resources/assets/techreborn/sounds.json index 744cf2902..058d87ef0 100644 --- a/src/main/resources/assets/techreborn/sounds.json +++ b/src/main/resources/assets/techreborn/sounds.json @@ -1,4 +1,5 @@ { "sap_extract": { "category": "block", "sounds":["sap_extract"] }, - "block_dismantle": { "category": "block", "sounds":["block_dismantle"] } + "block_dismantle": { "category": "block", "sounds":["block_dismantle"] }, + "cable_shock": { "category": "block", "sounds":["cable_shock"] } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/sounds/cable_shock.ogg b/src/main/resources/assets/techreborn/sounds/cable_shock.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d23d5b3edbc07086a24278b8ce43885c132a2daa GIT binary patch literal 6135 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 Date: Sun, 6 Mar 2016 13:51:49 -0800 Subject: [PATCH 2/4] Nanosaber textures --- .../textures/items/tool/nanosaber_off.png | Bin 0 -> 390 bytes .../textures/items/tool/nanosaber_on.png | Bin 0 -> 474 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_off.png new file mode 100644 index 0000000000000000000000000000000000000000..86c5a54793bb6166fccc50d8f16d0e1e89435683 GIT binary patch literal 390 zcmV;10eSw3P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M_1W80eR5(w)kv(gJKpe*X1}Zo>D2U?b=*!^Z;2v-n;^xw+9Wr%E zLQF#1ype>M&_F*%Kit#)4=*G`>)9a>90$kqd!GB>N&it-37DFxqASE z_ZLjpCsgaYTL76~=LZZXTRacnyTiPBvOGQ*u2waMiya2zl{gH5!OP>PShH!G2!a4n z6fqN->8pfbYSVR{87#|!ZQJlX52LsJ&#Q0SuT24b8HRy=J;u}52VB<`oB1|?nhEYz zFKnd7^0zn~h9TlO294u54t(Eddt>`u1m}5N2bZe?^J zG%heMIczh2P5=M_SV=@dR7gwhl)q|&P#DF1fue$gg8@<89Q`x6IQRta4!%I4bjj4A zX-V3WHc3NLVhe%3K_8;ek_YI1dO!b!+d$PDXr>;x1myhA=cndKM`^di{s@af)72LD z&u>Qr5WL>vZt;rAq7V#V=BtMn4981cj-JHfX7YHpIWat$7Z^=f7~anN!vOO!^KA3p zZ}MO;fbaVV!>}?jGrg)_Fiq2Sy)>An3CptJx-M=W*X*e;yKkEUnqwFS&OWapeHCyV zr{B(e08J)X`nV`psx9qm;2;PPMG3eq_nRh{}$e-YI5fp9;gZ8x7Vox?upgh_nBe;-t Date: Sun, 6 Mar 2016 14:00:19 -0800 Subject: [PATCH 3/4] [TEXTURES] The rest of the cable item textures --- .../textures/items/cables/glassfiber.png | Bin 0 -> 229 bytes .../techreborn/textures/items/cables/hv.png | Bin 0 -> 274 bytes .../textures/items/cables/insulatedcopper.png | Bin 334 -> 343 bytes .../textures/items/cables/insulatedgold.png | Bin 0 -> 330 bytes .../textures/items/cables/insulatedhv.png | Bin 0 -> 320 bytes .../techreborn/textures/items/cables/tin.png | Bin 297 -> 298 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png create mode 100644 src/main/resources/assets/techreborn/textures/items/cables/hv.png create mode 100644 src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png create mode 100644 src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png diff --git a/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png b/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png new file mode 100644 index 0000000000000000000000000000000000000000..81acb06e1a7f8074b019c25cce62bc9367467c6c GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&JU<2+0(@_ z#KQk=pEX~Df`H5Of9*l<9<66Nv^=G>L!-4dEa=0evpT0gF%McKX=&Nd!y9Dxhb~w& TfBtO`pmhwMu6{1-oD!M<3vf&Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/cables/hv.png b/src/main/resources/assets/techreborn/textures/items/cables/hv.png new file mode 100644 index 0000000000000000000000000000000000000000..5930de11bd03c820d3c850fa048b149e88ce3331 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&JU<&f~SjP zh=u>sbB0_;6a-oy-q8%-F3{8z=F~MM>IEZ<<430a$0FRP{U$0NH9ygRDu*F1aWRXu z>J5#9Zk%Rb8v>h-%@I!K`Eu`K)bGITzmtoPmBxO*{JXjKexR457pLJd_j8|HzRSJV z%@uHJFl@7UzHiOel)3$n6{4~=mcG!--Ed4gXG#Lp#ADAl)G`F$<@;Bg7RUp18-u5- KpUXO@geCy`>|*Eu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png index 856e6501d90ad45b4fa2353785c9ab3118201c5f..7e1d323f5cc9fdd504f62cd2d2f6cc0a1c928212 100644 GIT binary patch delta 242 zcmV4IvyV22Q=<$l`YcJ$HrJ+22| zpwCjXGf2JcH>j!#%-R>!bu9tIFbsBPDRo&EWLYL*?(za2B+qk9(_}-0rC}J#%zsno sc@{M}TktEY>4IvypqehI=J&vR0`(!Ev!?~93jhEB07*qoM6N<$f+&V;djJ3c delta 233 zcmVkC~k?6WEBzU#Ou4HMF3H7Szy!8d`Xp#ezJ~sYOvxJ$>KHJkRt= zk}Q>v0fbQ$NgT&~!8s>k7}9@I*EO|i8Y;Wb%bv&Myp#LMNn+c!ayvSL9Hah55qdpr zr7TNf*MC7(RV;YAu3J4uq0=-;nx-t{W)}~TWtj}au$BNugCL;Ce?!M{r25`E@GEL) jK@Baap#?Sk9@)GAnQn*apI#2800000NkvXXu0mjfvx;W$ diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png new file mode 100644 index 0000000000000000000000000000000000000000..8d295f901afe3f9ebec18a7b6406a71804f447d4 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&JU>Ogr|#R zh=u>ses8X32LYG8-SQ%?Atj0&T}=WLVpQDE-HR17WM8pFD$Qeo_{)@!Yv#4bo?&75 z=QLF;B-0T}{1IqV^oX1`DKym6YFXx?ZMjD2k>8>!wHNqIV#%C!iof>0a^K^Arc2w_ zrd%(b6jbm=-O}crxXgCrwnT=xpLI&p^^Cs1ZrHUh^_zLdEH^Qk#}>b4EL0+zA@iKpKcDwtmUULly%9~}Vn O6N9I#pUXO@geCwNUU>Kb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png b/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png new file mode 100644 index 0000000000000000000000000000000000000000..b44707d709fdacdf9ca9048bee2259cdde2c44cd GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&JU<&pQnps zh=u>seqXK@1Ci#v-S!&O7A@j-3=oN_EaqRZz0#O-i^T`A&uL=wJ)1dmm6YliwuxQ2 z&?FTV;LM$sp*YLLm$l;kO5e)?%%?Y#g6yU50+;xYLi*~ut({Ojeq9tX?FJ(ytWc!`fTIgANXS5`=INlr!79S z{a|=LXU%IVZ-&K@(=I-~dm;DsiiP6rb*{X+D;BbvZduTFU-=~W^RufD?GFqy0{Vo( M)78&qol`;+04@Z1ng9R* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/cables/tin.png b/src/main/resources/assets/techreborn/textures/items/cables/tin.png index 4c6438dcbb7af8ea33895d10b85ee29a7ab9b226..b6f890534f260e5f5f964a1a13f08f2c27996589 100644 GIT binary patch delta 197 zcmV;$06PDv0;&R#ZGWgqL_t(IPo>UZ3xY5dhhe|dK6$qW1`$cgAc_{7CRvE3By^b> zzqWN(hv?wNv%$MRoB+TeWaJA6mq*ZTd9CYI}^V$%2h+q7-OTN6pU)kQBb(#KRYd5|)XI{VT z#`S>CWvjn9NVKhZ#rO1K$Jup@b{@=%{$~=b>GqiOPV9f?y?O$+=~Bg06DL0T^6OJ` v_Rjm=8MeJiR Date: Sun, 6 Mar 2016 14:27:21 -0800 Subject: [PATCH 4/4] [TEXTURES] Cable block textures --- .../resources/assets/techreborn/lang/en_US.lang | 2 +- .../textures/blocks/cables/copper_cable.png | Bin 504 -> 504 bytes .../blocks/cables/copper_insulated_cable.png | Bin 459 -> 471 bytes .../blocks/cables/glass_fiber_cable.png | Bin 0 -> 266 bytes .../textures/blocks/cables/gold_cable.png | Bin 0 -> 467 bytes .../blocks/cables/gold_insulated_cable.png | Bin 0 -> 445 bytes .../textures/blocks/cables/hv_cable.png | Bin 0 -> 447 bytes .../blocks/cables/hv_insulated_cable.png | Bin 0 -> 441 bytes .../textures/blocks/cables/tin_cable.png | Bin 0 -> 366 bytes 9 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 959943e8b..ded69ee6c 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -64,7 +64,7 @@ tile.techreborn.ore2.copper.name=Copper Ore tile.techreborn.ore2.tin.name=Tin Ore tile.techreborn.storage2.copper.name=Copper Block tile.techreborn.storage2.tin.name=Tin Block -tile.techreborn.solarpanel.name=Solar panel +tile.techreborn.solarpanel.name=Solar Panel tile.techreborn.watermill.name=Water Mill tile.techreborn.windmill.name=Wind Mill tile.techreborn.ironfurnace.name=Iron Furnace diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png index bc8da6e1aa0a2424087eedcb7e67d7ccf3d6ce74..b5dec84a765b1af7458a708262431735b2162eb4 100644 GIT binary patch delta 21 ccmeyt{DXOd4ObBZgHRD;Tx#^=jc%J50a5D*ZvX%Q delta 21 ccmeyt{DXOd4OcM(gHSPJkJ3)|jc%J50Z)bo-T(jq diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png index ea6ca6f9d1cc2c22718c379c82f8cdee8d6a5663..407eaa2ac690f0bdb6a4858ce0ea59739382ff4a 100644 GIT binary patch delta 371 zcmV-(0gV331J?tPZGTlsL_t(IPo0xLOT<7B#aF>b8!N?5NbW)|B)L11ko%JmE>%8? zt)L(_T8fp8Aa;HaYvn*}wDl?*LF{aw_m#*)!! zq;k!x2`iB2x%?*j{k|*?!*IO@YT|@H7OzrSFVTb*vT!n)$T%DhRkMcA5Pz8po%{z` R)jt3L002ovPDHLkV1ndrwO{}M delta 359 zcmV-t0hs>R1Iq)DZGTBgL_t(IPo0yyPQySDMb{4!%T8=!%Wp+-m4Bm+1QMcw5>e40 zAv*qp8Wai9KnoQO5~8EM_)fAWu~QgEI+@Yknc2ziS^?-#8-IkNDByXX#O*xN5k#!z zG)>{UE@rb?)2y9GI)aF`JQ|IfLQOl5bObUO3}Bk({~IvbvVSZoVj~^5^N4aB2h-^k zQ53=VeHexz$-7{#hBa&bH-V$;`1Rby@<`$CKw){f(s(Y!wrvcDL-Dn~8dDc)KCTjc z-&Xj%PVs!Yz0OJL^E`(t%W`W`^LF9k>n6whqhU)b#D}ePEFJd=AAE-kf6B{kP#EvTl7lJ56?=XL20J`Z@PAUTN(bk|fb_Z$nj8 z@+QXPu@r}4__qf7#0ftv{uNp2X;PSFnfM?GbhDNz^#j6?P!166zb*g(002ovPDHLk FV1k!lvI6;>1s;*b z3=BerAk6srPE{XJP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&JU=j!_&nv z#KM2;#6Z3V0}kh%|CfI8`1gbRouW(fiA@%&E06M7oj7vFYsIRyySH6QxoP&CYbl38 zgW*gghV{I5kqbBOGg~loPqsj7Y(l_GhmJc_GZwM!E~{rf_uxvRf5wh(k)YS}zsU<% z%rl+&`ytPcJw4A^6#I|gthP-)@wn0Powez~EsVi`b~K$}WKfC`^5&O)40IENr>mdK II;Vst0LqDCCIA2c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png new file mode 100644 index 0000000000000000000000000000000000000000..964172c2ef1b8743de33bbeb7b5b6da12fe4d8c1 GIT binary patch literal 467 zcmV;^0WAKBP)N2bZe?^J zG%heMIczh2P5=M_QAtEWR5(wal4)+jKn#Tq0b10w<^DJ7s>WhME?Cax|FdMb z7VNfyz3OKrSZV6Kk?XBj?H6Cwnj+tC1mC{?)4);|k0^_QK3N~9v}e)|4;>S*$ZpM^ z0m|Gpd-{~wjcG2klRS122X`t5iPp=S8DP7tdJrC4n7#|LxC&-`ep?6*Z6ld|2qv$B z(UV}RU)H|V8|QjxO#ZCwrQ+PvXRK_f{xfBA%~m={r_?pGz@F5&xiP@G2h6g@&FylK zYTVp>o&QWbokb3~u5oi?Bl$9Xm49Wh(7O4Y;n4xdy2ckK@&|GZ4Q$}q*^B@H002ov JPDHLkV1gKU%N2bZe?^J zG%heMIczh2P5=M_J4r-AR5(walig~AKoEte(2Kr@Mp4nIsQ8cQm9L(bUX-?>KLn(d zLQ5%qf@#hsE9&MZz4(}AJacAub|q$3&@_!DRaLR)d1AfP0VM$-&hwmI*X6ctN3*34 zCZ(=?nU2?s&Ix~|W)A)i z@Is>a^W%cIw+DkLibOrYN2bZe?^J zG%heMIczh2P5=M_JxN4CR5(waQrV8eFbvH9|4E?*TA+vM#SJY5dVkK)vC2N6ti-M* z%gJOC+v6wzT6bL+S(f2)xnQ|m4v?Ow1?g#;qG=k`b&WWV2T0G;f^=p*pU*g*PH-G& zfb={qNM{Ai{(L?WMbQB1d0LQe+cu8JBli0}=JWXg>3Ld^?)yG&w;S&FJCYMRoLxzP*j>ivDe4rA(0O-mSrjHAPD3FA0vks*&eG?v)K%u=fN-xDbX}d$!=K| zrqik5j68eC$z+1{dM#Y_n{BsSv~4S+WX~h~y)naE16Dc0-`nR$8sYDaBjU(@#`RaD pkW`%huL}5mDI}fWdW1hrsTVurL+b{((G36q002ovPDHLkV1nc1z8wGn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png b/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7f2f737c2f689444dc1a3aa16d3049baafcef5 GIT binary patch literal 441 zcmV;q0Y?6bP)N2bZe?^J zG%heMIczh2P5=M_H%UZ6R5(walh4Y6KorG&7t=^lD>BSKA-3{SBZ9Vp3!xHPxbTTi z-?=oRj+?&4k2{<>_s-0n83TZZX_`=ESq9(tWjyr}O&~PKaSYG%P!vU9Z0aMLKxhtv zpilg{z-qOEWm*3(K(lSzlEgx4JoOR7bzS6nj{Sa*&1QqeVli5E2)zpCP#bleTUX-ECzb{oxcr;KTu!Z;p}qe;c%@j%yg zXxkR|`(3o%ZYPnet3^jg7;?Q{ak*S@KA$C0Q@6wSLCUg(!4401F?at{*hJ!lvI6;>1s;*b z3=Bd=Aj}w-8vPh3C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~t#?!?y z#KM1WP_$690?(6uGFwBVR$tq0a4SyvY}1O%p1%(s=S#Vn!{jJ9k>hgos=KqbzAxG{ zcgCbrCC(Xj-%d_VZO%*cy4It{bjn$eqgyr{ z{PdsqU9)ok#f!Nc;(EGnco#M(Z=S2!qt)|zuYJ_P(8LZ+g*L`>&SxgytSDLDr=W67 z^uNNahgLU^-)LUXuCc?pAeYVUM*5!y>+tV&w%Hrv<|VG*a!twL*bSpD4=D$g#={DG z8kaD-2>tlyF^NsUQ{nwN`Ajc^2P!J+(hJ^NY`V`DRm-4%bieDx3)ZWF{$}uW^>bP0 Hl+XkKpQMpx literal 0 HcmV?d00001