From 5495c480d7b86ef9fcce88affd6a2b2b3df1a997 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:08:01 -0700 Subject: [PATCH] Fix USB map --- Resources/build.py | 2 + payloads/Config/v0.6.7/config.plist | 2 + .../USB-Map.kext/Contents/Info.plist | 174 +++++++++--------- payloads/Kexts/Maps/Zip/USB-Map.zip | Bin 8109 -> 8123 bytes 4 files changed, 91 insertions(+), 87 deletions(-) diff --git a/Resources/build.py b/Resources/build.py index a57e09cff..45b23cec1 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -9,6 +9,7 @@ import subprocess import uuid import zipfile from pathlib import Path +from datetime import date from Resources import Constants, ModelArray, utilities @@ -59,6 +60,7 @@ class BuildOpenCore: self.config = plistlib.load(Path(self.constants.plist_path).open("rb")) # Set revision in config + self.config["#Revision"]["Build-Date"] = f"{date.today()}" self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} {self.constants.opencore_commit}" self.config["#Revision"]["Original-Model"] = self.model self.config["#Revision"]["Patcher-Version"] = self.constants.patcher_version diff --git a/payloads/Config/v0.6.7/config.plist b/payloads/Config/v0.6.7/config.plist index 2e9346941..5e3209596 100644 --- a/payloads/Config/v0.6.7/config.plist +++ b/payloads/Config/v0.6.7/config.plist @@ -4,6 +4,8 @@ #Revision + Build-Date + OpenCore-Version Original-Model diff --git a/payloads/Kexts/Maps/Universal/USB-Map.kext/Contents/Info.plist b/payloads/Kexts/Maps/Universal/USB-Map.kext/Contents/Info.plist index faacecf46..ce794a9e7 100644 --- a/payloads/Kexts/Maps/Universal/USB-Map.kext/Contents/Info.plist +++ b/payloads/Kexts/Maps/Universal/USB-Map.kext/Contents/Info.plist @@ -36,7 +36,7 @@ 1700 model - XacBook3,1 + XacBookNormal3,1 MacBook4,1 @@ -58,7 +58,7 @@ 1700 model - XacBook4,1 + XacBookNormal4,1 MacBook5,1 @@ -80,7 +80,7 @@ 1700 model - XacBook5,1 + XacBookNormal5,1 MacBook5,2 @@ -102,7 +102,7 @@ 1700 model - XacBook5,2 + XacBookNormal5,2 MacBook6,1 @@ -124,7 +124,7 @@ 1700 model - XacBook6,1 + XacBookNormal6,1 MacBook7,1 @@ -146,7 +146,7 @@ 2200 model - XacBook7,1 + XacBookNormal7,1 MacBookAir1,1 @@ -608,7 +608,7 @@ 3700 model - iXacPro5,1 + XacPro5,1 Macmini3,1 @@ -1031,7 +1031,7 @@ model - XacBook5,1 + XacBookNormal5,1 MacBook5,1-EHC2 @@ -1066,7 +1066,7 @@ model - XacBook5,1 + XacBookNormal5,1 MacBook5,2-EHC1 @@ -1115,7 +1115,7 @@ model - XacBook5,2 + XacBookNormal5,2 MacBook5,2-EHC2 @@ -1150,7 +1150,7 @@ model - XacBook5,2 + XacBookNormal5,2 MacBook6,1-EHC1 @@ -1192,7 +1192,7 @@ model - XacBook6,1 + XacBookNormal6,1 MacBook6,1-EHC2 @@ -1227,7 +1227,7 @@ model - XacBook6,1 + XacBookNormal6,1 MacBook7,1-EHC1 @@ -1262,7 +1262,7 @@ model - XacBook7,1 + XacBookNormal7,1 MacBook7,1-EHC2 @@ -1304,7 +1304,7 @@ model - XacBook7,1 + XacBookNormal7,1 MacBookAir2,1-EHC1 @@ -2921,7 +2921,7 @@ model - iXacPro4,1 + XacPro4,1 MacPro4,1-EHC2 @@ -2984,7 +2984,7 @@ model - iXacPro4,1 + XacPro4,1 MacPro5,1-EH01 @@ -3047,7 +3047,7 @@ model - iXacPro5,1 + XacPro5,1 MacPro5,1-EH02 @@ -3110,7 +3110,7 @@ model - iXacPro5,1 + XacPro5,1 Macmini3,1-EHC1 @@ -4274,7 +4274,7 @@ model - XacBook5,1 + XacBookNormal5,1 MacBook5,1-OHC2 @@ -4309,7 +4309,7 @@ model - XacBook5,1 + XacBookNormal5,1 MacBook5,2-OHC1 @@ -4351,7 +4351,7 @@ model - XacBook5,2 + XacBookNormal5,2 MacBook5,2-OHC2 @@ -4386,7 +4386,7 @@ model - XacBook5,2 + XacBookNormal5,2 MacBook6,1-OHC1 @@ -4421,7 +4421,7 @@ model - XacBook6,1 + XacBookNormal6,1 MacBook6,1-OHC2 @@ -4456,7 +4456,7 @@ model - XacBook6,1 + XacBookNormal6,1 MacBook7,1-OHC1 @@ -4491,7 +4491,7 @@ model - XacBook7,1 + XacBookNormal7,1 MacBook7,1-OHC2 @@ -4533,7 +4533,7 @@ model - XacBook7,1 + XacBookNormal7,1 MacBookAir2,1-OHC1 @@ -5773,7 +5773,7 @@ 1700 model - iXacBook5,3 + XacBookNormal5,3 MacBook8,1 @@ -5795,7 +5795,7 @@ 1500 model - iXacBook8,1 + XacBookNormal8,1 MacBook8,1-EHC1 @@ -5813,7 +5813,7 @@ model - iXacBook8,1 + XacBookNormal8,1 MacBookAir5,1 @@ -5835,7 +5835,7 @@ 3200 model - iXacBookAir5,1 + XacBookAir5,1 MacBookAir5,1-EHC1 @@ -5865,7 +5865,7 @@ model - iXacBookAir5,1 + XacBookAir5,1 MacBookAir5,1-EHC2 @@ -5895,7 +5895,7 @@ model - iXacBookAir5,1 + XacBookAir5,1 MacBookAir5,1-XHC1 @@ -5946,7 +5946,7 @@ model - iXacBookAir5,1 + XacBookAir5,1 MacBookAir5,2 @@ -5968,7 +5968,7 @@ 3200 model - iXacBookAir5,2 + XacBookAir5,2 MacBookAir5,2-EHC1 @@ -5998,7 +5998,7 @@ model - iXacBookAir5,2 + XacBookAir5,2 MacBookAir5,2-EHC2 @@ -6028,7 +6028,7 @@ model - iXacBookAir5,2 + XacBookAir5,2 MacBookAir5,2-XHC1 @@ -6079,7 +6079,7 @@ model - iXacBookAir5,2 + XacBookAir5,2 MacBookAir6,1 @@ -6101,7 +6101,7 @@ 3200 model - iXacBookAir6,1 + XacBookAir6,1 MacBookAir6,1-EHC1 @@ -6119,7 +6119,7 @@ model - iXacBookAir6,1 + XacBookAir6,1 MacBookAir6,1-XHC1 @@ -6182,7 +6182,7 @@ model - iXacBookAir6,1 + XacBookAir6,1 MacBookAir6,2 @@ -6204,7 +6204,7 @@ 3200 model - iXacBookAir6,2 + XacBookAir6,2 MacBookAir6,2-EHC1 @@ -6222,7 +6222,7 @@ model - iXacBookAir6,2 + XacBookAir6,2 MacBookAir6,2-XHC1 @@ -6296,7 +6296,7 @@ model - iXacBookAir6,2 + XacBookAir6,2 MacBookAir7,1 @@ -6318,7 +6318,7 @@ 3200 model - iXacBookAir7,1 + XacBookAir7,1 MacBookAir7,2 @@ -6340,7 +6340,7 @@ 3200 model - iXacBookAir7,2 + XacBookAir7,2 MacBookAir7,2-XHC1 @@ -6407,7 +6407,7 @@ model - iXacBookAir7,2 + XacBookAir7,2 MacBookPro10,1 @@ -6429,7 +6429,7 @@ 3200 model - iXacBookPro10,1 + XacBookPro10,1 MacBookPro10,1-EHC1 @@ -6459,7 +6459,7 @@ model - iXacBookPro10,1 + XacBookPro10,1 MacBookPro10,1-EHC2 @@ -6489,7 +6489,7 @@ model - iXacBookPro10,1 + XacBookPro10,1 MacBookPro10,1-XHC1 @@ -6540,7 +6540,7 @@ model - iXacBookPro10,1 + XacBookPro10,1 MacBookPro10,2 @@ -6562,7 +6562,7 @@ 3200 model - iXacBookPro10,2 + XacBookPro10,2 MacBookPro10,2-EHC1 @@ -6592,7 +6592,7 @@ model - iXacBookPro10,2 + XacBookPro10,2 MacBookPro10,2-EHC2 @@ -6622,7 +6622,7 @@ model - iXacBookPro10,2 + XacBookPro10,2 MacBookPro10,2-XHC1 @@ -6673,7 +6673,7 @@ model - iXacBookPro10,2 + XacBookPro10,2 MacBookPro11,1 @@ -6695,7 +6695,7 @@ 3200 model - iXacBookPro11,1 + XacBookPro11,1 MacBookPro11,1-EHC1 @@ -6713,7 +6713,7 @@ model - iXacBookPro11,1 + XacBookPro11,1 MacBookPro11,1-XHC1 @@ -6787,7 +6787,7 @@ model - iXacBookPro11,1 + XacBookPro11,1 MacBookPro11,2 @@ -6809,7 +6809,7 @@ 3200 model - iXacBookPro11,2 + XacBookPro11,2 MacBookPro11,2-EHC1 @@ -6827,7 +6827,7 @@ model - iXacBookPro11,2 + XacBookPro11,2 MacBookPro11,2-EHC2 @@ -6845,7 +6845,7 @@ model - iXacBookPro11,2 + XacBookPro11,2 MacBookPro11,2-XHC1 @@ -6919,7 +6919,7 @@ model - iXacBookPro11,2 + XacBookPro11,2 MacBookPro11,3 @@ -6941,7 +6941,7 @@ 3200 model - iXacBookPro11,3 + XacBookPro11,3 MacBookPro11,3-EHC1 @@ -6959,7 +6959,7 @@ model - iXacBookPro11,3 + XacBookPro11,3 MacBookPro11,3-EHC2 @@ -6977,7 +6977,7 @@ model - iXacBookPro11,3 + XacBookPro11,3 MacBookPro11,3-XHC1 @@ -7051,7 +7051,7 @@ model - iXacBookPro11,3 + XacBookPro11,3 MacBookPro11,4 @@ -7073,7 +7073,7 @@ 3200 model - iXacBookPro11,4 + XacBookPro11,4 MacBookPro11,4-XHC1 @@ -7147,7 +7147,7 @@ model - iXacBookPro11,4 + XacBookPro11,4 MacBookPro11,5 @@ -7169,7 +7169,7 @@ 3200 model - iXacBookPro11,5 + XacBookPro11,5 MacBookPro11,5-XHC1 @@ -7243,7 +7243,7 @@ model - iXacBookPro11,5 + XacBookPro11,5 MacBookPro12,1 @@ -7265,7 +7265,7 @@ 3200 model - iXacBookPro12,1 + XacBookPro12,1 MacBookPro12,1-EHC1 @@ -7283,7 +7283,7 @@ model - iXacBookPro12,1 + XacBookPro12,1 MacBookPro12,1-XHC1 @@ -7350,7 +7350,7 @@ model - iXacBookPro12,1 + XacBookPro12,1 MacBookPro9,1 @@ -7372,7 +7372,7 @@ 3200 model - iXacBookPro9,1 + XacBookPro9,1 MacBookPro9,1-EHC1 @@ -7402,7 +7402,7 @@ model - iXacBookPro9,1 + XacBookPro9,1 MacBookPro9,1-EHC2 @@ -7432,7 +7432,7 @@ model - iXacBookPro9,1 + XacBookPro9,1 MacBookPro9,1-InternalHub-EHC2 @@ -7465,7 +7465,7 @@ locationID 437256192 model - iXacBookPro9,1 + XacBookPro9,1 MacBookPro9,1-XHC1 @@ -7516,7 +7516,7 @@ model - iXacBookPro9,1 + XacBookPro9,1 MacBookPro9,2 @@ -7538,7 +7538,7 @@ 3200 model - iXacBookPro9,2 + XacBookPro9,2 MacBookPro9,2-EHC1 @@ -7568,7 +7568,7 @@ model - iXacBookPro9,2 + XacBookPro9,2 MacBookPro9,2-EHC2 @@ -7598,7 +7598,7 @@ model - iXacBookPro9,2 + XacBookPro9,2 MacBookPro9,2-XHC1 @@ -7649,7 +7649,7 @@ model - iXacBookPro9,2 + XacBookPro9,2 MacPro5,1-EHC1 @@ -7712,7 +7712,7 @@ model - iXacPro5,1 + XacPro5,1 MacPro5,1-EHC2 @@ -7775,7 +7775,7 @@ model - iXacPro5,1 + XacPro5,1 MacPro6,1 @@ -7797,7 +7797,7 @@ 4700 model - iXacPro6,1 + XacPro6,1 MacPro6,1-EHC1 @@ -7825,7 +7825,7 @@ model - iXacPro6,1 + XacPro6,1 MacPro6,1-InternalHub @@ -7930,7 +7930,7 @@ model - iXacPro6,1 + XacPro6,1 Macmini6,1 diff --git a/payloads/Kexts/Maps/Zip/USB-Map.zip b/payloads/Kexts/Maps/Zip/USB-Map.zip index 008febf96d12ba247f8c6c1610eff3f2c431db43..7f2d4657e64d7938397f10ba9515e2ba96ea45d9 100644 GIT binary patch delta 6941 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 Xc7#Iy8T%*rZFCBh7?+3PxBPzqxS8nl delta 6971 zcmZ`;cQjnx*B(Z%QAY1ZFF{5px-m-h7Q`fa?#a^-T#5S*t_S-2+@6@)>LH2ilI2t^_3 zd6A8ANP>GP0}N&Y_$}p*2LBK39;z6F=kM&lbQCsbG;z4Dz8>H|M+7Phlb^u$@IL(R zymcMLq(Z2X2aWtDsC?5WM*e1T)jE;bdN|X1h=yx5C<{%)fwm%g9|FEUpA%Wa)A*w1 zXxOkXGh_@N%QI`(FR$2d`?;?PY#&PN4UT%1CoI#tsK&XV($_GVY&89{ZJ}_oE&i?5oMFet&<} zcQ|$^H?jS5$<9tL__u^lSlJ_HRqf7~sM-oSy5{SXi*Wy$m=E9T5EG{^qF6I zO_Sdt`Nk`RH&cZwy6>oR>ge+{b$4r#xS5+Hf+W7}Am&x@uP~0oON%7ViKL2~VT)yD zB0H-Nw{#^}lI#KSZdgE^vMxx+KH~?i?ZlK>+6R9^`#ZWVH?3C4 zJ9%wfuDtrSEc<-oRKQKJ<=f=d#;=3-da#zdb;Mp!Kk4+raJT)N^F_;`tLye`=qm`0 zG-982OsV)_G1#M?IIBo^i7~>m^9twdRQu(x4J|bz08Czw7R*PfW`yy_Dubwf4FR*1 z5T*FafSurf=A0y8}xIVTf6)h-C}9HE%6- zOwOi-It)(Sgv_eMMl1&W3?aED07{{eTheMOdINVj;}>88uNQo36}w9ZDCC7_32|g* z3)5S}+0uX+>Y*@=b>c~39}HVbDuYa5ZHi2q_{vU({qiWxGW~e^)jC$~Lyf8)0QvDM zpdjpIZ=rGwLG`kq%WW%^9Rr517O5l}qCJtIvB8dCxXdthrZ4iLZ91fW5HLWP@_*Z`}N9e6_Ho&NR~GJw_R z{50j{qs4@Dl0)MRJMV#zk!mVj=p+*c)X+V?RHm(iY_141v2>ZH)oTYc5f1GTJ|-@w zatBwj+u8u`I9aIYq3ng$shz?tsoEroY0;O4TI8JDp>=QVtf}0UYj7A0JCRixg}=%W zKI3h!bn+>kuq@`B?Jl`*T>n&R7-6!+Efr0;`09oJFv;6kdkUd<{r2uaGsn+(NwCM# zZ7G%-^n3G67FGVq_;a@9XlrY&*mdA;*ahefr)3uU+h|Zm;_qR;X_L90?Or>#r5_?6 zKFM`iEnsa1z|#tVwPl7S`4$#>QAUOj5s;%wBmIYUvdeRHUpbGhJ+kKsiD{D=&<_0@ z+Dfk)$CLS8x0S8=Z2Mb)gQ`z9$#nX6`*&40d{SDgkkijc?;S~9wmgzvqk5hLm1nKw z8`;I-&>pvq70q}iSe>{wAoE-=X;t-TjZDXuQ#)LQ(&2beN+gvG!_X)ydwSt9+y4e9LVE7^z)axV;`d=O8(?-N)lsGk)L0u}dWNw~-i@{-l`vpf^IbfL zteykprye_c=IVaK0A2|MA);%_qD}dDT>l4dj zJ>?<`D~w=aFE?g&k~QJR%HzT4=f@p?WZW|ke$5-1$zd4$^qtZ_)Wf>;N_@{)n=~ZO zd|rRde@mnDGnYF|OnoW4K<%43zRbFjFGx9JT$Y(FEIr~6%=K%DUMe9pMDpD2VfL`q zI&fNam9YRbn~0ur&3ms%iQCcits;1R~7LJCsC`scGR1U;G z3Ws$o1B#HUxX+@Tyo__lBME9g>uwvBa zXoS%;C+brrjDuV5f}N~lnf^(PV~s<)B& zVvlqzW{n0F{d&owH;fZ((oSrS!XO5^G1bbe!mTm>H{lzY2!b>X_T&S zt&7=w2*!=fB%KX)kU6NPdu(wr+ArZ$%=GnPm`3jRrU)geCR*mvL&X~eVyKNFdEu?= zmoCZb9C5qX<21}Yonj@zPreyv*Kul(E?%Vsl@R4hJ=vYa>S0zk51iz-(UL7I!e^dD!qKGg}CPq<%C{x&y_0U*NL5rrKf=(YEtH% zeFUt?)n&@LVDpH~Y@&KNwFtI?tVmv-`D|698ZDvj?h^N0={_D@llA*t-A5xj>(;e;ft#~}rZ_s1PLnvs zXE+to`vgJ|ySDqm!=#I-2J973%KLFwVXt#mIrDaLilwdROIQCK?VjJP%QV6Igb=E0 z_Xba|8rTEE@v>v`i4wndUHgL{9u=<#pEJ#)lN5BAeICE|e{oT)yM=zsbUe#=2EA_E zjEHRMBFaUm1Gd=;Z9r7tRxoAE&`+zK4&; zi{8S*N<%ge>d4C{#rYFReW!8{a+M0cnezFyKhjlr?L5oYpWep5#Z^fB&b}aCp+QAe zJmtZt3%IFzlxk~=azQulp73f!JytX6LIO`k#?4I6X=n_L}I#+{H$883?{(< z#lZ0o6E1uk`T-R5J^S+-?c9iv($43e_}mXrh$02rQdM2F=!~==#!I3e86_lUX(CY% zM_zJ%hF$Si5L*L~fL8rDM7?FdRpQbPBsO(lc1iUb!ZtsHG<&-YtxxH!_*q>&5<={&OQJ2=v_`X=-E5ut@G>H;_aFKC7>LStc7?kU z#la7><_aS%6YWFYZhcYN-`uaFmnNdZh%EDn+UaN-aJWU44I)qAipt4M$xJY|Hhzl3 zWTp$K%v6(5<+#R6L+qGTs0k~Q4atd!{TX}v5ab5)p<00ySkKYK5UKV&A}uq9lB>m) zsJu$DjaNyv|B$G^|GlB4vzLsOh#uMDOk{ zl;R!{ftfct@v}B3X`%+<_g1Smd#L11d;G1CeMy?6o?uV#(Ob?V9CFFmG*C7u+h?}k z&rkbjyCse!j{GBq6JrWz$r4PPi@%*l)-w%SAE#leALO8oHa9YR* z035{U{@zgmaj3a4Y3((bGA`6)|8SqC%D zlPRN#FuW)d^yI}uqP`^pPH6JF7&{qZ0LFd1eQs!P>C=5~)|(E-0oGd8lReQP#%hX$ z*)|t$E}uajMN(1HMVZqkn?CDT+Pz@ue@#)@H<+5VI}+lHV?GCcy~7TI4j_F z`sPmYS489+U~5kPA}3?tnI~g5OL7TSrol*r`0@%dNv=nfxCyD|3%9%{A$_F{Em;0> z&ZY$SJ07^aX5pYXJl%Lq!dC=kDb@HOoWCeU6R_J#(UB8b+z&Y=;ZqLp+csfSVP0sFpLENld33&d=iG#JlQ-F zfi?OqaXIk_&hMcGsx?)g5HTb9Dyr!$q4pR%*_7L(ENab7^iI$dd}l-ZHqkl^<=Q^08>{@lL_=%kldft;#D7Rt!XIC+{176)*Xgjk zT4(h*k(#>Gp)0aKS&)xjG3o;XW1g^xIJ%v{L&8PE1wXpW;a}`-*5O}NB}(r7@LI03 z^!l1V$02N5WPsSon6R}|stNc!y278OdcFtI)}OJbvmn*Htfd~erysTl`O)Fd*woSK z5DD-}((8D6oj`me6;Rhz2iNn6W*ZyUs0oSJ_qVAD%j4BJi#8E{We19`DX)V-C?nMT z_p%TC@^Wb^9;Pg32I*Y_W_8XxvLsp8uNv)l4hCYLCwX`l zA4C{I3phf8v7_?m553WN32YFIWNt+?UQV{TPJ}91mJ3-{ggs@xZp5u58zgr0Zq3D< zEGwB{I<&%tO8JjqCIG4wOU=H$lp>Wqf@cRWYN79k&pJ}POO zw!X8KL34_;Aahd9g|?(|v$(Rk3teA(=krll6mFq}$Xp%Z9#Eel^I)JoW2Jxo)xGf_ zSzuFm$X59DWVciA*^(imYRAZnT`{N!XY`S7E9W+-%jx4^*h&cbYl%HUu@F{$;LJ=6 zpDyS^3JoXrhz8J;?eIlTLoWXx`jqVUS6)niEv**YmjI~0R(S&6t#Wjg5ZmQQK@?f1 z?wTn*Sr&;#R}%t8Pv*0s6<`m^E)i$ze(?SaJ=qHF)H8T2`-3y0-7g)K(2cf;h@OlSk-HbF`H_`z^09!Lv$a05 z@Ty?i=d(HkphgM(f@`Sn>BGe7Kn7SfO&;`VxM+1}HKM#2QlY(S7`ghRygWwt)`yI?SGDv+d7h!P;I$b=h~A6Z0Jo8e?9m%K$hDNZ3&%zo6E)P#aXc_+sUf zV-d!`j9?=?%MalvoUvW%KIYgox6=S0<2|p4unW_$B8To9k{7vmcNjFZ>vAX@;cpw; z7%a1x?fV^cx-_D2m+0f5^LYEG*z|j}o|~L33MFhnRffCuOo5hCsw?YAmw{=-xhFa!yT5ra{){`A^zi^^egrgct zf+|ZHDNW@|T`l|VKiU^&&{$+lJ@B9MCI_+G zs&3cQZWm__2S+^Fbhnk}@iR^o6J0l#?-c7U}>&U)z8ezr{3+r8lHjDlWg7tQ0IW_T6oGSt%4Z{@t*D zW1HK)e{S~h%ombX!Cc#NzT$lQuYbkznp8&v7jMx_OI(Zw0EoB(0(3NhSd;*~Tio>~ z@c-MK5Jl<22Oc^!4?~HT2SeVXW%34?-evfj~J$3)g3!B+9P9q0fZsLmE*fU!p!(;%K>;+IraPJu0<(qV9+dR9b{yVI@1lmeh6BM1&q_3b%W& zEc4x5@tsqj9}hjt?i_Mo-Ho!80`1FfR6)O2TxK3cWU~IsnoZwJT3~CC2@D?ATX;wD zz?txrn20~Ve3&R+AE7xkO!PjSVuCzQq+CnW!aOHCVaO+eL4eptD?5J3TVPm=-`hgV zfhCr{O*2XTjrG57EO)!%f4>JG ifaSk?15gmkMUM((qCvSc)BW|k6;5Sl#bIK+qx}!dQt4~}