From 3e4458901bd079fb23a3d501d11f495bc020927e Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Tue, 2 Mar 2021 00:43:22 +0100 Subject: [PATCH] added some default extensions for some emulators, added sms.opk, changed os release, fixed theme in gmenu2x --- FunKey/board/funkey/rootfs-overlay/etc/issue | 2 +- .../board/funkey/rootfs-overlay/etc/os-release | 10 +++++----- .../board/funkey/rootfs-overlay/etc/sw-versions | 2 +- .../usr/games/collections/NES/settings.conf | 2 +- .../usr/games/collections/Sega Genesis/SMS.png | Bin 0 -> 28523 bytes .../collections/Sega Genesis/settings.conf | 2 +- .../usr/games/collections/Sega Genesis/sms.png | Bin 0 -> 1007 bytes .../Sega Master System/settings.conf | 2 +- .../games/collections/WonderSwan/settings.conf | 2 +- .../gmenu2x/skins/240x240/Default/skin.conf | 12 ++++++++++++ .../package/FCEUX/opk/nes/nes.funkey-s.desktop | 2 +- .../package/gnuboy/opk/gbc/gbc.funkey-s.desktop | 2 +- .../package/gpsp/opk/gba/gba.funkey-s.desktop | 2 +- .../opk/wonderswan/wonderswan.funkey-s.desktop | 2 +- .../opk/megadrive/megadrive.funkey-s.desktop | 2 +- .../picodrive/opk/sms/SMS.funkey-s.desktop | 12 ++++++++++++ FunKey/package/picodrive/opk/sms/sms.png | Bin 0 -> 1007 bytes FunKey/package/picodrive/picodrive.mk | 1 + 18 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/SMS.png create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/sms.png create mode 100644 FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf create mode 100644 FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop create mode 100644 FunKey/package/picodrive/opk/sms/sms.png diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue index 6acbb23..3861838 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/issue +++ b/FunKey/board/funkey/rootfs-overlay/etc/issue @@ -5,6 +5,6 @@ |___| |_____|__|__||__|\__||_____|___ | FUN ON A KEYCHAIN |_____| ----------------------------------------------------- - Version 2.0.0 + Version 2.0.1 ----------------------------------------------------- diff --git a/FunKey/board/funkey/rootfs-overlay/etc/os-release b/FunKey/board/funkey/rootfs-overlay/etc/os-release index 625c497..683d360 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/os-release +++ b/FunKey/board/funkey/rootfs-overlay/etc/os-release @@ -1,12 +1,12 @@ NAME="FunKey-OS" -VERSION="2.0.0 (Rowdy Rabbit)" +VERSION="2.0.1 (Defiant Dog)" ID=funkey ID_LIKE=buildroot -PRETTY_NAME="FunKey-OS 2.0.0" -VERSION_ID="2.0.0.0" +PRETTY_NAME="FunKey-OS 2.0.1" +VERSION_ID="2.0.1" HOME_URL="https://www.funkey-project.com/" SUPPORT_URL="https://www.funkey-project.com/" BUG_REPORT_URL="https://www.funkey-project.com/" PRIVACY_POLICY_URL="https://www.funkey-project.com" -VERSION_CODENAME=Rowdy -UBUNTU_CODENAME=Rowdy +VERSION_CODENAME=Defiant +UBUNTU_CODENAME=Defiant diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions index 44869b1..5b27f5f 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions +++ b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions @@ -1 +1 @@ -rootfs 2.0.0 +rootfs 2.0.1 diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf index c64f263..c579864 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = nes,NES +list.extensions = nes,NES,fds,FDS list.menuSort = yes launcher = NES diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/SMS.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/SMS.png new file mode 100644 index 0000000000000000000000000000000000000000..3fcac936973a9457eab8e0f9539a39d39559a920 GIT binary patch literal 28523 zcmV)#K##wPP)!;V&imG*bP z-`mA*xAO}e?(uj$9*_I|ZWmVLXoMu}cDu*pvD@vA$K!6d`~3X8-|vpn3W@BQm=2xeH1#1ch@M#c?qNjhV)-tYJ4 z^Z9r@nkJZhZ?~HfwOfjJ@lnPYV~pGF<^WB~4b;XiT5EpoYr{_xnSO z45qN&uoSmcfeJH2`?O|81GZ6yDq%hlc?7I+Ir%R-1-EC{lKcH`G9a)-tf}?=em|W~ zt+kJj4|F{Sr(hQr)2G|*b~>G``+mQFJRa(*#u$cMW~hkj*R9Sy9kLWhp_; z!E+x4(eo~5jmP8ha5x+ehy8xP-|x*1FPDp()^4{u91eXcK7`w$o29b?9lhOhM~?`j z9Zrfs#n*d391cc^`JDrDO%==4j=0>`>W;UlK5V0-V0{)^!{T=pRWdU&WB+vr89FjI z3~TIG5u)TcJRXnF&rjpEi<5@VD8ll1Jg(O(<_LzTD!QfyzcxG)R_fxB`KTc?p~iuP zaRzG;Adcc(MXR$s$jsG#G16Wx7jJBmYHQbHnT~4+qDRK;@xZB2IKnB+G2u#A8#DRurk^5Jiy}c*Btu?>sOOPiOAsbdSkO{Zj zZNJ|ikH_ovdb{0J^Ja>vnt5DBtciR2wWV;Kp^mnQ+s{JQzMe^9U+1KIG>cC5YX)g~ zvh}*(@7L=U(_?FF-QCIJ427mDW;5oU2gKwojAcyoyQH^Xc2M^Fy^3&WxL&VqkrdjqdjXsD zdVBN~Zmw-n8#G`?1LZ#Nm55i4xlgoVwLosOa)wlGmYJ(+k~UVb zs2`prx5!&{Sl@CNj)}B`B6nb3|8O{rF)o)&h{FsA?)Urcb~_vnHngdc8q7>s`#VaQ z1t9lYuDCT=WIK9TpUtAhS{Jj}wn&ZEIJ}V2qF2Re?0-pNFbilec~Ya!vjC%_Ey=l4 z(PU|c;2iu$7K+gxp0c{EOIV+&GB(x_*T4%Z+J$+L;SE?P#I_%&@?RvcqnB%x5AP_S` z%Vp4L&3L@Bfw?x&I!emg1gk?2+t%L4D?M+=B~k=c40LE~XNi7AdlC(yfS)pT9Jj55 zDnj0L+i1gjH>Ak$$6VTPkqzVGvzwo1)Cf>nf4kkT*X!Hc+kU^l-EM^83pQMk7W&E; zta{QZ6pomJL5MIGniO~zb37hTr<19>(Qb>qHV<^8wK(RSbWoSe#oCiryPo4?LQ(+I z84SWRe87m}7@kfipU;mm%=LJC%-v>+A;WXv78!#YfDTM!&)}i$olOW6r=4x>ZV+es zn+-$-b2AT&kH^C%OHLi;a%zgiH!Rlpdc7Wx$FWY;o+_qlNIUuX+H+y4t=iRS)AH*P zXBaC&k1OZ>ez!+fW68y+*L-p5^D1;06T-l#8O3}&2{F$4y0YR}ZOy^3SD`~ANwz($ z(xqt=vtOgN6Jj*b7~^)k*@HXNMS_qaNyQ#SYY=|6Y+5hx-ls1!)zj&O zk7oyDybUI_Xlw(X?zmMLd&d~&f<1e}Tbm4-aeN(CPs~TyuX&c^@#uoZ*;p6aXXY%jTwuP`T?l#CHkV3Bj<@l2j+$lpmD%3maGk z`s0yS$^V6AjPchZ)@JKan`bn`eeGD!QYOb$#%(s!(ZlN&`3tmOzl-{WtCS%jgo)j< zNvzp0?!tS@m~AZ@lb|BdW%v+onbQd!^kgB@d=rI-K{NoXH~#eXhE_MlvE;+Zd>qA^ zwdLXMfOQS`7c;EJ$fWA+=IRS+R!{lDFE0i1)kY5N9O^xlFvenI)x2ULg!z;*WzE72 zg6^V83|KVw1j)PiWdYL_4vm>I2)k>Kg)O;yL>mA$i%;s>k{rI^1(fQqG|ae>|4Xxp-CrH&P4^ngdTUm*cgT<_%;>vr295g?7}#6&1(s5buvK+MOFJ08rmuHrDhdsUzaRFpv_tf7&jn-LfSR7na+?s{vD43&^7XJF|OCEKF@Dp2!B(aoSDO4DYW)!qK<97p5z(kWYJ0d19r4zNGsDfodrQa{FSuK za}9VXw_A4GdEgz((xp#>33(dMA=ti-m8#{ zK{y-^_T=pI^Yi25!vP+TN6SH+$!?0y5G2ZS9Dmq@4)KLjcib)8DtuFyi_DSC!WB9F z*U&>~S$arR^xpg1+nXx!v*qg$n)t{pNc!EdWf%`tkHg66&G5kn=6HVLns>Y1Fo~k5 z8*0q)czk<%v!LXogpMF9yJh1JrjAcNp!#CsT^G-p-6r?@{pobFddo!c=_|&)2JZ&E zK-aUyjrMdp`GZ5>9MYa&2zV{43QHKe1}vTYsh=;{o>G;?y&9((1tNfS9cJblY}LZa zdTEr$@^X@Cn`x4{WbdMRgkm02WcjnbA!v!>Q`Xy-T*h}J6=P-PZ!+DsFywl@ntQUS zYnw5~va_NsR*F;E)|#2k3(jb)r*ay}QE)h+^?YiK;V*AnarB-d|AqEp+zOL2O)7iu zycc?Y)a=$|Ws?Zmz`7=}s)s9b@34)JYr)M^P~QN6&xiZ63Bf&g7W`dDUA?Z?tG%f7 za)iN*t|0l}UwnPeiY3fu9v*K|N5^^<>V*+eXOx+ShR?U{rLMLx5Yuw<&c7; z;h&ue<8WEt9X5p|1RMVkSKT~NyEYHE!=yb#Gsi)*$gmS0!p zuNdJkkK2#sJ)UQ02QQZ$ygKVoXf4K?(RxZXU^^WFnNjJ#DKgK4b?-CA`142|x~;HY zRt^dd1%op9Vf`eKNv4qfXNK(onO1k}6o^b3+j}By#yo?n;^S_`F8{Vk$%DUP_*seqJs0~Z$ie6){e_*%WT#c zz+4k{a8gHz8(H!T*5%&$slIhasp^WqyWQ^h-+zBR9zTBku!;R&huSq!M;)(@rBvf8 z{!|wwueLh;OCyGa5JwaZf0$uya0`L2W_dFo(UpmEY@&-;VS(2U26Yt-kq^rQwhD$~ z`VW?RR-fS+PJ(~AG34d*Rs>ByCO=~MSc;TYsjqH3lhxGx+vb#SQJ-LHM`_Ud@O1bGgp0#9;7(|8+N0Bh(JK7Jn z$r@)=P#2{diFFbP0gZtKTmiPl7mP9N5v8xb?AC9Y*X3mu{7;qLauS{W+T&vT+gh_# zJxh`?+I&4`e1%bk<yBTEb%HdRj_f9>tl(n(5*zhvZoQQ?5#FGBlI$t`+ylyWQ^Fw{QFX-ZsYDnTOVK zw;a%g?<&5(zyJ2zZ)17fXlC5A6FHuuC(Jq3Zap-i#)PWoGr-VqDFQTfT_~<90`-)Y zM#Lw>9p=3q9CVR}y-yId}|XV^qF@&l-A0-tLCci4mDY$RCe%emxjNfhz4)V8&f z>bHJ5wl5b~Co8_y2iqXRHs`Y9`t$z&-dgkXI-Eb4ncwes-#On}!!5Mu^Z9^-)iFc~ z$TWa#Rjs{=1!gU?92?v0)^C$$VB3T*z#2jZ4Rx$P=76rjQ=P~9b$^5tdMLBox3@Pt zN?M-`7n3?5RWlz8F{zc zdAi|gNNbHAEBXd<>+bK9+gq8dIdEV0_tNm0p@s_y>OsS4A@wRMQ7j*sb56weEguzlr{MJpSV!|9E?Q>%H42b;cO>Du^kA zGuGPw^=TE1Bw@@6ks~KM!;#5m6uZzQz)gWWTG&}c?9|MC*5 zsb9ODP*f~BQXz`Eq#i2i5Sn>GTruuTX=|f(sfY2|p_%Y(r_qSM=TH=oq#e`a|44v+t<>?Ul}go@`4o2PunvMi{M{8-g9p6aX48%D-@n^qGdmK5w%Ly5 z^DeHdt2uB%TbL&llouAL9FoLNAb}{s28KcAJwzAc% z(9=6UkH_Ql^Yi`v-9Aw2u2*r+xRi}D(+i6mt(mKjeqYL19@Wz7W9F^?Q)Pw~h0=zV z9zs<#LzW?&Ew;{Vk9Pl@#4bkin}v_8{p_+>>W(V2cH4o59$$m&r|$+eSV^dzj+%xdE2w1Hw$fC?iy^_ooV2NWDS+)zav zCL{N23%vGZIE$i+Br!^3thK=}=kBw(szH7ps5BXI4T5CQyHF=CxO0+L{+nxgsmOCwJjb7DPaYP~oW_BO}O2 z{KCQZWlkHy3~QXNdngVEU!7@d0f*ZdwD_01@LO2kWz)$b_k7XVj{!2=@S7t}PLEb4 z=Jnx=Mg4VKt7R)?sx>W|;$=gJy-@uy3^rklZPyb$U;RBC4tTyF4WTr)wZ<0a;I|H$kTP6r%60gn<%|Yoe><$rkXPFbN?3NV zJKRS>GbX=?pzIdDC4bPloI+=8A})lW z|7}IR$)u{O9jey4%pS>kv5Es)XsI|*K}B!BNcV_v4GAFwwf*66cz=KQNbrDqq2J937yA7>T~=@%3qv&NBFc%<0W@7};12`cTrFFp zBna)3oV_w+rorFgwZmYGC{gD13x^|j#=$L*_Snpq0Db+>x54gUw|oXOtkh93vp_V` z=fEn(Nk6S!{?=GMuT`3#XuV%p{PcVk{U~`l9KsF8Ux@S6*Bgv==Ir7LS28=~@MzWU z8a&ju<$xYeAK>bcW~-?a)s(aK4TJ{)Q5v?wg52X2aoMRY+{P`oOpHE3{7x0yVA$TAP(crlAN= zB0$|YovvTox?*3_V>bZY227ZH7Tx7dLu6oq00KlGSNKOIR<(AM*k4r&Av${4?CUrn zrQxmtx(KgTM&u|92u0;&3KI_0*LfV4y&sC*A`MXEq?*tYHjPAyc}j$|s8e(-nA@ck z6!m5MoBhQ&T%^`6`yCvAM`(wUzpeRPSfC@1iGY$HD#YJiX8a?{qPC3;8iiKkKlTkX z7jHnWtIuufr!GEDV>jZx}R+L+2g1~w*a^+j7`61-2 zvdj7MO>~JaLbOAiz4EW`3CzsLv~k!GYYOY7HtHAu!cru(DeSC`RfZcOLO!ab4Ikf} z7&^YNP~un=a&foA z0$Apby>S?*Cpl(!56ER2$zf&lE6UIcg_}X8fjZWKi1_|OQP&t^s|^f2e6iD>zM?rP z+LlQBt3OC)*d8|k5N-{GHQ@LQY~ZNci^@n>_;%D63xzB!%E?Ko70^&8wHe)|#pF<+ zcnb|u7o4?wtt}&&nPzP9DL~7WoS3k;jn^$N($|i4ZX)Bz<%uZMPgrsV#k=-EydJX1#TxUI>{8f57JysaX?|J%xjgMfG~u z|0>m)u+-y(y64=+p{b?f9HNJa5r(QK8Sv z*5XQn9A$R*XOM<|+}gsibX z!rJl46lJm$>Ot5x(TDj#$wVpKWocUP-5!Z&!c`1W7K9tcp3q{mNc#fGMHfQSuJ?BO zA$7|lzEW7*UV(Jz0*huH=5jSRGgPUK-c`|Vu8z20981Z3kc-)$+ZF8#B$c`@YXmKE z0R^DMk-fG=vs*RQDaS4yE6>io(&mN(;3i+I#POq>j#!GUzW% zr6{qmO=>m>6t?$K*^1(^gV{HsII^hCM6Ik^pQAxceHHwlFBDQ;;wP}4SNZ#8l)3IfDv zia&@evY7M_k;K2`x;C|(8W7~nhS3yN-uCTjIzduR%TChpa@INaMe&7xAwwIrsIY%jj7@i6d+nlLjj*uH0%sCyfoi;n)nQVX&95A^ z+E@rMYeQxn>Po>-GIBSJkY+kPEGvp((aRg#*^Xm5dfSJ?*BdMV+UFN+Qx~2dN;~hp zC>6xg0yp2Y?V~7xRw%B9BFJ>HcKT?Ucul?V)vM4&5|UxCr7ntC=<*bPrgC8bCv1DP z!>5R6N^Dp{3t#QTQj!YA4Mjr8b$N@*#8x{$a#}TEdKY(1xG{Ut6A}tGF@)IxY+7pw_M?^}R zVx`g~L1Z<~z>qB&H$v(VtD;$Apt72B9PJRkC8xJU2J`{*ZE z;dcv4{1!5iw4rdW;Xq?KyuxZMcO_d@Y>RM5mC8ULt|i*waw4A+CeNFU3THYQlS5f& zce9SfE>cjuP=LGjnH5>7s2;f(VmDR0tq*TrlW-12*)iPH=%KGy}?EpArT>O ztN~e#Ib;nvdul(K+iX^<&o=Zfmy5+Z`&vA0gscUxRNz?Txq9OGyx4-x?RN7IVPn=! z_=j;RL$yV#mk1$T$(vEE5RJZGRwx+N)nzdF%E0q`sXhHR zF@}&!q?Dl)6_gvW2H_StBg8XvJvBw46=|tQRAnucuR~FQR8ON2!qk$Sf-0w%`3XYC z&!RiYVusZrEA%emPh|2=tPD%kExe0rs?Tpa7&Fb6S|V?49EwK+I5LhvkrdldOfu>>|eR+1boaOI}=UJERR(Q9sXZyS83vY#bHQ4WsHC>}g+)-zHmC zem&r$iG6uol)WTS@YPYhvot;vO40Fa=$GTcQ*Y9uPvGE>x?(to~?KiJ7y^IX{UWk z+fwV@`VHHVc4b8fT%8~RLAp#3v}&zH;jLYHFi?hbVJ&{wZE`H7FGrDt84aSE0aqM0 zQO#=Tu5O2}#YY;e^&zMZIYpBsF&vRV5n|3{O7+9;{xJYQNceKO{QUVdKG?mUg40w@ zk4;4kD02=UmN>4s9zaB9!NehBy4cq)K*w^`v;+11A(Q95jz;MAaP%w=<0v7q-ert| zI24#Gbs26&_u4&$0Nq0L81zulGp23UWCpLjXq3!u3%jE088~W(1gZ$pO_A4_dH?_* z07*naR0QWWwT_v|*e=~M27asg@p$kGR?AmSaBK%*TM@K9+U;Zg)xW}${kt-#{lo%) zWJ=FY)sPClc)fAtLeKve zkFp6`Ujj}8UMWQsGzydytD=`)tGnDBbRMzV&ci`N*HinWP$7vZ&uZ;SjMz_j`Y%$eNLp$|9lurC_T-sDTAx|G>h4 zRR$-JSVXZg8*Z~8w|xi#j()8US@gGdY8fb1iEI>lZ( zH5kkHD=pY+R3qy}u8uKQDYTN;*6YI^Que2;w}D8Se9!=+F{!nu=(v2cTaJ}N$Bfu! zOh@+Nq}}R2KR@lPN$Ns837zX$(jF%P3CRo$70WVbKY0hYjul=tB#lNXN)a*C28idA zLlkH$CY$D}rN{^}G{^<37KNkNszp>Nl4E(Y<sc6QiBGoh5ebM82#l3jp|A!Hc$;1 zP`o2GLs0m-g*iuukG%?L$Xl$v>(vZcN%LL^2V;rzis!)EEhH>^_~aM%G$=fw!i#IF z8_el+@+F+!yUj=&%I$_OehcwA)sUx9|b!Dze`4g@QFs$F2u); z)?%z5dq`@a`1l%aUnhVh$3cr&AsLFI)npFRi+$ue!Fs22W#=TPJ!SP{uO3_3j#M335g_5<;?D zef)N_co6W3b-Fl7!Wx(d77Z66dZ7kTrB6gNNr#4^o-#CS z|LYTbdJ<;d!7?i|U|*KZkZ~V3!xOwkN~2a3O19u(7z_#8W;`r#2>nP)^f1IT8*50m z@9t7DA(Y1Qt{X+#CMG~!@<^-5H({em2cK@*?_Zx6tx3hZx&er2!?8maSn&Nf5~#3yf6;aqn9xFAa~4h;#+>IWGG#fWyU%TWmyBfYeCo^P2+YqOg)qdc%6B4 z#2kZC5t>4rLobHIVS_rh6rivdSuZ&YGC#yTyrl}DgVMMT)7PBbXmKiw&;JxuJ*aAe zYoNM6yLBLvHr0{%rEv!D;sU+j#lMzm+ZsCN8*a4f8bg#q-|S;izR*O*RQyBUWTG@; z@z+VvK;L&Aye=JF*8y6p`Q;dhaa~5dCbE9>%=)h#+mtJHJn0SYbFfG4cuT8X}_kKE^ zY$BZrRbv!7OCJmCy~h7)tg}LnAhR@=mdnqMA2^*(zKI3phsfj5ek=5_nK6^eQ3LFS zQdWQzj)>186AClV3XxwoQ$pyXualRtyfJQJ){K@k0dbz0#A4rYwW6)XGplB146l&U9vBF-V%WfjF!WU%fg!rJ=Qst14NB~L1IuJS+FT3?A z+<4cYRz6@eV@p<{3Zfozriyo0)~Q00QsLbPoF$Ci58AVp3KtGc1!I)A@A-on?H($n zdwpD*Cq`qXBj8U{Q8UyXqE{ZW*|Tk#N?0FKR~S4kx!DxM_E$R96n{d;Um#EvH7CbJ ze?v7WRJ^ddzD}>QHsM&APYjEXGS+KRWV8gicxYO9!;DMxmo~;=GmXjq*Bj4nha?{y z;+LsT=2pW|cFRfVxE;!4V296MAu%BuE#j{_xk*b4gFlu{zt+S;u;90Rtvuk|EVp6R z^(+_2w5o8{#IE9^i7_k8+5l=Vuo)pXYgAai<@m9@B;YTuxF&>HDQ9p9WGT%-=G{8M z$;@7zb@e{5qU$bdjDg!5af}dx<_}GjsrP<39DE0ecfn^T170>P#wD~Vq)^N7ZrD95 znVcpwjt0~b$Ho}O5KE+;eDrJckrvaC40#pVCi&QLBuO$2q?m-wvQhMJ)_trW_UMW! zVTCq~K#&iaxHCo#$YLKLrN6bVyL2jaOs&+P%{ml1FRE zn+7(ie>&n!$Zfg%Kv8MOLS~3VheVprzRSE};m9{_!^>D_&NUNIxr_E;*c_5whnUY` z($*QWzb9Zy<>ClEcxHjbSCZMp$Je1@~fui|QFdR$qFpIe{;YM&UHoEjfW|D@7wAbpbiswpBM5#k09{NCs z9_bk==wo@M*yUji@|Bg)R;l>R*7se7)DnuJbnEaHc0t12&f(O%1rD-czp~VCJWgSi4oc5=1QAcjGA5z>U^_$+T2(Xt4w{ z(;N%{g?5FNp$9=esP(qBMBxO}Kx#z&G7f*o3d9HG@VI<9CHKOU5i3+iS;c2vQ(yqk^Veq13{N5q1o_XO$uHxaIhIy?%av zUawbsO%L}P)C$lg-qc>N@I)b=Gn(v9p|6i#E*xA~zuJja6vF=Tc-UUQ%xv1SXY-~q4+6%BEO?8 zmCQmq4KkzRA+454DTII3`DX2j#$r(Qs?J+=$20ct<*zyLd^gL%?A2sjS@9`{Hg;ar zL!hp7$tOd-Ck-wT-ZYE>`Ln-k^-GFsgBA*jg&VrvZXJ$N@ICa%WE#CdNsW!-WMQIV z4P9(@FHGeD1>Xq|AAD#E*0yX|TPk7&aPPQjI9W%(AZI!gy|C>4<@Evy#l}b4EhVJH z#e;DsqmBHotI?z+i0PZoB1E+7%(jx24imyJ< zLrX+Jk?HFaf(_9w3W<0u?+MtVoh8OTzb&iMBlNqR8GxLhv1cUzHeNj8$DB07p+<1UWBsh~E{`#oVB>Z@rLF36*5hN{q_1&P`z zkgekP!JjHwyqa`*D&n3`DYF^}^;j2r9c`?48uw^|8tTcjnll3dWt34=!0(b*s-bSi za|IjBffY(iR*R49fHnHXw-Y6en@Kzug%Sbq+Z+*!u$5Oc+|f$|Y1 z>VVKVo4jt(TJs#(U#4}I76HT4a(s9;Q;2DWrS*0CgZ9=yuT)z|c8WY{uSW&q43g$u ze3pa*(I{3Qe44Ok4e6HI@a1x8t=XB90-r)Vu_eAxs>V;n)f%7Aqf^^pK~xms&`O7-56F$S-kLuk*oFtqI61gohcpMV zs$(6Nu-RlKdFm!YR4-XzMJ`wy({LWEHCCx&^xlK*kQowGNpihhE@L?YRy(4M>*0u) zzV!|hsT2aoL9w#KTmC-j^0liO6(KLya^E}yid=Qpl3bWoKIGL71)}QMatERHDiIt4 z$#*88(Qf(_l%QI2M$`-~*k-cOpkZj;gh`&1Ix2x}9lEHON)!7Ylshv_A#@F*y)^G% z7___d;g^Un;)#-kuX<_&#nz^dmN+yx8t^(^whBc;b4QbXE98~U_?O*icEtcTeQ=VuAQ%&X-(gXDxR@~NRU%|TPyOngETiY~8tnX#1c z?&{k}8T4XEw7RiOzTGkR-fdkMhoBL|nyh8UHFB1!ns&0(DrqzQ7YMr65Q;?6NXW>YrqPpNs z9#UgXe?t80*h`h+=(-wO<2GaP{d_*_*lo=PRa`Bk>j=<7akxJb*@qTV^Aw9)U}!UA zjN|e6_V%{h?SB6J`SI~Vt5%s-sb45CQU9W@BS&{mDqbJ9%KxaG?u zZRj$d3MQHUWCrsroM+pIZrcAo8z;YB5X1S=|1@CgN$z~cfVJq;0@M#IXez4cGmfe+ z51dgF7Ip2EkB^U!kB<*UW`g)e(??48@d@Fz-+@ z!clOAgUiMZiz-juJp&llQ$RvVg=ox}(~Q!#$PmI(JPD`ne=5V<+nfICBNHphJ`Kq)gH%SnT3 z!=wjeokC}WhDYj97m7a_DAe6-&|0$#F3t0eq?5&`zq^F44OtY1^dTv&DfZNn8kslk zlGkOtpfF3&=((tysP^@9q1uuR`=%e?Mc}9W6tDG$Y83jp8T-#VW@@xkr{(UrrS;b!y( z49YyEwbUcjGF@!Z7h=>2(Y0%Ei`2Bkp3?B;Rc#+~28pft=J?kdL!t`DLO!Ej`o&JZ ztVRAeWC%9i^b{jX&}t6MKt`=4v{6q&Run@QxMipo2+wzat)PH1eQ>|rmlU|Q_Gbzm zrWVS+(B9fa9zrr`k$~slH6bAAlV)V5s8YwwY}#7A5MYQ{i-USP9?glm0fQJbc_Sv0O_Wr)L5V6#$ZG_RFESD_JHmIZBw*&6lDmbA+c zgMUjb$BVkI8X4^#T6MwSu%28VDO~7c+uA|U5Ve3aZ$g23rl@=~hud-sFGSNoyRtBV z&Ghx~mR$nT=6=^QC@1oK5Zs@JH?%TAii zEEH;62fEtPWKKZ=(nWYzv!M)sFQFN1M)eQ^!6%P{Bv3QOR$W+z9!`bOD{Z2UW2tLX z+neF%=D2khV?!4?W-Xv1KK=DVzp;sEYmpc-xrR}?2_Hl3HE0+38XZNUy`Uu8agrg$$|5SB(o#^@ z?S0^IRI;VEl~T@7vYBT1D6Rb9pvENyJ|q4@qJ(ppK@o1=F}$nsxd5wij4;e}6oH4r z!j~4pUTrOI#X0OdX$hP0IU{5SY^dm)&9ZR`f~GUCxxb>Nnp=UJUsvBo!q73vop6|< z4T;B}E#r3Fkdgr_(ix)*(lUGqrA*lB-H@UTK6O_)P3i>2^o!3GnnXDMFYIGF$Y#nE%Ic%>;ARN!629daO#7mA`HD5&ZCk7+1#=zK7qI^_VC`I^7!q0d%Mk2SW*nAK zfz)ni=nC6ps#!E9$C+tu7(z4BGCQe>$^eGwg`QDCORb~K%4TK1UYV(znF$ysxAKIeHAo-WjTg?nT8S}IhqZDnZW_uAU8w1Jq zmbF@Ec+`1d*l|nU1q9aKN-Ox;o9dMpeOAMfaGz-$gF#Bxe+{_F^`z(elqVDFn4nb44 zm*Xc58u|hneX=j94K*W4ZGRt_oNEzD(1F!3u?qoLjSszhF-jeKo0tc74E)v z+4mAreU0!~&k+hV3Ofvk3j=0oD(E`H2AfjuP_hP1)Ukj@H5i39H6g4iSX!I(<}@J# zK8a+F9$HGr*9k-Q)%+w(rL5@3Y(jsJz?Gq)^(tE_%_H)Z?3r8+N11W$;aI*-i%A;c zA0i(Pp`#SNG-08>N?J$)qW2Zm43P|#0pC0ek5J6UCRGaZJ9V$v&pLd}~l4(!q z8VGY`Q3x#yt;&ROP;D0SBpXQep+zOLQq&)GaM_?4b5LaJtm|wAY1dJTE`FDsvIDfZ zl_fjM1jk&b*_mj1^Z?2J9>Q9zRDv^VL-U(-Ka(ngB&o4!&}$-l>qy^W%P?t?2o=5B z@wc35%2*01EfEL))xHE_6SvJaPl0Wb4j@1hP&P`z4ejEhFJ#fyf+!4LwWvj=p82@C zVB(;+6b)>z9r=k|UrI4>4KYInhsYq)D7B}k#~Mq~jvX?S4rNm{3z2WiZ_>IDpBiA+ z3@bCv)L=J}q=IZAl+;{Z=@EFQP6%z2Co`DixHX?AX@9EaYo&lcXcc7g8LaM{hGsY4oe3Zj1C4J;)cOP_%`#&P)yXSy zk%h3L;R;a}1(E-vS|L4vB`f@p)6S_%8ZMd1i0yR zf-}}%gH?Nd{abi<{rjxVIMc_vAmq(Zqb=tNaj%`WGvSS2I>HIrI!-wf?l$(&xbByk~rTjg4|jnKfjc zP}_v#Qf#c59u7g#qoxJ_;>Qic2Bu5}A>pl%U1WqbN?22{u29o#6fKhqkR=Nl^A-7m z5NzxNg**>^?xrK&BrRkq0&l`?e4#~qky5GS`)fo!)UGbXajn#ABog^sj6(9G7+83d z46&JLsrYZg&%~n*sGiPY@9_T0j6*5nc^JnC`GQ6Tm<{a!_30gr=))DHserod%~s>o zzL^k1RovulUq2vx~5jP^6kx>d=hu2*s8)4r>ZR#!|Fd zXoNKyq{l;2zP4ua=0KCGNvTKSi4^%6>7Ys!IxvHOX6owVTj@UL?N%Ay#JcEOY20+F zo1Doou|fxZE1ZqTNJTuH(FQ6ij2Raj@>CHc;23-|{K=fuHHKJuWYEYNA`=cB4irYb z!a>wwFf19vXS!o#nDMaT=za@>kH(A;LTGH^KpA?Zb(>iU@<&H6v}*>LCf+JTqkw$K zw6?7o9U_zwyomwIOijftgc@&Bh|scLq&;nI$poz!y0{2!TlF<$2q6%XSr-kDgj*=S zO~LhbYE9gmM^)WN0YQ~>(->+@vQbDANaxYuUlU4!No_2fUpt6TrK|;s1J~^}L=-Yp zP{ zO9v=h38@RoM9#cmeroW9Z8lamO6Xp*A+$2f7qa0pup##-m=(d*30Zv`$#?S?xkOlr z2B}CpK;&H^m~1$|6%H3dm{BrCsgB{B@I%rHSvJwUN&X{ZT@t0xDHIk+nvLe+y(Y;C z3%Zlw9 zM4dN5t}_P(_$-7Bpq1jxG1YrTgQzQ_hlctLJq1$uL;~35DO63@ruh|G)r3WaXNcrv zyizzdZ|8vaYyGdEGk2kov_5n@i2DzBn(Q9?MAes;!| zx}@A$8PTcZxDQMtWIZk-iIpz&O*q*ZgS(njZfS@_I9`T?YB{Q@ssar}Lo`wAaGT5laW^)6!N1Ca-5Iin^$;IqZuP@#^K^(X>rR;bytGNSGz>u?|) zWzrpB7?|(qMZc=+B|g+nd4Z0(h=gHBzeSpdU21x2SEq_gA%(O*42d1Gk4>VKv;z5} z@g`BB&r&2aXW@$)q13QfMtf1ZB-pN|J(=jLIBNKlmA|CS<5onVr;1v2I1tsewI-}y z=vM+LN>DuwLpn#pYk)#q>QN$*B?TG5S%XP8iNC)}Q9_TV&MRbB=w&jn*$`BdnO2L^ z@~|0d3&FQr*$RA7UNh-mD5iNddNj?M1p6$u&couvXu*f-v1gb@YGsyMg!P+_Cq!m4 zP%DMC7bvW~4wdA>3arBJ1S+I)#+_-)jJ@O^$GXhxR^e9KT3N#wr8*XpGwG(irM^<~ zl`_fdmx27kM3g66!s(Or!a+B=Hsd%@`NkN!deOwrLylpa z8u>}w!ZL5?+L+ke)?y7oX*3uzNx_SGqUIANN6-0|9gy_G5CojM&p4O1)}m}^R1f-M z7P-GLpxWR5kAM8bs!TAxR$h4JjDRq6YwPzgDAbH~_Nd*xhCX^!42^u56d3i*_}*o% zn0dMorgJ#MKV*U;HZPjYFDPfIrE&n7pE=xuEzgqUmCt4enoy8#5VRgm^qw72k=M5c zi#=5;rg>#P_}fx85*`*cPeYTb9Z5(jBp*X}^>3lpVSUxc>;M2D07*naR4=V5?77xF zRHinqQtrG6NKuN>d$dNN!-Wt5`z{303c~4D*4>8)jk)fQRD>;`jT0FOFXt~q=Ct#! zKh$&VP9A?AD`HV zNbT&xuo)7If3p};U>i152F_S%R_c62aiG3*D`P2E;-SJX*xTgYF!#wUh1!HI|C;*y zX9P&CkqeXbgeA-q)IzXcZ+RI|uva*)-wLg?=squ)23`OQ9e-IsLrlVf!msi;*gE>v z@avLwC&f_tVwYzJo$OVcoO7mDB)gcLMQ5YD&|W(ts`hpJP56fftncNsoL1m8D1CW0qtdBWLGcembnX5%kcNpOmKT`( zazWKC8vLpvIDTOrI$2{I2-hgPSnh!O<6_Be$j z3w``NjbTl#A_XBeVpw0;0J=ib!k*8YLKpBXA%tPw;Ds`y71=;_FAO1ALw=JO;@7zE zS~VZL9Qv|LdyOu#vWGj3Pl_7i@0t0)2s%lt^LUBkGy0Z?GkZjz{{CqecMYqLk zchUeyMh~FM%4Wv2i9g<=3;gR={Z#B#X%;Ovk=OQgmc_3E{uBgNS2D|tYJF=W%Y*jx z7^(1)R9{CV)pE}_6esoT3X{5LXea`8I7OJ@h3^n3v@J}K(A|cZpvEge7sqb5I~)$D z)2W!Gg$96wlC@w1)g-!BwEeG2q!4R{r;^_ymZIAYP#Piw*qp+zJ;HA)y0GGo9Iu`<)z&>v;+v-(iETl5JvqQzc$ z>%AY3$HU=ZHReaYfB!!7b`h1Q;!mb4>fMTFbwr&hwYyPFHiye}Nz<{cgsEbSI5S{B zDJ5Upy&jQJ)$2b~=(eQYp+$uQXZcbl!jSAj2AQ!*~B} zWpk`%JYClJuXCZ@uVaUKhnHQnwF}5_Er!b?Gh&WF6!KRjSM=SCNKF*o?Ac?i{Za(; zu#BcV#<<;X9ZvLb!sHp;8feU>>J(*uxYq!B2}KZMK2sBpi)m4ajN(8xqS}jHNb?o> zFuN>r84Ml=9L9=!Q~XQFW$Xyqy~)Qcb*X_X*TR%ZS&xykR)wduiVll&AiLepg6-jO z@cFHouJ4XUyY0Q-?{}BN^?J3b&GmYH)){GFM6ou|Eo4YdCUT}w%CDDN%?O#zn)y*Q z(rl`97I@G*^sSF?)Uhpu-~5IC4yA!@6pYARW7rrQP|86gw#YIGxB^kcka1zNO`Ho= zuDuNYeSd#%tsRfY{eC}|{TQt^v_`Yf{eJH<9%J0^_v`g~yWPeZwkb!~!zW9J3@B4I zJtWMNz%U$H7meiT{pT^n1dRe$*lY&i{ODMo-B1p^LRX-PN(bj>TERjo=zuYb?@D5`*OLs-TLb#9-`?qwt|+nRwHGF>xU{6QC;}x z`~4mY;sqBo=^2Z=MT`m~Gg=5WsI8@rXLyY+Nx4mpi9qs(_&$sm@50|kqE9e|SccZv zK6 zN69%MY~2rs!})wZ9*>X5!;H|Z?sB>Kt)D-CUM`o*<#Ils@AtdGv1R1P<8iy)+>Cwx zO!MI;G7F8fOVXv;N9bn}tP+m!Ll(`HdD+#Dpw=soRJFe&fbJ-t#Y!DL!qf&KEg3~5 z9gT=6*8SVtn~!RR-ghZzt5GEFX}~g~fhv`lj0FV(bSrF+7!tzN*yHWDZ{O_t_uqd% zpU;*pTVi~>-QM5d_xru2m&fDre!rW!?)Ur0<8irMK0iON*X!kSx!rD_PSfbby%yyT zWSj+EAwM&=)I1FT5~`C0yVObFQviRVXPM_rsM0OhE=_X?T8m^F+IeejZwI^6sN_F3 ziJ56oE5Rn%O&ivlO&v9DruRiW?(O$`-wXBj_GX#z@4x?UyBh7+_Br0~cMHPDiWSc{&v`8yRDG5l;?XWnIuUl_jGXrEsC-rU? z^Lvu26l(db8|wZT2@kC4z1t#92$3?e$&s*oh;;b(h1n76lTNgVr(;xKmPF#3%2j??_-RA{_~%g%f;gG{eC~4 zPN&o9`}gnH>-E3>>%Z>z`^U$}>2x}u&#krF?e_iq_s`Ey!Z3XC$dPgHfOpYr5G@$M zGfKk%OSed$^d+YPU=#k=o`njAicF51xdt^>ROu;+wejch^bA5V+#J`as87QzB5+;Q zXJtmQx9xj`4bGc4p%X;9OAaZFFkVCKzTPBG|FeW95s62x_x~;_u}dz4m)LojyK3e*F0H?c2BCfB*fDKmPds{d;T8 z(&^Lb)O-Kezy9_4`8k%SwKz9M+(wk)3@V>g+j zoY(WQy^XRcgrlfp&Qj!A1ObKhMO&R=LfvIEeipztEq_z3_xsc7bUYr<=kxh|_H3B|-tTuK+(21w zY&)Xtw=LTq@Ao^Mo86%}X=8nsw8@oHGO~iM3!TpZQYfD3ez4ZIPY9n7VvpW?N4m2*+W|2O<@7nR-teu+>!TRG)Qa~`o6aK$RXeUn9)3q z^TmluwbXku0l@~F*V-!^4hN;oE^C~1->fNctIJI8&?n})s48vF{4!89Xp2a8iLwAW=#K*+9!iUUDX~eL>uZ_u@ zr4B;Ke|P=f(Zx!Y_?NOm97sJlAx1;!Kx#gJu0oq~o5owzqC9?Vt(9d8-6iYuXpnh# z^#XJ-&G~$`w|P84@Z7;$Iy+npkH_Ql^YgKM`N_3sEL)L7)kkiU3ev-KqzJi0E1w~O zXdCV~cgqPo?ltr=)egR8MczRbOR4jgp}!uGJ=NCR*AX7g6?K=WuALw$Lto}8n_HLL z+F*3hqL(s?s3T=|?zJTmqsEiQg6+u#AY*Ct=11zd8JqRuLlGi4<9OyxyCiR!m4@A^ z-Y#s{v00|6h^HgAk?C~#IvU0<&$!HrKUgy^9iH5!TfIv{y zbOQ{ML->$t5_KfUhrCAm3rk_Wis4umCNkAmbuG}w_B~oRBDrUF*w!p6ympIpUacb> zqQL*qKzFUEV%6@XE;W9W#UWV8wMVt~*wz)!-Yc-I*xwVt2{5J)YISYdMuLF|BeS+| zxmA17jeE#aw^g@TpV&8eYK>w>fA1?74jicqW6@?nP**!sw59s}d4F9Obu^oJQcR<} zSx6_gsLo)`W-5W0gz6Wns0U=%0g5qyzD|fv!ZXsoY>KuwY=&eJUo5q4hbm@YGF=ZHb^~v!Ch88NExY;5EOCnK7acY>+A^D6;O=zg z(q?gd!XRARl9Q0RfVP%bn3dplZBg^&=yg^oGpeOb9cP-gwNEL;lwH>y`#NFtTYsGk z-5@_vQqc!Y(vua0FeJNH7Kglt)nM-6G}<#KToh2`l_E4z zYV7N0_K3@kw#!c1zD&r?ANd+vTO4Z>&f}cFftpe?vLC{K(~3yXijWclCrngppDl$S z$=bg#3L0dA0D8A)Q7Ske3Q;Q$Hp}w890MMEU=ZGfj^zb<3Q+2kY;-$=rmeNsT@Sh| z$JS20X-od;al0)6&`x;mz1v-MiW)}j+QTL(@oqT>$Fbe*cJ>M}J#+GGe~jTzw%W2} z)t3^6f&mNNUW53AJ~#90bzD-@)y9Tuz0Ndaew*2uGW=I1hR>GC7`|CqgnE+^3d^luf_K8yn6zXF+o9cKxnk`vIipxS4lg);) zBjNT~ADuzS_uhSDj6dJ@M)rM+emP@9c=1u%WH{5J9-w1^LT5gy?SG`RUE4?i^hIUb6OOVZM6RR^XL73 zw~f|gS$jh?G>qV&m}Z9zS3W3YE1ElOmQc`70a0x!g6c0HeR4QYGYcSLjF~|RV-Ho5 zheB*s)oJL1y*h^w8@$2izi!o`0n`{1h3Xv@0gcs~$!JYq&**#?gq`X-mSmMkwt~-Q z8cd;`gJ`rEZ?S=sV6$s;h@YRI?hf#14zkrSj1b>c_E{G#p(ve zrH&9ao|^%tC|Rt=K|?e)!G`r=_mGDngw@Q-!|wymD-Pk}<4u)QMv}9YxRWUs!l{!D zB$z;%_4Z|5%1wxn)C3h_+ESmtLTsEt#5}0d(<~defrAKTL!|k-8Y1Q)l$g*abRA15 zEQFT*-MkfcFO)%X2(@Ac!Y?Tl{j|YXToRI_L7OyrlGyIwM#4sB#(r?QL$qSI(7-~H zNIYa1%_!4b}4kFplU3$09?rRXR7FWn%HWFp;JAUH9riw4oB_KW2sJhGxwK8 zNVNyrd0UrIIYN4CXrXIX>A!3YU&*@XM-LlJCc`z5miwbH?9IERwsvH8eV`Wj3`u9g z-VOCe^ST*&kXcU|Dg}+qi8R>S(bf;Z3g(7mjpf5)4ORivoC=-5CFKx}4wDOo6NWO{ z1d=6Yn@D0W0#XODB6=Gr_b)FPb8Q2NfDWC(dv4tWB&a&%(dffDO1M zGhytBTRUc))>ziJhb$mtjhbSYX|Ug=?7*A(Uz&o>lu%{ecyKP7>2U_ul~@<~5jeK2 zOXf`dZjBH94FhkO<6sQQLWjclAs%x6oBDCGgbXX}xLc0twf4K^W!M??YLc}eyGUbq zaQceEber12!4D5Pp+zIJbIhOYx*)o3mjh-9b4j{NZoF?3nDOLT9wpb9FJ zpF_^Pbx6@>(b$N~0a=&KR`mjnJnKk>M2Ph`RvoO`TKP19JZsD$o>YTD6$h;y0d~)j zA@@hU3bRMZdbf}QMIAJd0=Jq>@@{U`9?#L}^ty#9w4>!g*kZR2Nj{*a1iAT|2~D;P zIaQlSEwCD_cAT+BtS=U6Rlh@*AHv7JHGek!-D@^X=!M~E68LKZDu6!~Y>R;u&Wuaa zn1mbYHPULh_GT*s4w>E|MNyaLLAbD9CEKrcF4UHf?$#mN;mqVho6>qpoR8?;;7#&3 z8&E;Ni`}#ItbzE$q495RJnCm>z-E2x($@*L>t#q?2;ntTtQ|+F=b@*jyH8nfgU1K- zq}J~`ObWbB4C=3~lo_dG{ZuJLxA2r9%V>Sl8iW>ta9ZTU2!Dz>FMC{4cbucDmMeNK ziPB*~DK^k)Y?H+qmq-}=)e&TR7W&z+*=Ev6XwWT6M4NDOvnYS&lZDN2t=B}dIzbIZ zI-*9`&A(WKQ)L>rnghG((mn)(VtF<0lptP&EFQ}`p$u(0Hq z)N=9S`{cEyPfi^fU&_{bYZJ|BX284Ts5;bFlZPMgfkH$TzBSqA+*DM;&;LL+d(oTPxqDn%YGeCD135gAR$xw3ayLIFrN0 zXOm6LW7FjkZkuLbH=t7x5a9;$Qqv{)Dm9$e(u9Z_bcwFs1`jPq2xP|1548)+fP$5d zU)@*H!dvtpN}n)kmlyOujUW`0o zXv2te=r@(XutDJzvX~R%kf{gZ`GS+3DYe9%{ET~KX2mFeP3GFyrLB30l{5H0B^H5rGWUOxeMytBT39z&G2gr=-f=Zuk4|zmMfO5i~;b z7Ye7928kV2?Lzpq3l4#2U^k7nm13O?syIZ(3UYr13FJ4)U^0Bj(pqF)YMgx?Y^~7D z*402+suu1St3@o;>9H)~c$$q1$oK~Q3-*Ac5N4rnsrH1|eVt`_vN{uIw86ZJqtAA> z?BKk3Pd(n>-_Pf>eWNtQxkYOVFQDYW+nUM5jV|e~*M~Vgp%m^dYl+t=Fr37{sH}l# z+TwCim$!*wU#7LRre|&skDDY;F$K(6=@Al!+>-CDu``8%KtBnWS)P!t$ z*lZvbnKsz0`C?Ik`dq+DSlPsXAvX&7;x(C;|J5bptYu-zIE0#O_}6GWZ1UPuXxh|) zQH7L)Oo(dqZe23dZNh>UN!qzgB3I|KIcQ5B`S|s2w>zCqr_;&4{q0C%v(L}Z&(F_q z-@g6$@xu<*Y-@!>(hNyLjG|@1gf6R78G(g=tnD_uTbP8hT6gtL+W$NP>Pd?>4RpqD zVPnid@h)CudZGwmUQLEg#D>W83;o*D`?uxUfE{yzqx!(1!e!71n@lgYZ!NjdS@h+t zjBJ~`jzTgc=2Ajo#q8F;D*W;BflmT(ssI1}@BfAz6Z?SAwYB8@KqM2m0r7B%<{poZ<+SCGlRI^+BdVs5-zio%YcuH^DT4pL{RayIsN=A`~`Z|H(vX+Xr z!?Qc3MSW0T77PCCzy52#-~aQU|GZo-{yad(GFH1<*nt7}`~Cg>{qytl=g*%l`Q9Xj zYpR?~aL_zRlQIaIIBM&qOs!7`SOV1|OU|^S6&f#-vJM4nunXNqLk&YHTE2D6Kzn-ydpI24-`|hN<{##pHUJ$sH|cw>~PI zjJAO?v}l2Y+Uv|w4L*b)5~6$vYeKKx7AspVVo?aCZfLryG3X=1SdYVZSi#n@h}w|6 zjO?eN6>5!*YxN=>GDr5WfBlPgafIq_l@@HjefxI1-LBW`?RK+VI&7S=eMl}-$dMS* z*4|;$oC@tEWG3aC-O92L1Ww_Bs3RN8)^4yyw?<(v-Qc0k3e(7lrIHb@>n5ug`dx}O zP@i@ZW(q2kVn|XUZ@*P2gmzbLc8emZD?XH~gpI>nz7|D$#hd8;)}{0Guhwm$4CgV_ii8Q(xX6J%ouRc>PVcEf}C;T zo3@>GK`w{Jk8vp*(QX-A&gZioMtwS+>@lyOGOdHQ);>Q!t)m(6?RHZWMOKi;czsPK zQiNRyPGgP#Dzd&_gV<8zOm#vI6ma~Sp4qlih&pt}`A|BFNeBlm4b_;; zau>Z1t42$A6%Fdr)_Ou^(-npm8``R0(`qrl(2p$0#wW|$!jz;geqc2 zd|&UlK$>^(K2uxLS7L6ctPZdkwCL`o_x|?w_Wu5E=MWr^M+?99qQcwT+m9bV@UdY{ zb&o#M)8X_Y*C!H9Vesf=(Gw|M8KbCD&q71eu>Fj$bYVH3o9+EN44VzO6duOt4T=mo z^bR3zM66e$9clxt9LrW^vQO%zZ1-jdL?!dtI%->z#wN1F-^cp%LPQwKp4b%nb*&5~ zr(7HB+^H~2s;~8Fx7(f1=f~smzyJHcr_<@}?ak^f>W(oiB~}e^1PBwI^p5CzNUAOw zp5fdt8(mGVCcj0(QgKtu9%V_J>8O)KIu;rmnkzxWfe_DZlB}3)^27~9DWzX;tdSNk z5Q19rU!NLKJr}R5z((II95SE-NN_sLYpMI!hF~pgpYg)Lg*%1;(f4$ zA%Sc%JgmR4Pudz-1NZ9#>7_cGP>ozCNI~ggl42RcCmx};>ClRm!qi)vrSPW8oVIM( zuxoloiWZn5pzeVDUD!7?@5$IWAoF*Xt&g@1nXI@W|Iu}Z&#|$uzcb({WoAZQ&@~jl ziey+B@(L*mgOFBYnDu%x-2r(e1wx00HbtX&UuWi_MH(>k8n?TdzMRd~WgV5$*V;%z z;e{+4at2L{{HU{roOgjq%e^nD>0|xjD3lGgEX zU$Rx?iT~9{L1euRVq}M~=Z$OqL|P7XLrtYcT8L4|f#%H&$qafaR1mhcui zxw`0zFpgY{)B;3*ui`X^+wbHQE;Kqb!hV`3HVlZm8%Y^)FuNEoDWB zBo(4vUsG#hw`#o&>=WPEQzfLnq4_ki7jn4X^3RPNlrtmHOf}J4WJn-3nHm)~wiy-> zNUfdPrc21$6nVze%*}n>dJ#ifa8k|_J|V&dm$Y&R-^~f5oXQm2)QeJ0>~PbzGYHfx zL{f{Ig#NZ9D^>%hTWY{+N9qC!Y_+BR4K{Mredv}s8#-|cxlHO6noyxwA#K#2I37A| zm5Rw5dpU+PE++JdMVS|pBcmLnHf^mI+A@^p=IELm*O2u|EY^E_HOtJ*$P~4GZK%o_ zE#$9BJ*?oXKSO4)4n*xxA3Y$D%-v%HvJ28%Y|jQv5Y}AdX-Gw(Gmf);L* zQY7g*^zv_ zNC;xseG!Y0$P_MQnQMce4o%jgKoFX$5movvG9m4SElHMy6&;0V7vTeR!UUm(wu;R{ z3`qsi>nS0myP?6;b>;z)7TR(b5>gyqK@VvaAU-^b&j&)YI1 zR2!ySeR*O^A`6Ye?aHq`Gj*GCqG+l-)=^OX_*e%Xi;kbCazt}T3-%&=)6unK-8URAY>zS{4u__g4G~g0mQ(+0LcFHK4k|J^Y@eMS zqsPr?P52kH=uEdQi2x0$^?Ms5HghtdRbxr=0BD*0fBb5k>$ti2-TC44HHS zE*i5H4ZPuXXsg8VNvB+3+me)+_?ej>#kbJ-b*%ZCkz|M-Bhkp!zZXsxLZ+Kd7PA<);S zNjcc3Of+OpjiK^KwJS4Auk;6;qzRNHlbyF*&oR!0)=R>|8vCW0t&Zqj!bOVECH;A* z9o`N@M1eZ8PhFQI;q=!Gs*CzX)Egh7=d1Z`%?kw{Vi;Oi*k;Chv1OO^L`_lA@Ph2! zbUVUK{72>46#qJm3`4t1s?kC%zQNqg2K!SJCmQ)p~8C`_otuMtP zBe9CoUyqRx6>>J245+y0+pWLXR&;UrVVg}eQx<4^$QmnRF1$jwin2*2;ZGgIDPJ}U zokrFsPFKZdVc6{Ji5Y=aGY-9ji&CY4cSF)h1JzE7He`*u2cyZ7uMVx(id$x-wE{a& z)S;-e_FL*-v;+sc*L@1^clZz~LenUr4vApVYB~ua*0O=Lh+Oj=zrblt3po@I?Q8bf5rTW2;;rLab_SbbA(M2AAP7MSR!%cBw7S|}*W zP4iHF%ii)q?MFE31rp}1@TA6>Z*3wwLfEM$Qzw4fT{{ipv7AHfUo6`!e??$&4~Pc} zvM^)2^;kYZ8hWG9O%O*4;Mk?MRW0c1X3Dc>^OSxNgiMda_F)WBqeXS`>sEfxHao!! z6;3TS#GwduD9Z3UoAi$8`#vF9uOY^&`fau+#Urf_SjcCcxPURX9h z@J%QZg<)|s)_3j+a#%msDYqiiA>U}ZFW5A#%%a+s>1Ik0YHAj#wCH(8wSF{Uh!?6v zX8Nz5|3nRxF0$bee{4f$i44JTgq7H(KG6aPElw0s^KOaM>KNc~LjEWr2-AvXqZVTu z7_AS~dp{nJyWP$XSF=;)GP)RlPoW)FC?TXFG(1GtN{3JK5?`E>&?9W>dgy48k2M5z zsP#ZJL|gdtl|!V+{=1}A+8F97cOq-~<`5BH-lWN!%GZAr&D44gn*rS;1H~W7_AnQEJx4ju7|ZbS{%x5KWiS z@lbu}bwZ%-TKf8Q9^xiSYlYLagVc_hRflS~2{7zJrkGiBfn-LYTJmP(46pUPs5-`~ zx+sQpoIqG=qq4trS_O6tAKjD9PYxZz(PwXMtux^eXyj1Ep&N9!!|ovR zo3?s9AWv?s*~hVLQOX*43O!(tx^n}c_GS3=n6#{GWh2;3IV(w647HnUB`@CY0R z96b%MOGR#m2OnK(bXW*kwS(^U5%|ky?by!Z>IcX|uSRK|sQ5lP0zl#Uw~U zjO-ABWUEu*Sn4ur|A8_@r?nCQnnD)d$;ANwx0c3A$aGjhMcS;;-;F~;q7L)t@Su%a())rvxD79833v2`}KMy-{eBUO^Rqi=kwXVrhY)0zR2InFQ)_NC~p5q)WT ztoKN%I|xm8)0c1BfO=liOR`Tj*S5BBycK$3ydZbqKw-k^E~0_hVt176rtcn59`J=t z3%0f*<(S~i7J-mYw@0d|sMdb+sjnKaRmNvxg>=?VD=ZKB2)IJSf?7`EQF97ODjLiP zFXRycaX2&aO&6TVfc0-%TVVD&0bXZ@t+Zr>lQmL%v}&)MKlMUKCrogEmE(`zJX1w9 z(FS@__sYm`>qy%c#?lx38dzPZ8`#&kLTFU5i_7Ig&;0x@0?*!cVFM;lhV_Wtkf53s zJs71fWFCqMwbbjP8CI$VQVkAWhd!+#Q^db2awHiGqPjU^SVHNL9a2j*!q6;3I2vp> z2hF@{=uij^166h@(u6e zCgcV?2=T#>+qN?tpXD|Y^yzf6?D}%KJffp^8t4oT9paf4^f>V%R%Rp(bO_a`)*j_1 zDy0gW8t?Kiq=g{}ArE=aHtV9OQXBp2WytAsjybgtuj|IzUb#&*$WP)%*d?5%QiISq zv6liz+x825#V_*+&Q-$7XPzNN88?W`F~;q7^Ge@kVGn-HFl-IEEm8DvIM5Sp)5#sY zduK^?hwYHqevENA9M0$S;c)o*^Cx;D-2;zI3k%-*e}k0;ytxNMI{*Lx8gxZibU}4= qXm4@=RcvKpWFS*{b97~Gb1Wc9ZeuRV9X@sd00007;vf|0d~Rn$p(VxD>8j zgMIt=LT7dwv+-^6N+Jpef7kLJ9*+mjtpS?&_VpVsT&$7c!jS+L-;9VM03wkP7A{%} zgXs)ir!}J_4Rm#Wz>FC)QCwPzy!`2mfClfz67==Qu-ms4l0e7DE(!Rr32<4mblC(V z(85Ch_FXd+MWJ)m*`k`uSH=X-fPIdJe|z@4=iq$Z2Co;XRElMtLf?^42={K?$R@xY zt6B=js;aUQN{%H70dBY3ac`Ofo>_AMmkWvRPACp1%pc#`T8;eK+*7db^B~!5+3thg z>E!!CBpibO_Dw;csksFWuir3+8cv-&K^bk$Y<^h`Qx`ku*5+trn1kQ$+`0i>(}Yi^ zD=ziI>2jk#+K2jw_XUC1jZN@Bd5Y?@XJAuo6y~e7*BGdY?w%gzKu3INh;B+UnZWU* zRYZh4_vg9BjKKQ-xFo=%xV&gJMuvyb@cfw|aHZ}x4p&z4dO!{7h4P$X{;H$h8Mwm; zC=OxcaOG2<91KBWyR_L|Fxiooe)(>(6UjNVpa30h0YRW*#~$=_cEI6u@Ej2#XBnL? z77|Q4;TfJz#_Jv(Q&*J3mY0v=`fEfYmq2-36A`0Aq*0$zRSd=kCJ2E8l}FI{@&zT7 zVg=2VTuYzPQ*tqqwdM%o1@mz*7Q>d+Mc5VWf!f!F>cy)NPw6=HDS-06m`qH%&TOnQ z0?|mXAaJVsDxN;LYsuP_+^xpP>7v2`1#n7!UrG#&83CW>&blRB)MOID?vH;@fF3Cd zuPGBOW1G3ohH3nnz?W^sh<5e<+c!8z)P#z{&Y&Q$)?0>fFh~;>MQi1v>o4l%dGq8D z=bu|}MvKtM@Nm}q!CT?-m1u7Z&^oK|=nW2}ld$g5W1K&ImO{8-;Ub#k?L(k7EAzRo z=~V+c@a^1#_V!i;ni}bQ(^en+cj{2$-7Fs>?oU+{?7<5E5`k#Aca*^Fx$|UYOD2-C z1iRdBdHqbWEtGAppmXP7eA&8^G6H+{#Gf4*`U&!x;+88!fDiuHU$I=Fe?;Q}Y?Vm@ dlLW?{z)z(E8L}Ip+Xw&v002ovPDHLkV1i?J^>qLM literal 0 HcmV?d00001 diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf index 91caa5c..c43fcf0 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Master System/settings.conf @@ -19,7 +19,7 @@ list.includeMissingItems = true ############################################################################### # Extensions are comma separated without spaces ############################################################################### -list.extensions = zip,ZIP,sms,SMS +list.extensions = zip,ZIP,sms,SMS,bin,BIN ############################################################################### # If a menu.xml file exists, it will display the menu alphabetically. To diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf index cc4eda4..99373cf 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/WonderSwan/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = zip,ZIP,wsc,WSC +list.extensions = zip,ZIP,wsc,WSC,ws,WS list.menuSort = yes launcher = wonderswan diff --git a/FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf b/FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf new file mode 100644 index 0000000..3dd442f --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/usr/share/gmenu2x/skins/240x240/Default/skin.conf @@ -0,0 +1,12 @@ +font="/usr/share/fonts/truetype/dejavu/DejaVuSansCondensed-Bold.ttf" +messageBoxBorder=#505050ff +topBarBg=#ffffff80 +selectionBg=#ffffff80 +messageBoxBg=#00000080 +messageBoxSelection=#fffffff80 +bottomBarBg=#ffffff80 +topBarHeight=50 +bottomBarHeight=21 +linkHeight=56 +linkWidth=78 +fontsize=11 diff --git a/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop b/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop index 191ad6d..a1ade47 100644 --- a/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop +++ b/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/NES -SelectorFilter=nes,NES +SelectorFilter=nes,NES,fds,FDS diff --git a/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop b/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop index 30f3c65..f904352 100644 --- a/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop +++ b/FunKey/package/gnuboy/opk/gbc/gbc.funkey-s.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=GameBoy Col +Name=GameBoy Color Comment=Game Boy Color Emulator Icon=gbc Exec=/usr/games/launchers/gb_launch.sh %f diff --git a/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop b/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop index 44ec461..7947d11 100644 --- a/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop +++ b/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=GameBoy Adv +Name=GameBoy Advance Comment=Game Boy Advance Emulator Icon=gba Exec=/usr/games/launchers/gba_launch_gpsp.sh %f diff --git a/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop b/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop index ec4280b..f8fda6e 100644 --- a/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop +++ b/FunKey/package/mednafen/opk/wonderswan/wonderswan.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/WonderSwan -SelectorFilter=zip,ZIP,wsc,WSC +SelectorFilter=zip,ZIP,wsc,WSC,ws,WS diff --git a/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop b/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop index 0f2f544..c820074 100644 --- a/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop +++ b/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/Sega Genesis -SelectorFilter=zip,ZIP,md,MD +SelectorFilter=zip,ZIP,md,MD,bin,BIN,smd,SMD diff --git a/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop b/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop new file mode 100644 index 0000000..75da2de --- /dev/null +++ b/FunKey/package/picodrive/opk/sms/SMS.funkey-s.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=Sega Master System +Comment=Sega Master System Emulator +Icon=sms +Exec=/usr/games/launchers/sms_launch.sh %f +Terminal=false +X-OD-NeedsDownscaling=true +Categories=emulators; +selectorbrowser=true +SelectorDir=/mnt/Sega Master System +SelectorFilter=zip,ZIP,sms,SMS,bin,BIN diff --git a/FunKey/package/picodrive/opk/sms/sms.png b/FunKey/package/picodrive/opk/sms/sms.png new file mode 100644 index 0000000000000000000000000000000000000000..dadb1c07f89acb29ea1ad1441e7883817338d140 GIT binary patch literal 1007 zcmV7;vf|0d~Rn$p(VxD>8j zgMIt=LT7dwv+-^6N+Jpef7kLJ9*+mjtpS?&_VpVsT&$7c!jS+L-;9VM03wkP7A{%} zgXs)ir!}J_4Rm#Wz>FC)QCwPzy!`2mfClfz67==Qu-ms4l0e7DE(!Rr32<4mblC(V z(85Ch_FXd+MWJ)m*`k`uSH=X-fPIdJe|z@4=iq$Z2Co;XRElMtLf?^42={K?$R@xY zt6B=js;aUQN{%H70dBY3ac`Ofo>_AMmkWvRPACp1%pc#`T8;eK+*7db^B~!5+3thg z>E!!CBpibO_Dw;csksFWuir3+8cv-&K^bk$Y<^h`Qx`ku*5+trn1kQ$+`0i>(}Yi^ zD=ziI>2jk#+K2jw_XUC1jZN@Bd5Y?@XJAuo6y~e7*BGdY?w%gzKu3INh;B+UnZWU* zRYZh4_vg9BjKKQ-xFo=%xV&gJMuvyb@cfw|aHZ}x4p&z4dO!{7h4P$X{;H$h8Mwm; zC=OxcaOG2<91KBWyR_L|Fxiooe)(>(6UjNVpa30h0YRW*#~$=_cEI6u@Ej2#XBnL? z77|Q4;TfJz#_Jv(Q&*J3mY0v=`fEfYmq2-36A`0Aq*0$zRSd=kCJ2E8l}FI{@&zT7 zVg=2VTuYzPQ*tqqwdM%o1@mz*7Q>d+Mc5VWf!f!F>cy)NPw6=HDS-06m`qH%&TOnQ z0?|mXAaJVsDxN;LYsuP_+^xpP>7v2`1#n7!UrG#&83CW>&blRB)MOID?vH;@fF3Cd zuPGBOW1G3ohH3nnz?W^sh<5e<+c!8z)P#z{&Y&Q$)?0>fFh~;>MQi1v>o4l%dGq8D z=bu|}MvKtM@Nm}q!CT?-m1u7Z&^oK|=nW2}ld$g5W1K&ImO{8-;Ub#k?L(k7EAzRo z=~V+c@a^1#_V!i;ni}bQ(^en+cj{2$-7Fs>?oU+{?7<5E5`k#Aca*^Fx$|UYOD2-C z1iRdBdHqbWEtGAppmXP7eA&8^G6H+{#Gf4*`U&!x;+88!fDiuHU$I=Fe?;Q}Y?Vm@ dlLW?{z)z(E8L}Ip+Xw&v002ovPDHLkV1i?J^>qLM literal 0 HcmV?d00001 diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 1b17d4f..ebe1a6e 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -47,6 +47,7 @@ endef define PICODRIVE_CREATE_OPK $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/megadrive $(TARGET_DIR)/usr/games/opk/megadrive_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/sms $(TARGET_DIR)/usr/games/opk/sms_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef PICODRIVE_POST_INSTALL_TARGET_HOOKS += PICODRIVE_CREATE_OPK