From 370e4679b579b2605905da8097b9c01e15dc730b Mon Sep 17 00:00:00 2001 From: xalcon Date: Wed, 19 Dec 2018 18:52:21 +0100 Subject: [PATCH] udpate gradle, prepare for final 1.12 release --- build.gradle | 32 +++++++++++++----- gradle.properties | 22 +++++++++--- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 54783 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- gradlew | 22 ++++++++---- gradlew.bat | 6 ---- .../common/CreativeTabEnergyConverters.java | 4 +-- .../common/blocks/BlockBase.java | 2 +- .../common/blocks/BlockEnergyBridge.java | 3 +- .../common/blocks/ItemBlockEnumMeta.java | 7 ++-- 10 files changed, 66 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index abf84b0..111da22 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,14 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup. +def mc_version +if(mc_version_patch > 0) + mc_version = "${mc_version_major}.${mc_version_minor}.${mc_version_patch}" +else + mc_version = "${mc_version_major}.${mc_version_minor}" + +def mc_version_short = "${mc_version_major}.${mc_version_minor}" + version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber() group= "net.xalcon.energyconverters" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "energyconverters_" + mc_version @@ -28,23 +36,31 @@ minecraft { } repositories { + maven { url = "http://maven.covers1624.net" } // COFH Mods maven { url = "http://maven.ic2.player.to/" } - maven { url 'http://maven.epoxide.xyz' } // Tesla + maven { url = "http://chickenbones.net/maven/" } + maven { url = 'http://maven.mcmoddev.com' } // Tesla maven { url = "http://dvs1.progwml6.com/files/maven" } // JEI + maven { url = "https://minecraft.curseforge.com/api/maven/" } ivy { artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision].[ext]" } } dependencies { deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}" - deobfCompile "net.darkhax.tesla:Tesla-1.12:${tesla_version}" - deobfCompile "mezz.jei:jei_1.12:${jei_version}:api" - deobfCompile "cofh:RedstoneFlux:1.12-2.0.0.1:universal" - - //compile name: "buildcraft", version: "7.99.4" + deobfCompile "net.darkhax.tesla:Tesla-${mc_version_short}:${tesla_version}" + deobfCompile "cofh:RedstoneFlux:${mc_version_short}-${redstone_flux_version}:universal" + compile name: "buildcraft-all", version: "${buildcraft_version}" runtime "net.industrial-craft:industrialcraft-2:${ic2_version}:universal" - runtime "mezz.jei:jei_1.12:${jei_version}" + runtime "mezz.jei:jei_${mc_version}:${jei_version}" + runtime "solar-village:SolarVillage:${mc_version}:${solar_village_version}" + runtime "codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal" + runtime "cofh:CoFHCore:${mc_version}-${cofh_core_version}:universal" + runtime "cofh:CoFHWorld:${mc_version}-${cofh_world_version}:universal" + runtime "cofh:ThermalFoundation:${mc_version}-${thermal_foundation_version}:universal" + runtime "cofh:ThermalDynamics:${mc_version}-${thermal_dynamics_version}:universal" + runtime "cofh:ThermalExpansion:${mc_version}-${thermal_expansion_version}:universal" } processResources @@ -67,6 +83,6 @@ processResources } } -def getBuildNumber() { +static def getBuildNumber() { return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0" } diff --git a/gradle.properties b/gradle.properties index b4a0297..1834b47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,27 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -mc_version=1.12.1 -forge_version=14.22.0.2456 -mcp_mappings=snapshot_20170630 +mc_version_major=1 +mc_version_minor=12 +mc_version_patch=2 +forge_version=14.23.5.2796 +mcp_mappings=stable_39 + +buildcraft_version=7.99.20 ic2_version=2.8.+ tesla_version=1.+ +redstone_flux_version=2.1.+ + +# Runtime mods, not used during compilation +solar_village_version=1.3.32 jei_version=4.+ -reborncore_version=+ -techreborn_version=+ +ccl_version=3.2.+ +cofh_core_version=4.6.+ +cofh_world_version=1.3.+ +thermal_foundation_version=2.6.+ +thermal_dynamics_version=2.5.+ +thermal_expansion_version=5.5.+ version_major=1 version_minor=0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b83982b9b1bccad955349d702be9b884c6e049..f0db82d25e02976f263d6fc089350f7fbd2392af 100644 GIT binary patch delta 22441 zcmZ5`b8sg>vu!ro*tTukwr$(iFUiKXZQFJ>wr$&fdtcpG_kM4xda4FJf6bikIekX+ zKz=Gg;1r}mKv95zARvH%fCPc!;qa0FXXFOi@5TRbUL{^YiR&W$-s#Ti7tnt?{96SA z{;%#|1N~?APUiF=|KFbYDMG0KIW+#268(QhH(pw)H~$=$Ac25r6B+u@62Awr0MTli z?h9%N-zXC)#3E?szkW-=5DrZnDN9*OT0pfyf@TRAL$Kzf4EMN!HYANRk!+!NyujbC zr}m_vXQn87y{`l2_=ULD8<6ZBGP0ag*Lu^riGRL6U(A8@`sJB~JhVp)C#5yw90W%Q z=*BgMNHJ66_a_oy@Ka26`c-?n0LVj7rA2?*$o4vdC^5G*k{yIcI{!+vwg3LoNOYhM zdueOm@bS#0cMnuBts?TQknkXS`P;3&k*;3e-vkFJJ7NHmLqJe9Kq*QP^X zNq3diT?t2$O4n4?SEY^Ku@;%zo|OVNqFkUNflA3((A*CwwzFfRcHCyU0wl<$lBzP# zw^*%BW}xoU-xc~7&NVOUKJ{eGsuspcY^0c>nCV8Ck)g3r#OD@&7ImH*aNdS9Y_;8b4 zXFQ~)bsHXo!Yn~*(9||o0kR!DNjO*2+OA~jJ-?>RW@IKECmyslTP&?h6ch3kDep7l zrOQo;JNs#VPdYSF%1`|r?mAWxZ>}mdF{lo%W&VRPP~Z<24d=8@^UrJ7B6tIpZkm>Y zBTx~HnE?4iFOKV%6t8%{?q*^hHN`-j0oCfzZz!4`oL|41P?H?>0sSC0hzwq0j;&UX z-60%){p}ALC^iSe5jmwf2CSy?{o=100yA`PK`+dX(5LY9`#t zC=9tQ6JB&iX>KB=fERntXS$-JpS8R zKNN;AtGXX@Y}<$FRR=7NDD6gUYC1n_(l%7h}B}0j81I_t#&rcDhvXJwul! zne7ZHzTus6+0)Ja3~095QnWzUvt62wEz#3jk#d)&$fiG$9xPL=2R)v#+qY+4>~_Q~ zZRPPs)g%?}DKDY^b0wS$;8lqTUL{#Gv5!3-=E*FES zWq;w#SmP$D8lVxx;%q!7GKmOkesa$6=g%P(RNM*qy@@b@z~pNQ^{qOB1b={vU|qyC z<{ji=oko979flIsD)#~Whp;ZmR`%UfKDn;ojSK+}03i%%{FUr%+nt!^JNR2%=Y|~y z!s8NjrjR>CPAl~9$1h+fgv7@q{%}K`J_t3$ep}#)u))IKQ!$OmoLn--BZ6^bEJq=v zK3pl`ESp%O@PkKfF%oO?(;ro#DchVOYZBLr6zJ3!uDfl52#KTxli(hL<|MT-WB=y~ zdB(JK0L)dT5ddtjxZK>iM|t1hB;$0sGAX!=09!U^|7bI!e)Y4J4ZduCKI=F)76%}?Q$UsIW%u>nL=$$1PvTE%* z&M@viQpRT+N%`y|KthS%Nf`J~pKA1LW=RSby}8_o%B8L7?E z7#ADThOEwJQ=6^DVM7eX6M6&fnqesSEx$IGS>z!Yz#F0=%LX>6v;{wWvAq|dVE-y8 zfY?fh&9izi&i>)ZP_p5dT8B#-3%-GfO)CArVM*G&wfxUmtPRSPY^6x;TS^`GTgG9Z8RG7*+QKZ>~1kwU2LLK{9>|Rd6F=2sv}uPg+J!OgscFz}mK^Ldp>daRU9>8fFcX_SyQ_OZ_-1 zob}xrCyhQLtXzLtz%wI}{@-u{S!*AR&#=fQE@EIE9YSnj@HI!L(GZ0`O*Z1-wplAiqm#>*MyBR<)riI{Q3w1H;F_EHmKV_KV*l*urLWuq=s9sH7N zI=DA>hx96GJtQ!l!01Yoc)3sT{|wZ9nGt&sa6mvfI6y#z|9yGj0NI+51}H0@-#Ja4 z%vjNIY7%t@w?=&s*&`zc(0}5CfC5N@(86gjHi)kzv^1vvHa7ZiE=M2Ca>*i}@MSH^ zWi?&vUWTAT%3YSwS}rViXSPVjHpynT*k$CL#glz)ZwOZ|iMc|ZPH}%vHXMFr3Wg@b}hpmmX1oyKQHtLbE5?H5F{3C~6U&|y)k zR?UfMAj@`W04gKRWSdTnvI89J_0SP@ZQ`8R=aC#E>DbPU8tLqoL{-qWT^uv%TBLq$ zu+-}!w^|#80)b8nj@Ea7Cnd{mSO(mdo#^SEPQ5m^9FUjN>^y;nTkS;x49K zW<1o0Ox^YGtKK{}F7T8hKR{Vx#H%9n>eC(_Si-t^|v_Zs?-AUCARb;a`> zx1G&-xU=!3N_;os2e_#r`49D+lxmVOXo*X^W_=~e&+rjWt#ya1l2fX();I|fPTi54 zx(q4K0IS65?UEbZrm`iAdYhEgtcISFoYV5)pKBz#-IlD0mIa*^raMz^`ZsKL=}y^a zhcY9L6N-78dRtWCk0N@}ebv>RoH1AKv9Ykn#bjI8gJVh6BvxufgtCMoDTzo_kla_~ z*imd4J zsRl{}+FFAciuV6bcOb#3euOLndoDBR14@}FCt61%?b@oHSW<2@+ou#!WpYc0q-#d2 zgHpql`%pACv=jpgPsnV@39apH?c!=ZtW#1VoC(>psnb~PI$Ro7GKq4c(=zW$Y|>?e z9Dfb!D#e6Ld&scavoOYr%Xmm+-kK)%iz4sDvd_CW_VDkp(qH&D=^%5<&V`(S0y@;n zc{bE?@D_>JS?3HRex0&bZeda`GS7?p9*g@I*<7kL$fG6aft15Qb)acK=N z6WrouuYFfhi1&lY#AF?nqAZEbB9x6bQIL)PqLdadOev+M@56e`p*XH(A$FH=Pkeh9 zoOq3iKRj9Ja_)aHjU`EqC`|L5;Tk;@dQ77vI;AQT8A55xH0DTb(^bg2K9xrlg<~pD zLa9j^moL_ZrJ6QVPDes}0uGZJ?5Uj=Po$hUkUmVf&fEN0veR?jErp53+riMH0H^ighG1*r8XZoO z+sX1y>0&%~De^JL(AiPh<`GRY9IEXdbjKHI>G($%%EERWtt^G@XEi!&EUVgVw&hYS zj@}*K-dyV)yxsC&8=CX1!SqZdn#E-GH7XjoI$GOJT7ny*d&QEN+73P!PLdQ-j&*$> zXwa&(gkwSyoZo?503J2fJh;ZUj@3e)S{=B~8IHfB@$&gVxetGAqd)~lUi8MR>fbtsc#VVua!@3m4ff~K1WNz8=>3zSTq{fsx*-5FAoz`|ZM&IgU741dD z$hRW<)rnUjjmKLK=|M%KJCpH51~u|ao%z&cx%T?!1@Q8CdjAi8=B991O^ec51H>_X z50faj{t7G)pkZ9PT%Tw4kZ&oUg15Wz^ShHi6_3;%V3@v3{WoIe@Hhhcu@lBdZ|eDH za5c~fvvOeR#{ev+k=jG5xXMGO>POD{(SE-DRF8nSQ?r8)-pxYJvbG}g6oV11{#$|)ezc~%0>`)5TOon06c3H z>{%HIP{A--ugv6zm?97QJb0g+*W>p+(F)uPZb`q#v;h_~f+*s@lhNWfH`fkv7l`yw zMpR{l9W3{>GpMH>gRm2Mqud)(sTdJ-E~%N>$}YV`$P z+FPb^%TY^w-qxB9vLmA5znU6JPU(;@pbeT1)7#QX6#aPE@vGd=|KTF;&zvRhr|ICb zFQ{gYygsRKF3rF1AX_1ZrSHwFd#2JWoX{IwS!6$XcSn@%5@H;vJ{9ikA z?|A>_JsRP^zqaE4!RVtvL>fet*`-Ldj|+E;`pYE;3d>AD>;Xl7%Tmr4llW>Ga(p8B zrK!{#!O`Q-{E9TaKfw`NyDO-LILglPBAbQk106bmLUR+NrTZEtl~g34C_LiF}Ts80n^ zOfDPlyu%B$J2?^&iW9Zw}{f zeYR)vd!yCASj|ll4mv^M(H#kV0BFBAG%CH`rV3&?=;-m_t{l!vJh}c3a&fVY?_QZ3 zYEYT{j=*%!OLP2vOM|N{dhLCSsLBJSW`9J3-_gEL_^d1)MlJ97^QDP{bqxV;;>h7s z^uEB6F}y1w{+fn^5AT2jsI?nVh-%~wkP{5tqY?88j29sJyR_%w>isH$R!D;32}WL< zz)GempIk2nT!7>$zY9Kcum_pGRjOYS&vnN!(#xpUF{(P|p<=tHps^4h{IsdU4lN1K z$S$@x9M80co^;$#rr1nYS{cE~vGX14!y1{`odSNGiIFT1&C-Dq8Z-_JiNHo=1ACEMfC%@xOL!|b}Kp{volq* zpA^qJ^Q)^Tk7Ukn57Q^*o2E0Y5yb_+F%{VsSKgkP|NK?*xIkLJt;%ASDnu-A+H`QT zm~YBNSW}^)KDNUTIGTDVGL<69hUORe6Ebj;D}aaHeOT=pk=8M8B{ywbGJH^hur`VZg0;Cms@O%AaQ z|48D^ffcp5Gx$*}(tzbM&Y5~5;!n`JR2rtYtSxDv@ZSn%etM}@`Udo(EZ(+hy|AQQ zl??u1O;^UU0Tyc7v<=;^8XRN%1uImMiD%K-*$z`g5~27-zxhzg{lAlGKg$L1r-ek( zEnCBTc5o+8emuXb7;bkxPm#&$D;UHqij^XbjDl7)=vArJk{T4*VImV8=8D#uDOJP#!3^)m_hj^ND^bK3 zND#P9#G$jn3w)1QZo7W}A5m?*dY$124g`b%lSlx;4bXPRHplei)0|(wcp|jhSL3Wn z6d)yUNkEf`mn|zC5e(02t2a7tVbPV=zl>JzG-{SIB0zz%JiqWuJ5q^ytxDyQ92bWd4r1+4J0adD~vv`Fr|ULLK>x16b$FaB1;Cw}4dt_ujg5FZ?rq0gw`s8Mgr$^6 zTvs`74T|jgOA+C;#xq9Q0pv`-9>+Ber&*VqgDy@29V*>2z+<~op}y3j^WLVAi~1{p z^+MukhFW{N>1e}hhb!v$16#F8WDb97_Cs|9aih9#rCOrj^I>ztLfMA;VcXT;dMC~0 z3jlJ8^^|0;K%$xl0Ygg6eqDD}0(Q7tbe~&;=?pEqkA8}aDJx78j>QnpLL<0_m z@x9j6GdkwJrI1tCePG|U#BA}_eb-UPe0eAw#&Doil1_9?xMrk~sM(UG*^c-wqJ{c5 z5%ES!>dY!%yeE`Wt$jOcE!Hr8_?6C`E5L6Hcgm8siMobeBrcXM=}KQaVR+q16V5K$ zt4RfmQ_eS=G@-eV%v>Uw(tEl&Fhu?7iJA0w2y(*_MSp!B zQ_V_yNh>SabF^~89J>Vur=;>HAoiAsipw*dgiGFVqaJD%%J2P@f_?&;ry(3M1i*d7 z`sq};`++AnV_0lsfUyFLGhhfJ%t2#N6|>d1au?B8c#*ps9&)8pWWS63S`wgsM~h^+ zN=c9L+QNk~0t-^R=L)i;IOu-IwRYP#@)lCLeIca+EPk&ySe{mco@T1A6~JPhGTxx6 zX_n?W_8>dV{ea|{4&H;#`Q8(-0N^0LT^(#ALwNYdlKk>3+k*w+ABcrTVa(qn2ltD} zg>*?N*f#V^l|h}z^f@6DOgb?g?y_3@bpYF4%R|cSwP>~*Y~WN9(hBp5V{h#-+Sl1u zvsV(JzZ(^z4el3yQME`mjDqp5aTOG6!>cYFAuB$V3B!yQyqP&&1vteL1x#zH>e^ksCpediAAG#*A|%jnz@ zEzR(@GctheW~SZhu~jK>*=e{Yei5M~bdn5d@V$i(+p3GPBwC3-f2AH-)a-perp3`7 zh)K`y`QGqgNtGbY0C>=(%8+JC1P8wS#7k}WPpbri$Tn@Y{n5SI`e|fhY+8S^dsm^$ zSY2pMy%4rG!0Czf1?J=(24QBAP|24C_Sq#U{^46`Z|~5RIOdnppJw3kOUD8D%DI))j*6CtyL%(0h}*sHmYl8vuotGI>5Bv zYJOsIeu5Lf(u&O$EhCMb-jVPPQGQ~BeTH6r^m6?9poqYjhJ;NNag=&2ByihnTAeud z^LNMG#_c!x8;?GghIKtZs62bxEXmKA6aRanYtJeOPqghFCnk~o!}8&Q$68qH5oxUK zT{jYdGy~aC1_l3cg89QA=X?Lg69+36L~}Tq!S$ z(?Ip;=IN3j#=aE;vsY5Q^53a4BHt$R>`|q&Pn_6L-Hdgo@DS+d{_;o#?baTK>Jsnw zR;?QOP@x&s1cR^8pl;uc4MpkNiG?pK8~&|o!a&$dc63kJ&T~1MgdbaWd!X13km=_{ z1;icYCbQ%|96Uhv5b*a>z~?4}>L*0y z+#gIN%&C9ARs_~cYG0>JtbDZzfBOx_+E=`y^;GY2`}wFN0py2Y?m*f<6^3JPjZyjg zkni%PG{imh)KsB@8!VWf0E*)_RMSr$k##3Ar_(UK^l@Wpbk67EY6}`3kW@FW zF7Wb8J7ziVNaN$vGL>hdS_+r7(4tBQLfq0QiFKy%-eu^YJ{y{|=NM%~8)h6Yrjq@^wh6$jI*}JF zQTuAJt-EHhqYliKbHQ{8fDrv%%MPlY>?o`sRjwlJg`rK3k)qjK=})QtTGmhSUeamD zfP#awGQnKiH~yNuke$63tZ#pQs@KF2{sVfMigf5^ZTV=|ivz6hh+fNA?(clUU~bl| z5oT76HtBwT)=%gkG>zlE9y!faV@5rW*g>}k6C$&7;;LWMW0J5lfZ?n8$e;A97Rw0V z4%X!iDNIMT#iF4Pdh`yUX1u@ZjU~l2b|yaWv|DUy5cU4$DVcaIEBQ7Vl#vNnLZYuM ziX;)N`3waE@=GF+cIKGvDSL7?s1#GAh!qscE?5)8K2}{s<1C7FR49t&;i5!&VN|jz zk;4%h1>sorNphJ7fS&ms=C}D&IgPotc-|x{P}F)EWOPYiUvbM4vXn?vVD9xtk%1;5 zV(=|QbD|(3M&4wsQgdPPDU-jd>_gLtTp26}`4E|#h`gpjRx8C;nP$b7H}S?|L-RvY z^-@wWmPXAe=r9}Xp2qX-fvvIP;|8e`9A3i>FW%yhCX8+h4|q2v{k zXj=u5LNd0n=&qPRo574W&{k@r#4h~SdB_u5vIMV28~FM(PbUUPdIXC z16np+U-}mu0Q|AR9Jj9c359ew-NQU1?@|Vi>}Yh5E8$Xu&ykD+3s;8Ry-_taMQ8BH z-xPHddEAHQ5oemegpHAS+H+-wM{dK#3%HdI3JRN?V!P*_ED<<#RZ+B0p5B}y#noz> zPr$BkZ7gn6!Qzlq6P+Fey^Y*UR@VIz47F<}EvBAdfa=+cZQ+vwpS2)eesbg55(eE@ zUU~B+4{d*=RkhhiVZFCK%7HWP9CJP2{uJl>6N{9aKydh!H(xh)Wm2-yT&m;UVDr8K zmtGbakk5|6rSJ3YfktPQIZaj6Gtvpm}dM-H}m zuE=VC0BYWr%QmfbiM@72y|h^M!k!OKgf1t0$ieToai8ymE`G@TKlz3%z zx1K4vzjDr3R_QsAo4nEqrVVFk2IHC@mNkvwBMHZnZv&0pi4#Q&klFx~$+{i9k-H|m z!d|qK1a8`<;%@>(kD~*w1CL;F1~|`I4=|^C!0&3`&`Z#Ukt~NNRG6bDJ(m;AMc?V! zmZs?k9VzN;%I?y)Ltg%ywQ+UNTVoO;MrF3pkalMmH-h_4Z9!CXht;hT?(EVHjKr&) z3jHwm7WA52e6n0Um$Z*ubiKmM8qJ$kx`i%A-f50S+$#J5E1MBGAU;sWAP}68+C95p z0I4?o>9xvD{K>UcM*xMnz8n-GK7&pzISCA>28bvuG6MWMMQA(PMqhGUK;7@2_V5 zKl3n6m=5WnsnWLrlqzuz4eb;fB$nu40AE;4(2PiO#ic4xRH4XH1=*xwOq#JgvcHMN zQ{Q=j1Cl_e#;SIcK@vJEwLeyaC@Jv2rAz7ptqqPy)MN=*f|mvbe?XUIcK0c(NK0KY zt8(kT;emBl=B6$zEorw@W3gBaz_993vFos9SLI7}|HwX0pu?LW;bRg4`qE#~Eu#aKi734TUx1lkH2)p0MA> zO41DUv|=#LDkUFQK{?rz({i ztX;lyrY35pvo5KczknOsNGA%GhAZn)rwu@UY++cy1~7G)0%YGVJDgXSOxEs_uNyjJ zYZAR~$_I{NT1@I#|41{p+1z|lTx1Ni?2SO`IL0t#fY4&v^rB0XGB_0902D7V^j2s2 z!z;;dqnvA)s*&5?t7t0|dfGRaOh`?EzJg#8x%{nQm|Wo)!fW=fc+;NrScToNb41^z z$fg?aa0b5aRWHxqS%fu)b_mb0EGF`N?FW%58lTP_l2*qSx0aS9WZl@oxtLcMx(%_6 zYll{62McSW%`=Z+&!OI@0awj4ULI54Gw~l(O|$*;W46!q4ycK}nLFN>`lC5hkL0ia zWG@pMKvroIm1z;y>C@4VwrP4jfr|Eq>(_<@*QO0p*w_^L@hRJa8>Z1#!w!i3yPHpG5k-cp#I^FqK@e&|I9RD=8vG|plvZHwn_sFov#2H00n6) zoGO4V1ZwQsz-8oy_4cEjG7 zxn+|AaqRh=#ku2?`r@<0y~FAGu~XXvZh-yW0;7G~27{lpC(MMwBr^txlP8J{1ZNHh zm9wHCix&|@TevqNb&xt!`mo-8vCgFpj4``6^iC015ASN?U>=em>hkqVI~cMu%PmE3Q9)j`TlHAs9F0+uJeZQ|i09z-AhmX;Ly zZU`}FPJ%soUQ1M!-jfR;;55X7bkc&{D&O_&y_6#rU+|Q};M&2=d`+jFCg;W{lg@BiON!vOI4LI>2OCXvk;P0? zp%iAtaY7Mo3U$~h+pWW=9&HYK3SCBoT#LQ6FESs^r5=`IQHuWJs>Kf2<`XsAn~VD- zb~^AX<}!9Il%NAD=-p)+74Y0oU*42_Z?Lswz|rkYY7Mv@=52jOtJ9eZP53{qnReg5=h2%o)@;i+hBNELpePSB<0#6)@s zj<(*~syRk_YmK^_@P?tg`k?PD-1%bq5j3RU3d8cx-!aiq4z(n~%&goQdwwB*CMjM# z6+OW2--ycxU&+1;4r)E5M>qEG z{cZfVlxWB+wXDnQ{KkxsOa@JIc%a-jIpF$_c^3e;AQ9A;RvTjLZ2qG9dL*>C2A*?| zu^7PAByl58WsJrx^R08|L#>0g)%05>r8G!OuY!X?Hz7p9-t$*pTGr0zP2+=4^I#5d zo}<-HVa}wE*O^qEZo}-c7~d?&#)l7P>AD`&9}d?kAJ&<+EKaWG*yhnag_1LvFEnfe zj{|_`%?&T6Vdw#=#sIg>JX`${uJsmj^=VqPKTUKL!quTPsv(Q8*^Hwt6X%=THFcv{ zaUWp!yVb&Y<>odouzba0V#vX7qn+AH9d#^$)Pm0m_2RmCpR_|rlCpWC#L|Sb5Ld6V_)FL8#M!`*i5?y=%5|hhr3l5 z3U-YO_FC*&H;5*2dtfbQXS-wR+TW{`zubOy)C}#iZnEs@fnlU`=!kFb$b#;ipVh`bI-5f0-x(FO}F*bUlQ90kxa4`XV z8^cVL<}^i^%U5ZP(p7xW?j}_&Y84tm;2okC@S=Y7V!Up<5I-1T+W*{16rgpx^8}}P zsMG6q=#$vvLn!Ac<&$Sg4yFR!dgMwLj{!_ zuSrFep_3wJ^3C_>0eZEbF{*dhRFwlBpLa(kXzZ35p%z1m?)Gg_P4Cs51hW7cTxR#S zcu$-#Fh^tO)k&Ql?)V5@xK+X>UmR=BXJT2oE23N{lX((P6@t)`v4WFBJTW+3!{nW! z;hlQ?pFV`|V8dp---~2=QcNBiuzPtGyNIs8LKhz}RO$EYydY!2tI~&<-aUcf8Re2v zGVd62_g~31SpxrDa0HS?1*r*o(45P%9{ zEF*@Sz;k0Ez)HrgBE;2UAl#8TC+eh=Znp~~U8v!!X z1z?u+(uq$@sF}xyDxjI;xPekI3#=K)+cO?@FR3C<;XTh^8B+%!I^(9lDh{09s^UtN zGAev(jtKVhIj$WBhyd{j4SV+?L6v-cWYfteJ8i= zzq*zvyQl;v`k;-U=2;{bC{Wa(gC9P-#Jn<4`1JQ?Ufb7Ztcwdt1y1g{ESG=30&nLz zSo<&EdhpvPosd~p0C%OgQuyQ#*fLrEo4#uSYQ7bPvWHiwytUnn{OS_sql+(*GNcu- z-2~J)i2JuVcIFQHEq`rN-n$(+vSSx475i;d&V)fAt8$>_$!Q?T^5lBIGFi$5BmY_- zi=NkDVl2O<3-$(CBz8X7B!_+%otpsp)a()BtBq@=9wt|(@IggpESIfMvs)H#5)qPT z0K>*oU$M2?ZY#_$cRdIxQO#sytF~UN?*Z5yV3iCUOE>Fk$%;g}E;VVDAYN!qv()h6 zNo#0Lu2+dB%pO^h>62_P6=%vUWFDBQ%chnG6MMW z+979RDIE+Hi#K*$5EwP_5+$9q(Q4%K{*Ej;^Tmxf8CWf@Wh3&^6%Wmks9G}0pap10 zV+W5M&;fDoKoOg1P^Z(;eSvoKX(l2^>b9hhY2(9R$RKA#r)?)hwOkyF!T#9~@CZd) zt4a^?Ddp-`YyCAd<#0sP6D~sFn>V<~Ds9hzgtnkrgJt8G<6u!bm(0RC5jL8V$|=Xb z&uWD1C@TKUp}Z!U7${~~#~%G$8HiG zln^u6rU^JniYZb$M&r$~>y8bF{bcP=%w~Jbq7X7FVdl+uCy^aIuhoR60S1J@ilye% znV6PxbW;o#QZ6Sp38=3WV3?-$ujE`_qLiK3Xa`$Z--N!fN*j-ZD2oG^lp7amnbrbF zW9oLOqC?v+%N92BZ>VAKI~rJgQ+$n7{7dSG*LrMck#S4r4%#NM*<{L;cdPn5ib~e% zp0b#b?!R~~S3||7bQu#iqyU*4bnh9WLpnXO2WfK7ttEvzzwO^N;>J_5M^{X4K-XfF?k zf>2|~t6>mqmn#pDrHwcGgH?A%-G7vt+Qi1xB3`JM_>Y z`%Ews)Ty%!_sz>Z_r0zu1IrO}lMg%5u*o zCfVYXQ_tk>Qh#N_AOW&tyF-?Ab&(pOotUv2I#{8j z@iI=d>}H^!(i~};-i7O2dT*WL)RKj?T&-}d0HH+|u$Yh-qbRt0X>~M^mSiH*rpyLI zW~o|u=PUuJA|@zGfL3hoL0RQ5(y{B&>tX}{}K;Y+8u78c)0-79z`>??hOauwbrJ+T94 z0H>vahXS35(xQ2NCzO}dqtp&!eRR6sCvGm{2NXg)6Dc%`ZM_Ylyg6+FrMd%P4BL-;fbrfvYt?VsosdnhPu^e6_8sCvcwjpN%KW6I zyw;uc6Xs>f#bUI!RtYCviCqW+OJT&v67OKeriJ#PB{3OEt|K`*=Ux?X*%HhpxTQ`Y z_vJOnP~zdXxj0Pcu<8ZBCMPy&0GHp3rZWXPj!AmA2>d*aN= z%kpdWE&U^T{NUo8ZOeXm!6^z~b6c2_cn;&L-huDYb=`7}Zzw9i$F|B_=ZVrOQRbQy zdE|&8|2G}Baa2^N@4Kl)f4HK`{Nw}KrdxtE`{W$4K4QB%VEzMUV=!j)&a||Lr#%%>U}FW()R<1^K3YV$!{85u7REHs z*U*cufg(`$d9wyjh!WjC1#9u*5qRHpszA4;Hq%DjAUZzssLS|B5hhxT-iL;>(ygR^ z9cZk#P4a`Aj)7^Yks1uDxoKtmOQiA^{7b=7(O&){Yy9IoDNg1UpfeA(G-#5MT`GZ| z8J#VGcezwbwS-x2oMd8w!x>mYsdZDq)@tfAl-Sy!JsTwBpj#q~f+fV$WXAC*KQD0h zW7!ptJS*d}vp(p+Z-u(Rz_JBWOm7UO9gd)=qj_k(t(;x#k%EaCC=q|*qiXTw6qXse z5o+>O$N8;*JG*ifuv>>cy1BS$vSBbpyLflYv=*JB(ih)`!P<(Ru3NfLmOCCsks9a% zrYk9k9qO6_&!|E=!wF!t+QN#e#Y= zSArfk!7FVfSsjP0xa*$bZM+h0;Z>L|6nj>V7=N8p1G8WZ;KF5+Cf!&DYHvOpjX~*d zF`s%mA@ZF0cj!4&BH6e%TnF#bFSsWHFa8(;Orqb}bQnlhBeEo~_|p+9HZ{C?JI~!8 z%G&vev3xo7+fi@_LDr5M{ynfg8CCU<3X6bpPVv6D*qA0b?u1}FQiIx@OGU`xgDvL@ z$0n0gO;PO}Ku;n`+I(*1j7$M?)~EyX`N_bRb4#dIxbbZE0j>kN@pu;I9ems8QMT&Y z=tx)N&qGBaJbOO9fBXehDPI2WI$_4L8l%L5Hji{SGW01Wz}7CF-5h_a4C)weHmZ1= z=tg(+TM2XW2}N)${Ug>_gHxcq!kqHIJR56I{6yagQo&fVX{eCVnMtLM(B(tn^hAq#@6vb zoGQ6uiKPq4cbiRLgmVr$TFd{|t=j+;?aymCt#*yK$w5P>_WV~m=R z%1!jG+N>VyP9Q6$^HKbHG=Z4r$Osz2X0L$(K3?T`Y#88P(qao}*cdjwxPhWhbxyFn zQn3Ns2dApG)Dkm>k0uxYk_5`^oDi@eYvUzo6@5KU3D)LqD#5Q$ZVN=9dIRY_p<%S{ zg665n7}09mcGYUzo;-Dx@+sdWH0YcZkJ#Dyy|ip&?jtFNu8e!c*hIv5L6L)Wgl`={ z*bdO;j>V`yyf2l}ofJeutc1sa9#{aA72ABG+jKm8KOp9d&16)vMM+)|Q@ou0Hc6ur zyTG*XJ{@V(d`m9!w#>HN%dC8*k);)4&VfF-BEkuM`8}}bmzE!Qd9vURauZSLKM^!o z!cHyD^At_yuB^g^+3PVHRk1eWa;qRzkYF7w8+!ukQFCh!94VvpmsHs3W4EBmtr>kYPs`v#5+7g7#@S-{Gm zro8tC@`&lkf(Nq5BVhfqa877tiCy4o%LMo$&}ERoCQ)uO>L1Y(oop?yUj6|_{hd58 z1-JO;d->OT1DK~M(m*inhh@Z|8@1j;_DZA{P-lb9@rF2aYX3mwofAX{I$;4kLG0fL z#zVy4Ht5QX>z#&Q-Ujs_b!VG^SWNhNA`xHO<65D~R^kC~#FG_*9(w_q8{r`ye+mvD zF8KcK*xfHijdunkV+aQxD1x5fyI*j1NITC!S>0hH=%=C@UsyK$^m7xtZJ}oK)cytd zn=)R>dVf-_Ey=&)^g>hd2R8BNV&~jf{k#W5p2aa|03!VLy!_$YLpRxgmJs_{ZMG)o zLni8GN4w$FK0mF!7-E;P!Xj7&Z)Z`%QJ`Sw>r$N?!I^%UQ`B{y7-0UHd6Ya`Dg|OJ z8ApmDk4l!D?fO9~ak~j+A3Xo0z$sHyHy)LP{Mx6gEX{D)-6kh&y<}!|VEsRb$*_lT z<4-u7SMeJCi(rF79Cts7O$;aiLKO6Tv_HC#X5G@g{;LOwcnPz-8qVO8KhoNVrkKvO zh5Bp9i#6_q9Fho^xCL@+Hyt=8uF_s?B>$(6D*=bo-G+m5x+>q?~ZR}uKv&eJaeDtoacN# z@B5zjoO|b-d(U}QIQ?srF2`mbn-r)qt#mOFMHny1oR!Ym!t#Mfg;d-HI>>NO)MSid zqz!}jD0a!Z7@iAn56P47bmd(4*{@8Gz+ohDTN9pY`vV%UU6lShIb^t;{DX!Up?|?g z#WicHHR9O`*)O)IMBv*Rr)Nlf?cS+iD2sIpCQR^Os4I;1ntE@;! zZ165RRZxy~VvT%@bJSPq+1NY#>inGscBPN-(#$&!Qbkm&RCm)cbR|5mD#*F^D8?{D zwbiuq7-Dkan(3RWVY*$KQm!${F=B5R+zlH126wu}UL-C}VOINL8i-tZg}Q&fu|C~D z=C~hYve;zQ_k%Wf&yS3PH;ulM)RntJOCro3F&;GG7S#C#cA|Z&-&Ym;kJU_J)6F^o zdx1s&b+c~qiU(h#4Cu2_f7fA8E}VOS!Jwqgmfo5CWz3uFR*>2NZ`;@3PoPTRPtpYuzPSp&3Sln`j z;5fA_uj}2XL@<~I2@EC=?qp^Kve{^WEA4Dm`sUAx2zOrvvGJ1=mMQ2*AiJ|9jtvsC z9e%zV--{yZ1mkHWfiLhxV1U|7F5ptzG0Z*7=pe?o^!sHA5&_mUuh=T2qhTcKiPC=0 z6PY+oCwGmIoUTJ1)&|#tqDz?{G0(_dRS(R^T^N7L*MJV}e0pi%Ii<=2)TeK%`*%Y# z174I`*gx3X{IES;pSqnskL|T>_?*pZM^?eTe{8n$I1k-CR%Ur!lLFmMF_%F@iQd5U z*{b_rWAmh*U6aY`P`V;F!_I!&OESW*+bYJJR`9DN&os6*XlEuUz#rlL4$(pGuiCGK zSQw6a>7V?8ZgV~1WY+vw;;QTq!#b@yZ2gE2vy7L66F;Cg)^W#G89SWEZuVF1d~jTC zV;ya~UBAo!xRI&j{@C}&70s3!I~@IX80RmteD%Bzbc-n=dL5_NQDhAg^HhtDNnWR7 zJ@s4^CewL%me)AgKXP-iA=sBW(X_M$fsv6qLYljVC56L%8EM(e=WGkIvK4tR>(wMk z*|<(C7A)$gMU05uEZ4yC(5au2z2UM`6jfUnld2l%65RPwWgeFhO8KZG&~zR*i)nd~ zWur+~NMeR$yo4SNT4HOWm7ij3pzEa^a=#o;!;M-o(@+o4} z+oC6Fi7gCXcSpkd*;91?HIj#^lo%|Rh4AQzZgzsPcc+=D^Z3}6Chi6%(0=BP0xey|sFeC_#1#>iU$90i-IiftGWBYy8JYzhA+lbxqaewU#t!`JqRn)IaXYGY}zO-FY zMRBH>v7U1=SBD@edg3lNsXy}Se^=W1yUa804eaE!8|UWevs zPYI7WCtCi^Nao=_6P(+_wBk#&hJR~N%_>nf-u_hi@{{RAZO^jtI!C=l3w^y!i}9A2 ze+rhnJtZ756O}K#B04NtT_pNEj+2UtcR#c(twhkIp@=Z7Zff<=duMB<*)(=xl9)<(5s?w+K zu+tBfaTVK%vN_vfu+2>^p3L9lESt!M-VM5$f9tJmDP-!MdxH)33Ve9!wF3^zhn{dy z!5FRUd>4&4Bfdi|ti|HM_uahZ-TLh1fSz$PrbZ9*5yiEC#2Bm8CPx&A^T{M`@jzwV~*1 zvUOaW8b0;JBa88ozisk4Oku}Xc$uMOAZ5D4EhVn>f8NzrA48{iuw4R_8p8XL0qY6h3>%@~Acxy)yo#cz|hAFW?L z?sUSrqOhz6Bhs}=LuorFpe;Bw6-qZbmue@q6=c;_o+}jWvHc^q$P0s5Sz5tJ|LDGY zmYS#emS#gtk)oTx?%k-1T0ZxqE^7GHL^Vb&weke245;t~3h+ZuUj&mXN8e?B)+~mw3V3~|yx)T#Z@tE;7E!%Y> zgu3o};zmG3cIPr&E>;_}&}?9(Tqly%NcAvQ=&hCYBw9y+Wq?gMmUR5}?7%&rN!XdV zXOcMHF1U-c8)#hUzcVDqp4>m{OLMN5;}u*08kd6;sm_E}z^n3_E8;`nfmA2aW@*t^;@gXTK zp&6}2iu*7=t~U5&JnPc9DgSk%TuXb>PEElNe`oZaEtL;VwDPilGk{PTllxreh&#`X zU1Q48L}(!cZkdJ;VrFI176;UnY($63*HO43~k18R-E`DH(v_s;6% z{-=C*=3$!u8THCu%w+{3UV)EK(6y8-VR3-EL4=?;Kb&7My|79q)!oR5*aIfNfunxq zHIoB`&iboU8QmM+HCoR%A01|k6jkIAVCK#jh^r9anK)^Ib@Km79z!;&RiG{&mg`g2IK{;qLMyTd}u zycNoNG*UQvKS?-ltsIH}#Ubkz@5u7Ul|}62{4-L@*}zn-mh8$nwYZlv~=ibe1*$pVxLg;1^3U%m_>XyqvFJzT)PH^t%p(*eMfC zq5$_xLIlOCj7wp}gymNSk0Em`BG*{RoGh@?0#arV?1dBX0bz$Zf?}2Ki&zrE@Faxb|Cdp!rR=llpFZR0r#Ql9XYgGkqod%!?w-D+4LWWpNu=sSep7Tpc8hNq^BunbH$ zYBA%(!cl;Mh$0dJ6xfgdCZN|2AuDcx6zl8l-xSB9^pQ_ajmW~mb9CesBLRb+;EWeW z4_-zFM8r(6!znQ!-Nb_VDFcSmGE+n98ES*yyrHPy@#a7z$R$YNXYfNBO3hGDTg%i; z5~Y1q0-iz`j_y!I8qD?I=yd-dh58T=<{H5ZAJ6XJA^eB6cFcIPpw=5pT(@7rSD_Y5cW9^VGJG#l^P>sN;pBx5if?)wnzhncO z9IAUzN!LnGXaHn2dngIa(HnqxmY<7TNblS4Toqpe_gQj)aiLB?IGm`T90tI%6%H}t z=1Vqk!K?$QwX*=?^xS{+PA~06ZTzF`D<~M+JHpoBT3C+IXy{6r&;pY4KiAESg!rR> zE{BZcj=*-i7$Fv4_v`kgI|PC`Pe&lGg9Xy4#~pajW;p^Iz3jk32jp(_KQU)^39RJ+ zpAJe8L82}oUY$_sk^t>z9q^rk0jOCTf}L{%_^xmP;;yWJcubg7mxdiAIfEqpgYGc- zdmNA?dLUzsKd{Rt5e|c;(jM)$QBPo_3khl2u}*x;%5Q*z1OQYg4WYH#&nUK4z|QQZ zJle7}-vfMiKg1JubgF}Scq7S=-mNDC5AY_vtc3D423QuCLHWU;=adgy1?B`p4)D}f zoPT&j#?A7XKB$BgY@s%UQIH9N=GF;{q_q}R(iw1CO$2pifR2McOV8c^ zt&1z4=J?TvFwl1}Mx@eyqs}?A9JL6^>=I56N`C>4CK-rDoS6qa*M1g47cbZk3(tah z53p@tqi2Xag`8A6ooFIXJLj*~>4H&TFU@({YR8+3bBRpzni0bp=+rB z>N)$$ka&a}YQ*?H4G;?;fGIRO&(& z=YTAP=#NerKE8NVX;_=OwdSpQ66LUHhz%VZ3C$!|B_}IjX9Q|d=V9uQ_*nlOZO8fm z`Cc5;ESO3NjB+gYK%D}+c14KTboxYzJmRH=U^Z5MJn8L$XX?(yBD%r=P zBGXv}iNdpML^&g6%7`#jXB(lBhp%u7LTyEb&a7F2?PAJA+m?En!u@CBj+h9Jw?Q#T z#^WBc6t2w)+QG zN8XQCOp3u$Eea5hnI|XpC1LH(EKaPdY2%`mnv@(7qQYCn^t-%;v+CkXKhsIJX3@Z0 z2;emGT)RY~U6d=6rjLr=HjnrzD-Wxsog7R!Zl+yp1Y)a8k}U}Tfz&Cj6noN7^s^_Q zqhm5Czct3CY~XkSds-gpY+R%3uNgN0YacVkM}dQ5WwhM-I}DnHZcAry7TC@$0q{#> za_e`g(g<2chdlb`3d4WH_3T>HrRpC{xBo5TfA~UA9+*H#HlwRU{a*}%ReJC0{==XW zSh9c?Rx;cKcJn@gA;^EA6!%DPdlVc9=+D0-mj9_zGfoIdRhMx@F~j|9mql*XWk)1P zq-YBi+M*aliM||^wqb0kT>w`Kj@CZOuGh62n=L2fN63Hq>2`mfTg*&CrwKWRB_S~$ z%zYgAFf@wAkcY{DKeFGRoz{m3|AGJa?C$R$c7dPIRX8Ao<7C3N!e$Vpl98no2@gbl z+_z&griBKDkyF<2Ktu|KAN2J%`-90m8h8>!08nYV(QE9oa$i1Jw~ z6ImIJIQ^Q9PFA8#qGBpzY)~zxdwvmy8Z=rPdsP-dth<^}NLspLF1ss_)piwI#Z~CJ z)jG_aAWacpjvVI?sV9ngS`-`AtYUX`ad1_tI)t0rI}1zHUb$vgM|y<5k7jYI=2VMw zV@|258ymYl)klx@=oW+Nv#}743JY>OZWb1bGu>^i zrHwa$)&x7V$gDC9PlmFKp0|y4Ci>6&fft*}az;Lpj(hejW;{}|y}3B)N@o%ToJAPg zu;NS5aiCF5gly&0Ars3lqlkqRklB^L2!znUhx2SrW6Ci#T$d16N$m5RH(Dbo12Pk* zJG4UCjtnWadKrHszii>~b@7aBxObg1{s^rBL}s_KaYFnSt50A@>9tqxtmVej&0p^Q zR!7~I2GoYOl+273<<8B8__S73b@B<{eb#WpbY$AH<2hvmjfZ)mTqLb(iCJhEjCPsD zF*WP8T9`|j*XnoNd_tRIC?A>ehvc!k8&raL1*EYU29g?_9!&A5ti9D+O;HV}DUD+Q zH;o$eF%y^=A(ZqJ83WP&J*3BGJ;X-K(qiccjbmoIBh~)8Ne|fi>4^g>{yjv;aN8nU}?|6MXLcdk51<>aLVt)nZjarrNfPB+_fmwowdBWIS%}q}7@r z(4U#03U3OSHtwk~2DxBL`Sh}@ESi~e$_Yl~W|BTT_9V41->WK+nP@w?lAJTZO(0rr zDt?ET;PUV_(rHysK{fT&RV+SA;;LA3wOLiz!8XLNGX0iSlqkL#EIs;lzvc=JZ=CaZ zg!I0S6qow9)6`+ZfwZb>=|J%{`bLPbjuXE;5xe_cc@fz z(~k71^!?#hXZfk{p&k)i96-#X&vDtO|cu1~UXA9g5zzACs^Fk-7Y+*vZ$ctv14cm5hT=3kGkI;;Y zb}lhV$;ZhLcU=(c-ih&b^~pV1^tluo9?4lgxXPTOGrL0fbNvYXhw#pR+MCn4GW#RE z>$)@EC|x!NWI2?Zpdm8=55c^p?;N!RpC1mFNU(|ALE{M$Ec+wD9UyZYQhv;7Ilb^vo0+XN7Jv_g^Me-_~5kOjegY#aSgCLni4C0f< zr03N0%0ZuLxysF_JR{!O@hNI!nEQ$1(8qcZ`jMB3QjQr@e{+54Q&9dTrP5cvj8uQ# zMQWq#hbl$qo8CQcIrpfr?ummW)eYlt3pHf`udX<4v!;s$rI5NI>y6K0-EQ57E=glv z-Py*f*e;R4qGlqz=-_=N`0viq%%-&j@*l*dSxt2f>_6ie$;kiOr;;Ov{Ewc&x!1Of zg8~F}O$7u*_&+_va1suXtM$tl^`upRqI+|bc9;fnXv#*E*ejd^8xc+_VFNMYo{{j< z)FUb8n&fsaNwiiwT6(olQD;%TCf=A%O-X8ja>LrM?X|GAwRKh9#^LIwxA*OJZ~K$_ z4Pfrhk!^~2#L)k3e(IBR_BZFw*FgXKb6FzNk_doUz(1EhMiC1jjy1>%0$~NV8k;P~ zE?~y5zXwBj$estM96&L%O=3+3)tyi&$;3V&&OCnu&fPn;MO|_W#%7mGJe7Xjj zHEo52e3Et|Uw~Sjx`zsZ?9SW;!oO|b zJ4Jrq&>qmUi&am5_o(C{A(2-((hA}=kY>Ge-k#EwNKxj%F38)bj3q@|cWNKnWCX#*+FY`8ICQlXR=O>Zm91uTu+=(rx{BxURX9 zKRb?8Tu7bo?ur+cZQ_qe1333kqDNjBmu=f4<=`%y4wq_m^xP&(knG~2PCD&>vHzYM zELx7)QzT7g^}w>3iBQ6T!J7Qd%~!VFwA!I$$$JO@NqDMdH7RS2x=31zU%WbIw^E^l-bKI{4>8Kf zTR(dhM+hQ{fmt!4XkmrR7Hl=yvUH!|l!4pE*lVS!zO&pTLx@yD)#Q@=-B~(Ro!SYS zTsC`VZj3ZQ!QD1Wo{uILHs@MS7N<;QtnCA2xdo6rZW_8{OUbCaLqS9}@n#wCQvGs; zU-r65NdZV17UO{HO%6du3CMiUdY(A(sXOQM<+3Ie?Hl= zHsOVrq{A%Sw|o&Ns^nZ>g%f8^VeH03@E$e?xs-KQH{?}bw%ziU$H52o+s&k05T60) zapi1NYjsa2^5Mn2=!sieDEl_IxVE%VtU@?diQ+K~gn3U$Um$HSgHL)=BQe{0#+Moc_rsyQ+9t}nz9N69)Qi)PDxC&ZYgj+T1BPdF{ zP1n$SP|DcnuI(gzXP9mx#PpNyZc{OwDGh~-DT^qkBbZ@NFPjHCiQs{~MN|-Jk*XXq z`8;F?q(Q9@l;<%X{Fldz75E}4m6}KjHPha!vi58y8)XHpu4u?8wKfL=;7Hy=hudm>!To@uM~x5p)VBw{3Hn>J;31FdFSehqskeLo)VmW0NtgVow`gR9 ziZ8-%Se(Iyqu9y}Gx1p4A@iJjvf#i_w1EOXYMkb63^knM@-9zt59%^$$R{uORGe!qooJw=9o5 zrD&E1GVPJ}bFx&yMc>mIUzveM8Xj5wuy$0#k5?HZm+O&a-nco=x|xan5>a~ zV8u;d^=`TASubqO9+PQysd%@^!iKMGRZS1MS>{<(wYkgnS8U;|2i?G#&2A(oy0#xS z?Jh+RZi8CspgJHIKYS}|r8X-w#0j~G1Q#WZEGsX-@*)HxX5)Hkx;0Lex9TD*Rg!E} zUmi}4F3PHNv@EQtN}Wb3ZG<^fDLG0pEa$dnROI5ZZp|Ha!qUw>mfc$LL;^fEzS1{> zK;s=cH6L}H;MD(mO(e6KK5^lb)US$HP(bAaN}%*{`4PYlmA{xB^jokSO9rxV;0()l zfuhPOY>-~X|17+#$Z3Tr??fiO>WlUciCRL9e{7!WOE0yb!jKjp&&DcByV?lYDAQT~ z3cu>CCC;-*J^9>6{}4mvbKhXfWQa|l9)d+nG-J809%12Qp zLVz?)e;Oc*qu)^Z1)9nJd2GX8_V~w>8o5n`&kGs6QO6+y(_7iGY_e0+7+GFoBomJv z!sj`IY%ya9chG>_n4NHr-!4tp%jE6;n+vL09kDa%@^c)_tKo5<* zmqMw)q6Exe^^^UF7wZ0b590PbPaVOJ?2E(%iP?6`Ysixr3%j?Ici5Arl*&>$xyKwp zlm-|juG18*JV4oMbAl)6f`t48x4As63%{l{*=o%7Li1LXe=%105UTNJSVX&fI;04LC1Ad~BElKDV6=`qcM1b;;X9)T zF*l>Qzs7(b^z%z^?$nH;6E^cGsV^b!9_kl)dp*5Pka*>7gT2&8Fg#>gpQARIgH@(( zk}Q5+=C#kTle+KCf}fO1T0Swy8e)Kk zjCj43&&C61-}QzU!?Mm)6C(C96)dpb@ei+L<=SM1rrfiV>i#IL42o;7? zN|ySiGqmBEOaZ@<4)c0~hzCKkgxl0uNj7?${->#n^!?;cBbb7xb1I34uAy1Du{SvpX%ZS% z4i_+Kr4D^1d%OAHvqYALp*i5$2Yga_RBRDm=d+GSMMWXZ-YXt?M0vT_7tJN7{wq4A z2G(`3VF$A)T}VV_J#S|{UL#iV7)oXqAQpP_XYGsmL>zN=bF_@b&WlGe4{ktv;~)`7 zTvtuyWb0rEFE;113Od5h1z8y=mx)aD09xfu^!xd;>xoNJ!>vF@8^nPK3kgU%CYDB%vSSie6rpMai%6gU@vR{M8bh8 zFCaYV7VN66GYT|o`9S+5pC>y1Zu1n~p$Yr0^zB1G=Cgl74<;6W#5i{dUgINk6^AG0!mzM%9Ot_u+VRph!>!?Ezqh)fJo zjb8vsG%C6!wqF9uXhTGHK~!@eBp%WyhA>=HJ@B&a`E=MB1;6BRP^JqiARJ!?`~)iw zW=(g}VB;^ds^UsM%&`n<<*#E@`KCo}^Q78_PgKx-gegvwDE(R zuN0_VZf*#0w5#z>yqu#u5^#dwaQ zZvBW~Mjl*NzC+SxM{RboE7ye!TVLShG^QqIiqPc!RRqWn$Fv1{bZ9df2^3_O|(H$%NlZ zrzVl^#W(#JjR^OasIHdMU$KVq{IVS7SE3H#r?5E1yVb=*AnD)kJi*ay7t}6PyM36= zQ<2ga)ByOQ2I~u+3)Rd7VgTQ|YY%p%RvYM&X!PfH^q&#mg?)eK>N$ya)B?X+@_!D_ z@?>DR;wwLsdiGsszj?d&$yx2Z0-8Ejs2UW2kV^Kf4BY(EF7Lp+!#ItpxJ_jM$JBbnA2ue?=SAWbF{NYcOhG(NMIFPt; zpb-zCp8aDP-)%U@S3>N51%{!^b)!$ONPUQLKGtY`VASt}v;vI_HqXv9_a%h$@cSmy z)b$IAa~|9N?~Sn6aIJX&R7KQT`2x9ex8vxsp;;jjmia^Gjcg%QU)ls&$9V4f)pqD2nUS~S=SK9toVm3%?RUGroz)GKQ~ zI6=9gvu7wS+?qGWEl;hPx)C}@-+s8-d5!qMCZMM&&`{?QcjqQib8sb8M40p8FLAQ4 zI0^u11+_3OKo8oySFS%~0|gO3X@O7Eh5Q=^9x*Z9VzxEM-!7X*!Txi(dr$0uRH(rt zf!nnI$~9q?>|!(J+4ktfIgH4i+cEyS*m$u-nZIbEG~Zb80w)+1a-@4ZEEaA74Kzg% z81Y$JgZUhXQ05?yTksg~pgd@*5p>)EqYThpvh2_g{yh#aRE+1!WhnHn^~w^U>xq)b zF(}OuyFt7^biU0B?G0J@!F#R=O*dcomcXd>1IVIv?#*(fQ)QoY2zEmIvYQ{&F<90qbO_PMu$basA2u8IO&7JHWj7 zV)!=Ln!z!|lVbDFz%mTN zH`ndF16{-Dl9$c2k^2fABjiQP`?L|wE%<1UzdI;a@yoHM>1^>Y=zptny92V3Bmca@ zROtWlYVJp|0kP^@I@{`qd_zs(RmcOjOkj>6sM(|PD$+Owtk9tim`R3d+$GTs4C10` z6|^YlY4lc~IDfX%``8)6>V4(*KN5QbsNH)l8 zX10bZLy#|$jvVpt4Wr@XFYk(D67QNr6fcS&&N|{4Nyy3|zA9OTo68`)h4*1VPGho6 zz_CoThBTcs?9FQ{cDbZK8JVgtaH~u2eT1ktdUP~|xGc4D+o=+J205PKvzTwBoHz_vcv?ZJjk>1tj1mEsJ3IQ^_ECj~mVn_OJ`*zyWnBne zZ?%g%`UP%qL<2s5&-UOv9FIO6FCK=E;w3Z00n<0?p?duURLwQK#(Z642x4wAlamL7 zU52+(dCmT7tDE**84BGG0^_a*f~}YmAa9joXU8+n2L=h*6pREu|G*di8XPeA_oL-J zHV2eO=y&VviyF173Z<_1E(ZBDO{-!D^GVG$B0sQRfd$fx9AZpKm<4OKEL;$O+q(1>32BFkj=73Z zlO&!EDo?EL!WVS?{O=mV&y(N*fG&3IswH}fcHtV2JM2CP-R-=1@eGP*L815v+YqRJ zSvDSpsOc#DFF8-->1<)5$x3a`P%2 z5Fr5Sg`e@lkOn3<2xa;$xKH|t6m&f-60;Qbi7OJ)5zYE`2;rCNIjMnSeG0$wtiN0KivxAj<#o5bUSX0I3>YhPY~2f90Ac?b(+@?33E4sA$RTmS)AKchg9uRIn#jZI`l& z)+TRRwKlFpHaGF1U??f6i*SiiMa62{g)Sf>0*cT_aqd3(ABI33?%!r**_*fR-~iXz zZ@q85ckh1VKA*o`5CmWhdyyZH>HK$)26Tcc2Xp;*&_uD|0T6`;_FA3e@$KM_^#l$G zM|hqVh-e)Q5z@HN$9h7l$A;is`*g!Trkte1J}1wgrk?!`zJvh?Q*RVfRKCK#N1EQS1kd4jFC-F%z@;`Z(kq-sDo%=U#b8G$oo{FKI&_cY0mHiCWVB8+`Bvi)C2pYMSgufv4?Aq0>QC||4r`BWAAOE`E~ zw>Q{$7kIcEeB3+jK9-)26&9YRvO*Pi%y#u_i7Uz|06e8>*%ESgD$OOklBKk?CU?up zm^wqVynwnn%XkUlpHs!N3HJHZsGiyLwz*xLIbItN*A|1pN4;K=?qZVQVZKmgJ|6I+ zpye{A+H7@U1scuMjJ!tV$+*HD?%8_ngRLydr61~W79&?EI{4e=8B{;K8O>!Z8j30L zLKkmsfWm02Q+6Y-dC4m&Icm)n%S>b(v`RF^OPpVsIC-;4`O{6C7jv08Sqv(|>NS%r zwreJSa~r8_T$q>O;OOj!I;w^jFCX9Mi)PqR#n8Il$c3hx0dXmUY1x>Yi)fq-Z)`@| zPGKf=;jUQVY-<=%p?2Zb{9l`r@i0IjtZ@xsKjK_pPv$Sv~$tGclCC9J$wzny^6 zEtAc_*F}b!yh1}qoJrfYZib0|vt0Jc_8`duPUf^wo{1t_QWgP^o#-e^ZONG@4BmPy z_M4zsJUVMA#&M$!OXayU>Ao}3uxFheKw!7iW&B!YpU=fu5Siiw?E<3UBaeHBq-f`wJKnlD*C*?wTlXuTez^0yWIWu5*Jt>))% zsx(FqRb4@6z&_EoZj)c3NOi^tLuHqy+{9kJsbs}FoBuGko}(vcauc$OcU=P-prwmF z6eA@3Z6U*PIm=ar(>_5KOI>q+e#y#WmUaRgH~sc}+(C^uc0Y1xzu6i?i;vp<*o=Ct zL1whnvoR|Dpp+W^KpKq-llmt>Kv`=?rCv{4TjPO(xA@4dLuxc%Ob>rN!CbEDJ=*b0 zjs2=8dr>Mj-IA51^vEGDCR>dcKx2EE8hJrkT*!m{L*M;(V%rhyuL}DQ84jD6H*4ZG zJM&~mY}#|veIM~a)>sOhZTG;716tbq9|EK=1K#o@uQ}8K!}h4N*4q-yuRkBYPC6}7 zF%9$#GiPsesC(!R-X5UW#0j2D`H4|g|90=6e9ItE5U<&VKLhk^@+qV)UxmyU_=bAk4YmXJ*=o2xO zEn1UKy=$xNom7oScp9#p>0ZzImpx_qc*?!LtEgQ}RfAmmo{DsKz?pztNOjo(clwc; zh%J3p6}etar(#IT$70XiWfaJsF3+L*p9~$Lysgv>_Z9GE{h>{#kZvA$B(5Jec4jN= zPiKWOn5f7xa<|H3GG~IP#q_3}Y0|ef9nZn_lZ|5ezERHrBid%zqp1$-*JxFt?IL@Z z_Qi>BE3Bu^#t-mPz=)E=(3bJM33$0zsk?%;c?w2bUetw``N{V$E$xKIR~cz;7LhgG z=UmG(wL~}&R2gjKw$yQdBc>Q8W}VmK?Yfvze$sdtl}4GCjp!KnQaYZ1Sh4+l@Y`e5 zpU+w_L{YvrlMK}qRp_;3{D%b^$$0N`h$SB0=gATe?{gI?K>vhDy_lrE`<#e#=eEJ# z-D~x-TEfKPVFWO9tw!OR%?QycmADyO|b5YC2aZP>GhJwq6g2%?l*j*aEI(Jkh zcT_yvDYm(7P0OZfJqw}GsCYh%cRR$Vc?QymCc|YP5P!AG ziPy>*tR#R!aY$R26AU#+){4}-A>e5N8!QK}o@<3!YS-UiGYys#5}(gB;U zf-fYDtiqns%w7@2mkdkYXaV9tb>@rZoKi97CI5;It!YD`Wa|U+;(p2-kVU)Ixiknn zb<~mxNDDO#v$fNy{3fnwab=@_0Bc!nEsFWzi>0v)m6{rN$of>5e{=VNL);K4e9^My z3@UZu%+>1lN4JCSQJCr{jM#fGn0QssXEVKXyMNio0nH^ zt<|#igThEPJR?$l-M+QmrpjxLP-&?TNi%n*YD^1-K=+3RT^&YzY3?|tbx1Y|JLyf= z*OhY^-G}778AWWWjyr%JqJs{zuT(pW z^-j$RT#&VTa@95IdCYWW3H06U{4@m`K${Iz*8U91r#^)69CTGJWZLXJ;oW{Pa~XKP zQ_mkZ?Ht-T-iOZxzw{mYmvj5ovXkTW&2ESpL?z4?NYNy@1b%LZgXE1al>We+2 z`MC3uC>zh~2d_WcCYbL_D*AE(k^X#f9C0^n(v1q1h#B2+mM(-}@sXiVSiv5^xz~s- z$<>wArl?*@TGNqVh$|GtrI9vsII9~^_iUzm{iJb_&;upHhEs{?<+UBUP|XNd4l7=Ll5Y`7;jhg#o1T7*AwWY zi0rRFf_yL3^)ERZe~*mHKeB-FuPZ|6N37WLDroJkK6V5+j0XaSyS=-3;NPyVuC6y} z5YM^G@)w4g`1p};Tag#vC(r|v*je&go;%nI#+AbaDdT&3i|bpPtBd)D%ZJ1^_xCp! z(*xu`DNC^wjYIr1cyILz z=CNbR!Pnd~BNGAllEMUWScl2be!e@BAs$=XLKf?_6347l9AgH7WNzV)a&4tokw}l# z_nhd8dUM?`A%c~`NNmGAMNGlvrN_|8;p!`r(h&hkjB?d{(mO*=e2J{@jodo(lC;?N zEaPL(?+vW(`LQD6Vn{6hK{2F*W}RTY<;iJGZ44yT(L#W2RxB^d(+)JVFJ93t=dkAU z2>rYnBN+^?*U}nGT3*m}ckZ4)mDltxG4AMNGl@u**JAog=S>Jw8mGeC@>q!}X2|_x zzW|QxX|6uwl@UyK@}c~^Iai>8scy~1OgPDC9dDQu6dk+p1I8uQ5sX1hLr%ARx6~0+Y zF5dmq5!QcrhyCx2yS3yIJY4yMEgbr->OBM8-!TAKns-ON%G!x$4947X!!9pYeC8iU zn*bMpv-0qhQ}*)_OY<(fT%$s}xK6T^Nemhr(ZkPlD7|1UcCOvSwln^MTOrg)uE2MQa==q9N!+GvuzNoR&a ztcGYLxwKd&@f2I5Bp9kvVWf1UCXx)R5?K}CqJ`_0=9@2>0aDqChTGf}z7$(XjCOTI zOxa*xDXTKl%(!!)jhzplqjsS|$RmacNjNbhPd0A3xv^4Uy)uHZ*7QZ$fy}9LE77-5F@1hVu zSv8oNq+3zsx>ACjCQAANyI4*7+c7%#Vb7?jvO~fR z5ju;)>$pS26ZW$#M{HKtpAXhO;pJ7poAdmGAv`+YvYTsM)5`HM=8GrLwH5XDs{Df0X;_gSY6*erI48y2BZs5w@R(Mk33@AMePV69%0&R zxjXwrfwuW(_QLz4@g83c;{={6M2~~Qq+XqA7oJzaLd{<%z<5J_fhfGEX-p+#IhJ?6 zrz@21?C7bRXBr$1pVp=Oj-Fgm7G4Z(X6Bbd*oT*yMN8g+ohx%8Wpg^+O2g}=v*`-* zn5S%du{7~y@T}VtOz}FS29E$hIm>_@)GqmEq%m<#%NDWb*G<_|mKL8MWO9riv2`x| z*^%OPR3{Uzz(jjGOVYz;+PK?k%2(CA#~6%+yk2G{2MY%eUAxWnbIHN2Rt0TxEhmDC z{KV?!+$D}&21Tw9Cu6o$IZE5!M1@hmWXv%YpE!VSj@$$LD(z3Os38#ma~W%#hBwG* zB6y4@A)3$fhR2j5f$cKnN^q}2|4z&!?_u{W#(C8(?@U?yK~{)=HvIm>YhJx?D42i* zDKfLkjCCfrxEVBY`{~h|CwMrIWA`ub?pTKHi|V&<4-202%@^YbVe#?VCcKB#*d0B#COfH zH!gwkcLy9QtE?ceVKMHhwk4>>fp=Y2Fc6-^yG{sHSfrS-Q`k`yw2v?HuP$tg#)j-@ zhdWf5FmlC>qhEiP6d{89f+P+Iv@t0!@gBif_E@8q7t9C9kaej6gTX44BxYVRLJfjT z^e}(0m!Miu<%^2Mps7R9ZxTj(`eBcruf3bq(S z%|r%^sA$iyHJKt)QK00ERuvZn0#{KwJYm>=x01)UvZURK2V7xud(+v~mJVMkg+kCu zkkF5EUkkImF577UO!#`6ksu1o8=%{bS?nc#=?B$v2GcxXYTMn#^57HiDe?HmKXP$N z$DCazy&Xf0M6?o&Glg;X`t$YLC&>_T>B?Awz?iiFR?!? zrV+QZtXzS~GZUBFa)IoAomS7mxrX$h-?yjriWJxbKwgpyf~$2EP0%gJh)Pvq zEhWIY&y(=llw@$#I})V_ez?tXN~bWIXzrOgnxiJ`7C$`LDf+paAFDTBe@z^n!bYoO z)K95%#=3pkz_3CNS?MwdzI0x9HE*byZ9Kf(Hg%`hC41l14TQ0>mpNHsr=KG)5? zJ?DI96MkfE3xi9OcCQQ#xs&^|ce}6kCi4(~P`;>(PRVG2)nrRjWk<2gTuA(I%F^o% zSK1lvJXnn07_~}c;ZhbPWgNzpZc+`13{YWPj&gw@?y=mdgIkgw-@Mz?s|~%B6psrGHzZdQP;0 zCX+1?;E1=MIa0oKM(VLfzAF8HEw0TuB+mi}AfOib|9@mjkRAzOSMKrzAl_QHW5`GeoigQkvmGfM_X$ zqg}&U0vGRITes?eE#VIiC@>?4HJxrcB7f25f7@d@%WJ;l`s9C}|Lg0FKOp|)ht=hz zIpQJet1%1a0siYSCMK{7RoAjSy95`i^g_Ehx#pd2f06=fkhih$A?F@-I5EOInc zOc;DCz8~qr431B-EZcHK9UnR9fF-aVMz|kl|AG=ge{e*NkNC5Q=^r$1?5TSca}-IL z7jr~)k%#!uG6NtNZ@zgK$n`+>(R!h?yYNN3i~2r)0-(q`~hidOQ#Q(gG8i`(4CY{GS_XyrWf{EB0u z9PTMT<-BlDi=~m8Rig|H^QYjLF~|-znw)K&wlQNaR<~W;f>zb1sk*U`3DCr-@vSHy zwPWl?t&5Mz{ORt!z|je_j`Acm%wy~w_~AUx>M{xdeycF)7MB-_Mb5lKXFg4_N@fsU z(?2604uV0Sck>Hf{iWgAqo{Mz6-KpbF&e}|LJ*o}quJFd90#c&2VbuQHY}W9>o2{SEcnta0y{S#d)aWha zr(+u6a!}6gABN#(JE)F_)1V|#AEDz|9VfR@bIiU|SB${0sNqM6$6(Svlo}hdsn&Fz zb8+#`rN8*_t7pplr9;A1cDe(h{=yT_;oMVYM5o9H=Z-SO2PW+7>biC9MREjdyA8jA{U&^y{v7uL1^&E^;+(A%>UM0`U*Nz>R&r-v$NNWU6 z!|hn3f#%Rex}0e)w#xK%uHTPmVv=ODMe|y4+?UMiK0~FG~lL`8QX;m?Ih1 zoPA<&Mv0y<^(^H}D+hbj4BZW2Wa}QvqIY_LcOftHaNXKZzJ|r?3Fbw%Nf!XO{ZN)K zGo2Z5+P@mKK%T$%9n!ot+Vz~VPhfw=jSxLmR5ZjPOycv4ELqw)q<6y^ZtK{24XbJE zJEx|->6V^|O`N$#{Po)y+uYvVjz$;V*vrrs08Q=kf}pFs#R^e|wu8{7M#>Z7Ots7v zvblsMCRl6&=b_Z$B8c&YEY$~G>_<2h5j=7p$qCbVJ3Jtjk*(;QA@ZgC!K5>z4u?u|8lOhY-P=@k}_W-Ve?lQow0Vm4CVm<2;Nbuet!-0|hg$nt|tyhUYMc!Rf` zp}F)I&E+S&Yg&_!nBT(5Y?aX;O+ckIHL*YqO9OJhpQ!7$`5dZ{$FU7yUJ_=Gz7G4a ztQ}gbEzI*vziN4dzSjngU&Pg>gJ{exCK1X77&yf`LDUm{JwE5pUAbC6>pAT)MC91t zH7#|s!t8923cA2zPiD+8>~D2EL~{+jpN;{XjQ(0}vKIDeRF@uq(!$)j2H`61sMVBS z$s`e-i6YoemyBM>i5wJw>8#Y_sfhY3Z|&c}+;Rcrrf+w?|C>^=63b3svi}>T?r(iACA7RS6|)^*Z)oE1 zYM|2{Mf{2lf)UBmZ*+LIzSyH}S)g~9L>}za{(9j5)@_OjWd3uMHpxU92MY=aNCp82 zi0Ge+gAe$>RDnK(@$>U34>! z>Z>)Xao-VBPyL=1HT&)jv^Ou>9pq5q39_&HK$oN1pd#Bx7n6gWqym$tdXERbuXYdM z1K-!U2L)G{d@qbzeou@kH{&Ha9!Dk=iq0%EiZ^!~XTpWXdq9b^p}lUe%`xi68a_OK zk38(*amcVIuk22vD|Gt1@*7X(^XP%3*h5}nhfXL;N|VnzGp;)OHYRTt2aZ@8x>~$! zeC$;YFLE6Irr1)aImB>Hx*Se>lhYosc@fxBTi!G_P*i(%?qs;5gPXK4;-$_xqj?(A zXDA63Pp}$)0jjkti!h?cV^Y>hr`u{b)_~{k>SQxE)8RuJBU*oatnIQc-DOVtE>VlR z%MoiKYeL-5XtM$Nyjg>hkh;>$(v^$!l(cX+XOS^3_kw%ZiauLYT8{Y!Cp8VonJ#&1 zYh)hWgT^izYEGi2lH5S1gRsE99e7r)LA4&k#+){VW02KSD776fyc^r96(us`v>&70 zw69rBEx6^$V|6xOOng9ro}IQgDYMxq%QNHk;^`i`=VZfqiZenek3~M8`Lgx5mk+q& z;T=kt`5HICVO$Ddt`cx7!7=C4Oq%h?Dlj%4Y-6UkGc#f8woYhr@>#Xg+kMF38hmFb)}D` zCPD{uv%1dAK6B6=!xq>E1%Fn3qs}B@1DR^#wBi+-9=FN}1?qwKWVcml-01q`oPICg z_mrUL*4}vMmp%Oa&beV~2kHKOdn!j96o-4eWGCHOEdM5I`MA$)xhJvT# zPZ{}NT7Fl4(0^o#*mdbb;IX_`jKq|s7o}x=QNnrbIg4v?(f*|s_C!ZN7t5K!{nCj~ zik;GF42!R|ZB|#Ei2Fr16$b6GV+>9fmt<&dwrl=&4F7S}hG&y6_AW|4Y2|TnFynul zuWj$VX`oM}4FAk^jgYZWYG{+6YKVJXRr%J7l^E`hPlFcD=X&QSlf?>Lx+W*-IXzGK zb1keEw`k=$>YJ`|Ull9$UAMyC`gj$_SG`T~fvWD0F%+A) zN_E;_-}YV_Bpl!OJg?%G|54`7iD^6E_a{W^Sk{=KNQM}prmybLUIsz!%BLAx_GiaR zdEu;RemsBYB&lLn$>Lm$Nq0&PK9RWmOc@EfX&B~z`}u^3o4!RtDM| zqr*MKsh&#IG_eosENZH?TYH47gQU}*H^z<7Qh1L21&Yn4VR6-S@=xdZ?7paakav0O znFQz=>EtK_8n#S5uj0MblXnJGfB)l7C4W3XGD|IBNqPsJnNL33J=>dVrSaiLjuB79 z}|>rTbCx=fzP7w7h= zo71k83|ur{jHtR~U#BwENL3u_pfcp9#16<0Y20&<*by2$ci#Jz7iG7OZGl2IYxbd7 zjJbR^pK0uLoJ<;%KW}rkFYa@x!jYHbtd#NgTOU|5U5shEl_57tZ{)aan1E1qddoYe zg7K;Ar()7^GA|}&>>76Khdmx?qIht>rYGqWZwJOJZ7)iGp}NRju4{bLG-Jd7pIvyt zRSsWEw%SRuNJ?dV05ZkD4jR_?FLI;LExJEiswxwy>mro0u|WpVg;--m&Wx#kNgcRIWGnr!PQ5q9w6 zND-mA+ZzVzi=OlbhKw0sP>)l{1-5a!_(DWqcfFs zgnrgS$ESR;N=~`aG)NJoOE#9UtJxwN$PJ#vAqEUr(+8 zfJgz*Hd&?YU=%;fn)HJ4$yj z9#qU4F3^x94lXqFfvGF`)PHphRlf;EP)^z&SI+)rj$x|K^&I6fR3wF0+ z1lW8Ahg#rH4-BG%ZIxpm5UOGi$}c`X1Yg*q%#QEGx|*gzHGsZAH{M7nyetmE2Xyd) zZcbtx0XTHL^Z8lmg>-!=Q#4V;ufhm1!hVe~$GD=}VAlu55k#@MASXhz9Y!3HL=aZi zoWiL35-8z|au5km4hRYLpisVFUH$67&)4XG9qvbMM3L2m3McACRFoJO8Nmm15ZJ@{ z<6%AgtR96Y7$JCyq6A25Mdcvsz9)*a+6EpFDAFdzuHh%|ccz>R034yUfQ-V=*drQN z)>v@2r6efdj?zJ0fueW|jtFm|8KuKK$#9c}a5B(_-ZvcGz~TP~mVrW5@U(;5s#l&)3}+*uH^q$|Td%rVb? zl~G74fENI^qvRe@5qwFG9H(5)BiN$Aal|3vAVH2%T&B2m-+)GOog;}xX-jVKg3o&J z?5;RR1Z13p+-MO2fORNWMqeGU#-lA$go5|R>tq_(1H6^Wojy&f3U`D1-U z<|qn@)u|-JkDBiF>^_{#E0^#Q1%PH~??U@PPJ!?wcC4F_L2oV;IwIurMwBq~3Syhp zC5f7cd1M|2a+d=jV;35HIKb!MhXqC>iFxljl$cVWtM6Klap?EKlMqq>#byJ?1XR?Q zgk(U@f`rHG33(o;Co09tz)i z2NCj&lHp9CMZ|aEN>I9g2fH diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 10a1961..663e689 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jun 11 12:00:35 CEST 2017 +#Wed Dec 19 18:20:09 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/gradlew b/gradlew index 27309d9..4453cce 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 832fdb6..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,7 +49,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/src/main/java/net/xalcon/energyconverters/common/CreativeTabEnergyConverters.java b/src/main/java/net/xalcon/energyconverters/common/CreativeTabEnergyConverters.java index d9ed2ab..6621f00 100644 --- a/src/main/java/net/xalcon/energyconverters/common/CreativeTabEnergyConverters.java +++ b/src/main/java/net/xalcon/energyconverters/common/CreativeTabEnergyConverters.java @@ -9,13 +9,13 @@ public class CreativeTabEnergyConverters extends CreativeTabs { public final static CreativeTabEnergyConverters Instance = new CreativeTabEnergyConverters(); - public CreativeTabEnergyConverters() + private CreativeTabEnergyConverters() { super("energy_converters"); } @Override - public ItemStack getTabIconItem() + public ItemStack createIcon() { return new ItemStack(Item.getItemFromBlock(ModBlocks.getEnergyBridge())); } diff --git a/src/main/java/net/xalcon/energyconverters/common/blocks/BlockBase.java b/src/main/java/net/xalcon/energyconverters/common/blocks/BlockBase.java index cbf940a..cadcb51 100644 --- a/src/main/java/net/xalcon/energyconverters/common/blocks/BlockBase.java +++ b/src/main/java/net/xalcon/energyconverters/common/blocks/BlockBase.java @@ -16,7 +16,7 @@ public BlockBase(Material material, String name) { super(material); this.internalName = name; - this.setUnlocalizedName(this.internalName); + this.setTranslationKey(this.internalName); this.setRegistryName(this.internalName); this.setHardness(2); this.setResistance(5); diff --git a/src/main/java/net/xalcon/energyconverters/common/blocks/BlockEnergyBridge.java b/src/main/java/net/xalcon/energyconverters/common/blocks/BlockEnergyBridge.java index c35eeac..9cbc222 100644 --- a/src/main/java/net/xalcon/energyconverters/common/blocks/BlockEnergyBridge.java +++ b/src/main/java/net/xalcon/energyconverters/common/blocks/BlockEnergyBridge.java @@ -24,7 +24,8 @@ public BlockEnergyBridge() } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() + { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/net/xalcon/energyconverters/common/blocks/ItemBlockEnumMeta.java b/src/main/java/net/xalcon/energyconverters/common/blocks/ItemBlockEnumMeta.java index f20b353..3f0af91 100644 --- a/src/main/java/net/xalcon/energyconverters/common/blocks/ItemBlockEnumMeta.java +++ b/src/main/java/net/xalcon/energyconverters/common/blocks/ItemBlockEnumMeta.java @@ -23,9 +23,8 @@ public int getMetadata(int meta) } @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + "." + this.values[stack.getMetadata()].getName(); + public String getTranslationKey(ItemStack stack) + { + return super.getTranslationKey(stack) + "." + this.values[stack.getMetadata()].getName(); } - - }