From ea0c0638ac8e069f26ad1056dbe08962f9b16a04 Mon Sep 17 00:00:00 2001
From: Michael Moon <triffid.hunter@gmail.com>
Date: Sun, 1 Mar 2020 08:45:20 +0800
Subject: [PATCH 1/2] Bring repository up to date with 5.0.2 release from
 mods.factorio.com

---
 auto-research/changelog.txt |  10 ++++++--
 auto-research/control.lua   |  47 +++++++++++++++++++++---------------
 auto-research/info.json     |   2 +-
 auto-research/thumbnail.png | Bin 0 -> 16763 bytes
 4 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 auto-research/thumbnail.png

diff --git a/auto-research/changelog.txt b/auto-research/changelog.txt
index 14be59b..7581e86 100644
--- a/auto-research/changelog.txt
+++ b/auto-research/changelog.txt
@@ -1,11 +1,17 @@
 ---------------------------------------------------------------------------------------------------
-Version: 5.0.1.
+Version: 5.0.2
+Date: 09. 04. 2019
+  Changes:
+    - Fixed setting research which broke with Factorio 0.17.26.
+    - Made the research strategy options look better.
+---------------------------------------------------------------------------------------------------
+Version: 5.0.1
 Date: 03. 03. 2019
   Changes:
     - Keybinding (Shift-T) should work again.
     - Filtering search results by ingredients should work properly again.
 ---------------------------------------------------------------------------------------------------
-Version: 5.0.0.
+Version: 5.0.0
 Date: 03. 03. 2019
   Changes:
     - Updated for Factorio 0.17.
diff --git a/auto-research/control.lua b/auto-research/control.lua
index c184b62..8e7fb0f 100644
--- a/auto-research/control.lua
+++ b/auto-research/control.lua
@@ -218,7 +218,9 @@ function startNextResearch(force, override_spam_detection)
         end
     end
 
-    force.current_research = next_research
+    if next_research then
+        force.add_research(next_research)
+    end
 end
 
 function onResearchFinished(event)
@@ -287,24 +289,31 @@ gui = {
                 style = "auto_research_header_label",
                 caption = {"auto_research_gui.research_strategy"}
             }
-            local research_strategies_one = frameflow.add{
+            local research_strategies_outer = frameflow.add{
                 type = "flow",
                 style = "auto_research_tech_flow",
-                name = "research_strategies_one",
+                name = "research_strategies_outer",
                 direction = "horizontal"
             }
-            research_strategies_one.add{type = "radiobutton", name = "auto_research_research_fast", caption = {"auto_research_gui.research_fast"}, tooltip = {"auto_research_gui.research_fast_tooltip"}, state = config.research_strategy == "fast"}
-            research_strategies_one.add({type = "radiobutton", name = "auto_research_research_cheap", caption = {"auto_research_gui.research_cheap"}, tooltip = {"auto_research_gui.research_cheap_tooltip"}, state = config.research_strategy == "cheap"}).style.left_padding = 15
-            research_strategies_one.add({type = "radiobutton", name = "auto_research_research_balanced", caption = {"auto_research_gui.research_balanced"}, tooltip = {"auto_research_gui.research_balanced_tooltip"}, state = config.research_strategy == "balanced"}).style.left_padding = 15
-            local research_strategies_two = frameflow.add{
+            local research_strategies_left = research_strategies_outer.add{
                 type = "flow",
-                style = "auto_research_tech_flow",
-                name = "research_strategies_two",
-                direction = "horizontal"
+                style = "auto_research_list_flow",
+                name = "research_strategies_left",
+                direction = "vertical"
+            }
+            research_strategies_left.add{type = "radiobutton", name = "auto_research_research_fast", caption = {"auto_research_gui.research_fast"}, tooltip = {"auto_research_gui.research_fast_tooltip"}, state = config.research_strategy == "fast"}
+            research_strategies_left.add{type = "radiobutton", name = "auto_research_research_cheap", caption = {"auto_research_gui.research_cheap"}, tooltip = {"auto_research_gui.research_cheap_tooltip"}, state = config.research_strategy == "cheap"}
+            research_strategies_left.add{type = "radiobutton", name = "auto_research_research_balanced", caption = {"auto_research_gui.research_balanced"}, tooltip = {"auto_research_gui.research_balanced_tooltip"}, state = config.research_strategy == "balanced"}
+            local research_strategies_right = research_strategies_outer.add{
+                type = "flow",
+                style = "auto_research_list_flow",
+                name = "research_strategies_right",
+                direction = "vertical"
             }
-            research_strategies_two.add{type = "radiobutton", name = "auto_research_research_slow", caption = {"auto_research_gui.research_slow"}, tooltip = {"auto_research_gui.research_slow_tooltip"}, state = config.research_strategy == "slow"}
-            research_strategies_two.add({type = "radiobutton", name = "auto_research_research_expensive", caption = {"auto_research_gui.research_expensive"}, tooltip = {"auto_research_gui.research_expensive_tooltip"}, state = config.research_strategy == "expensive"}).style.left_padding = 15
-            research_strategies_two.add({type = "radiobutton", name = "auto_research_research_random", caption = {"auto_research_gui.research_random"}, tooltip = {"auto_research_gui.research_random_tooltip"}, state = config.research_strategy == "random"}).style.left_padding = 15
+            research_strategies_right.style.left_padding = 15
+            research_strategies_right.add{type = "radiobutton", name = "auto_research_research_slow", caption = {"auto_research_gui.research_slow"}, tooltip = {"auto_research_gui.research_slow_tooltip"}, state = config.research_strategy == "slow"}
+            research_strategies_right.add{type = "radiobutton", name = "auto_research_research_expensive", caption = {"auto_research_gui.research_expensive"}, tooltip = {"auto_research_gui.research_expensive_tooltip"}, state = config.research_strategy == "expensive"}
+            research_strategies_right.add{type = "radiobutton", name = "auto_research_research_random", caption = {"auto_research_gui.research_random"}, tooltip = {"auto_research_gui.research_random_tooltip"}, state = config.research_strategy == "random"}
 
             -- allowed ingredients
             frameflow.add{
@@ -433,12 +442,12 @@ gui = {
             end
         elseif string.find(name, "auto_research_research") then
             config.research_strategy = string.match(name, "^auto_research_research_(.*)$")
-            player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_fast.state = (config.research_strategy == "fast")
-            player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_cheap.state = (config.research_strategy == "cheap")
-            player.gui.top.auto_research_gui.flow.research_strategies_one.auto_research_research_balanced.state = (config.research_strategy == "balanced")
-            player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_slow.state = (config.research_strategy == "slow")
-            player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_expensive.state = (config.research_strategy == "expensive")
-            player.gui.top.auto_research_gui.flow.research_strategies_two.auto_research_research_random.state = (config.research_strategy == "random")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_fast.state = (config.research_strategy == "fast")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_cheap.state = (config.research_strategy == "cheap")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_left.auto_research_research_balanced.state = (config.research_strategy == "balanced")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_slow.state = (config.research_strategy == "slow")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_expensive.state = (config.research_strategy == "expensive")
+            player.gui.top.auto_research_gui.flow.research_strategies_outer.research_strategies_right.auto_research_research_random.state = (config.research_strategy == "random")
             -- start new research
             startNextResearch(force)
         else
diff --git a/auto-research/info.json b/auto-research/info.json
index 747a855..0b881ef 100644
--- a/auto-research/info.json
+++ b/auto-research/info.json
@@ -1,6 +1,6 @@
 {
   "name": "auto-research",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "factorio_version": "0.17",
   "title": "Auto Research",
   "author": "canidae",
diff --git a/auto-research/thumbnail.png b/auto-research/thumbnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6d26a45bb5117d7f4580e6cc3babb98850bf8e
GIT binary patch
literal 16763
zcmV)AK*Ya^P)<h;3K|Lk000e1NJLTq009^P001cn0ssI2VZEVe002QkNkl<Zc-pOf
zcaUXQdFL#e(S(kZBw&|XYS&(;a&6Tbjf6Da@7;Xwd)*VHNu7Io@=W)1_XG*a60k-F
zgtP(?%9x-4va*Cg7*jR^jKTKWWR&A5qX4oophVc;_xpY4bxX#7prz|p*L(Nfd+vA6
z`Et4oHde3QH<HfIPR<;hJnPWZnKM&|4^1ALnLKjHKFrKa&dyBEOiv!3o}8XJFmv$0
zVVuF&!&A8C&>_3*DDIk_Iyy6j^LE#fDg2-1jfZCa%GpDcx^V`B%uJqn$ganKTzS^v
zsq>D`oO9&hxkskYIx=-uc<y12aB$|p!Rh^nrVkvQ*?)N2jw2Z1z~1TodnfnrJM+lQ
zk;5}H(^Ipv2hTh@bNKM|ks~vQ4^89b?4jv{lLrnS+&?+FAF~4tn1X?Nc<RXP)LAq3
zptBDj#M95@$+M0g#F?WQ>fj_Uz|(CV4ox0CJax|D>9fx~_`lCQ^wy&@uL}MHcsj<x
z`NM}Nrw<xbSQ%V{C7qr+Ff)Asu)XE*L5y~Yt8@sLP1|bQf3EXy3Vz&(L5>`qIy7xR
z*@I>cq{FjQ1}AoKdg>523-I7d-|p#2JYqI%x9#J!ZLUE+GbQkj&Q2MqJZ!sXCk>Zo
zCeJx^@T^(GtJ#AG3`1rov2+^8fIMiEI>e>GaveR&&r=2o2Ep`?9G=3+j-RtOcl&jQ
z$3eq~naO?A2lmYz*mr1ZAHVLMo!mP;x$o$anWI1hfHw~}j^O{{X?zCQwvyNsf{k^<
zXG{lx9XWzqFjE5+|AE_od}R7C=Z-U&!dng<JoAXbd30uSa%%7T#+qvF>ID;n@znl3
zW5e6VMg~TQw@nNW3=eI^*X_dtJ4Oe`hX=;S2FAw*#)h^H4{seEwez@a`{=;v$hP5;
zZ6kJm+wkDl(ZOx_)lTC7z&6~7ljEZp)-E2l@wai1Z9_v_2Zpvxj124;8`wT(|96fL
z?%Y1OYy04i?E~XO+a@^p=s1o6JYslg8=g2iuw{5)^YGS9I7SAyjE@WqY}q_KxNU4~
zXmoT4|3`)gMn(q5$MAW0eEabD*znN6*1^H8m<}$+m=m1K$ne$?j5cVH?7&0E26v7Q
z>>L~1zTK|bJvxZFj{=4<gJEoRU>ui?4D1>o+_z%{m;GAskBr&H2LFgXad5~MaA=SK
zjN0m9tpFQV2@@O}wVC1?tn<XgfGsSp#0ujl!0?-be{h?h$DR&v(<Wk}0M#gm#k>p$
zu-DwU?Lz|?O#qDWMj!yT(#9FGUAFxlBj(_zkpawNWYp$`^Y|63v2)l4+%+<|8+(Km
z7_uA3#_R$+56H(1@|{37d>A*VY|BRNxmX1J3NTvusbv`-+B!0@g#d3J*=EPsz~<3y
zh8{!PaDHHD>*f)A$`J8kXjr&0Iy62$jIY~)8-s=wTy~q6O={He6aTR_gF{=e0(j^+
zAB}Yz<wjsJZP~fwV+3z-X!HO4!{2}78<#BDH8C<gxVhOVioBks^=2NWX+4kYd0KDe
zQI$o_Dk||IjiRI%ABwbYM_x~pT9Vd^D#Bf9QqK~*J<sb&QY&NokSF%PNa{sa&ocWp
zihGN~#>6!kq$=>N+PX67E91UKj0ZI{`?XO-00Z}CMLmmaxDhAQdQVd8$#7%bgQF^w
zB2Usd!halPkrYLeMD-+%vJ7A2GPUQXS-sIrn^oH6T<lCz%Q*%7$D{GYb$PtLN-6>-
z0C1V#3kYMI2tM?eaf#{tn((J_4Yy<U3NC3`MtNofVjP161C|lSY4X5NS#Fm#F<MS&
zQ-9)b3VuL>r<AGfsXZ~Zed)_%>@^PTBSyxr2ACao(snkhM|>_O9@lFrcf3j>Y;Mj?
zFE}Q?R=A~#43}aXxdHIX7*I9SsK1DdqTWaeUSW^GN#Pqd%TOziu#){%To!eWP$m%u
z#MCnGW@ami|GgE~Kk3b*o;2#s<KC>^ljDf(Ow`*0e8}@SOXlH5p2WnBvP_E<xKvB9
zFL-*HRuwSE#>W{<Q*+52BqCl?!z@ZX8gopzp<J{q!aCIAq}I`Xe0#@n3$~9B4h(L>
z)di`gK@7-A37kp2S;aPVTu&k!q7iV#)>q5TrL^tAS`<cUwmO*s0ldLB8yb<KKu9Sl
zFsj*725c~#%M5k!Xk6S^*iqTC*7L%yNr{L#<_RE+81s*NdotVXIL+dm%T$$VZuku<
ziX&`c7N@phafw|li63zt8`)RIz#cIOz;DRP!Lfh%j0-mR6&oArI*iHHG+vMxz*tit
zA^>|e@N*gQAW@DH5;m!@#W8#;4C4(^$Z=9GW<~a73l41ijl$m`35l;^`*0Xl)D1rj
zW~^#N2s3-Sk#TO2;1;maf;VD18R;jB>;oQzDHvj;PVJbQ5D8z`7s<Ltys=0@^BYL*
zr2tFqxed}uPLwT$IYqRtN*bjh7^aLzXc-MZvpVUvmc_l5Eq*PFjCgP|iF#8|QEFTR
zgoNeFGsle_T(wN_6L15cfh0v5;{ftBah}}2Y(x+VfG19R#itCU#3!Zw%J?4~!G6l@
zz#L74Wc3wYOFBCiF4#UcI5@ajJkstgjA8U;aUT~2T*uahEH)$RR9YrHAhGo|-V7qC
zBCWm{Y9fpwC>zTZ3=c<15(Nd@&ZW-YGVTFZ%2;L*W8KTt8EQceUGM^|l#L8IV_Xe_
zrxpR5^CU~-l#B<f2GYV$abioBrg0n@*TLg3i2aWZ?eG*pg2BNx0RtX~ubQ=S2jF65
z^iUDoj7g_F&#$<0y^a5B;E(IQxTWAC7i4>6z>dcl$Ci--JmU%%1l4FMwdMT{!k=;1
za?)675|x`3lPSdYDvpx6G3JcyAI}A~gLfoZO|)l3o=}Exa2qExvQLQ{_QcGv#fYl1
z&qA0Dkeo$iVw04g8Bek6o5o>ne4AGlXPgKm7#1xf>#17eD>0JJT}t4mUQiK~6r&~J
z1~vj@W7otu2{8pJlm+4eOBIsfn$lL!=qG|G6C|8eN>agUYYN7*sC)r?HEZc>5~n#u
zQ)#l%<k-sYrOVo0vtSqW%`ImbF;JeCJWLq?Yk|<0qEb-}z|Eq_m?{JS1*S&5*i@--
zrU9Bzvdg3);OI+Z<5J*HRh&~H%u?q`fE$O{TWK=X6ayT_9^zVRbRQWGB~F|LSO`@(
z$RA@fSUa$mEP>dLz*8ZPKtCX$-d<>TRf!)Wn@eu|qmMiiN6Dv~U`cBd6!^8t<<o*1
zwA5|z+=O%}L^r;kzIynvP*}05aOBg*7+q0DVOXtg>quiKs^2X9CP)k0nvBo_X6S5C
zH%t?WOzsu@Z2M&bpAZ&7aK%*iI13Xv+*UhCYy}qqa|FTQfUXM}XcV41@);}1T#V<L
zBMAT~t4Na8#xKdT2{Xu}lI}-lolD=tNyx^;G`h657D_(Ule7*#8-q?jNM*o{j7mNf
zJPezPqLLWQqETiza0UvV5h~?`fX^sx8su@(X>C<`roo+UQpe7XE{tx0|JdkN-Ahd(
zjgJj(+p<YpixH`rNFyYNgZ9iFg0wBAc_%iC*d88_JtzuSbEWb%NOkr|s((!~MJy|h
zs*HSVNr5ref)tY4VGErShKhntjNcYiJRmjw7;6MVl0{_V+lU7j0|r~BwQG9|=y*_z
z!AP<=reFjTKo_iph2+_$9Z|-LZDYT|Wrgk;_gH+P5;}5Iv0gx+^=0z^1AilxnpAgv
zrm*#_Xf+9|a;kr(Q`z{G>N)Kbz@G*9OV{oU{*3IC@XJPZ_-TffR7<j#!!KehiQKlc
z)Xk(~6p|9$xCRx)CPj@?5%H!Fea1$XSxjX$GsCaQ=IFMsH1$jZN~=-GawexJa_1Bc
zQ}ZI(jZjUE{y~S8U7r#`Wt-)cjgFtTZncVPFeInh%u!EPUz^m{roC$+ZGaL&3~<;4
z#z+#uGy*;VH^5%=!mvW90;R_E#>7=hS=4w$vxsftxq~fnBGa_unpY&Srio=!A^>Ms
z`{K4`$1T_izs$fU(21Lj+?YOU5w<AM2WU(;Im43Dki-i1X4i<#fat|LG4qlOWcDjb
z2>QA$Xk~|_vtvwb>|BgW`yp6q<N8V404%8SBs|@e+C~FhCdzVKtc0A##5XCYuw}9j
zjVd+Co=|O|YUCO@w+a)nZA+cCKu+4i(WY$K@pe}l;2~hfr?Y5%Bl&gVPiewp7NP{v
zv#jSzB8d1QL#v=ypig9$x<xM8^()}#?M+zcxxp`bmUwKzU;aDzv1=(cdn1p8hL9W>
zq@tWeB{>6@O4pHXcPcT+0SQtBLQ1LLm=G@AW|K9Qr%suig2Qk2nB*rF!X%oLP8qqC
z>4ZQ+;-R!A8I6s?`MB_t)DCDt2E9qW2c8ccrjEwYLIG5bN<I`5Qc)a{a*VeEHwxkj
z)PB=n>h)T!H=`%UEj?QGKz`vvmAP9e*9vfXB}>F^%uJ%NTG_dzz3sRKyLJqX4Q-KE
zC#Q8((ZNy$kyj7{+!IB6U>%HmBI1TBZE(d)3TU$jXp>d41h^a}aU$c+K}2A&GPyo-
z=bag~^HiuA6C20^^VIz(1#zy=a46{mk$`!ZNm->7-w@~toOdE8e8wW#5)^SF7YM0H
z-VT5&HlN8=koi9K(SDGgQ&P-2Qzwy_u1gP9MNRe9!w+gHZIK&PzGEW&9BPsQff$<d
zo@F)nOyqJ^xd1WvGdFzobcY|>fA&iFvtJ2+=3>f)RaE0;b%_`0e$>EelSmfHsX!xH
zx+@^*GfM_gQ7a*Y=HN;>8quAr>W&RKDst+65CS%ZuvQ7zD&cej-PS6iVnG3J+6@^;
z3qSd|-ZGOHr&jOniF($WgTY)N5x%ApN@+~f2wI7g6HukM7h(x!Go(?i-qV}VA&h&V
zS!6^8xjjo-F~Ol?#FNJ^6-}k0sI<i_oB}~e-R%pFkj4kMNa3l11}wF$pt=G>S=Ox_
zdZy9laVhLf-Lq$$rX)v6+$EKB(VKEqkO>)6(N83FS?%s2N!@KFua4+2rA&7tn6%BA
zq?r+UYTi{7*^vn!^Tt4Ffn5X*0d}n+YnHi}Om?tHTDnJ>xz1M5StK<{64-ej(VAW?
zDdk4SX4WUK68?tZC&6I*r3UB0mo1#OMJ`SIf`QST4?maJ;7?u#zkIc2Fjveu!9k?0
zm2#I8{&F7tax)kWa9DYabQGkJEUgEzR;P2QSKc{nuIq%U&r2>x+3RJ{HDptX&)R6g
z8Wcy<6XlUIUmOV!4jar1W)d`595~;nWlU{+5E7Qo@RKwQ*I$Fq3Hps|ajmD`(*yeH
zUAtDEIuK0H+O?_iRy-Q2IHZ$t+d4#0Z>^^nk1!#|?ISUhoB&3X%N3isC3lF?IW$5S
zK@d}AEaR|2jk-Z3$FC=JFFmnqvAMs8w{7<52Q@<50D1+A5El~88PA}wZkPcFzgZ9X
zSwreIRS0qGrg&aJGNC3YN?V@LMi&mHL0gajRFuQ5y4=lW+XfTdW(8)%p$06pA|~H8
z;(=&tHnN=haY|#ipFyOYC@aL0lIanE@MwCU&1x@#PE{&W5qwQjjsaDlD2>GSYT%D*
zv}J8Eh4jYHd@k<oEW*WDWVo%$)Mb&*|A+AB^We{427gJn1gVZ@Pf#m7=$E-|P(<!r
zr9x#++JX@k^Jp8Q!#u0WcFMStK=+a!f9Kpe9SkBKxp2v7nz^ep7{suG4{a$abkewn
z;--Og(YWRYs$vH81QZPBwD7Z!dTd!b-6r*36G}!-YippWS`Ff+XKfEO6X+>9{Zb$y
z6Xg&>r-9yjK~F|fwO)`@L3u03pe&bu2s9dj2_5d{F6J7F$yRjG;~KyKmS;GVN6Xun
ztY}}fVEgt#WDHa^F(E^3u_#72&@_@3QM7#D)RAOXN+~Cv#cqcQ`C>-`<2|t$Fe4#k
zpD9^&QYRe(Ttom!Ax)yidYXFpV0tP?!_L8B)kn!DqqbolO!7szl}xn*r%%@P7dc(t
zB@O7zR<9TSfKuA6T+fMXMEamrC@C;oM&x=7RVDV^+=Ha_WE#fH3-@Z_kLTbQq2?YA
zs(7P0i@CODPs__kW;q}JJixCHRpFB4SHj;E{IuCbv4Y>kbtXeD${DE1B}f@fhPkD1
zvm{=cxYZOwD<NP7l_X){)de86O2!FIE2DHuNgg1igd9!&<(MCESr)>$W<1l_b33B2
zYn%lu7()_ONZRyC#V09#OKvnh6R?+hK_u|lLRIVS>4E-co?JXCiNR;_%}A)%t^t|#
z^!B(QN?dCdR+v{dG8IfZr$nfmCk!wMwK#q56kS;-b}e1qdHjN%6UbuOY<roTZ%r{~
z?7@a2bzf~^^!m$re?R&0kMFws&Ud}@9j3OyMN?XQpiy|>q7~9ExwTr6ti_(On)D8X
zEk(o?6PKk&SEK?ph)hB$kPyOo(00~Uv2rX5@~YUZRdaX3I)Y$?&tP3&UgS>ariZj-
zH)%ejYF>ubse<2G>*XpLd4EovDClBV4u`mPDxd6c0)83vHjzw-Ubozc!W|X=5&R4R
z&FPRWL&(FsM63q=+6pG7c_6%b@EZ?OI6)R&R8tm<{Mzsg!Q3i1U>$)PDtH<BW=zjy
zWkKfzJ8qj^c)&{NC7rG1AlALPM`>zu*v8_&@-=fbV>G1gX71LVg)Sw}xi97}CW|p~
z#8{JYpWG30&#vvZ7fcm^JKI!lXnQ>%R3oIC*-&tl!_ft21itjfy*0=t$Ra#6W2o9i
zV&)cvQBFj0#4RW?Dz{W^jOrqVh$5*5CMVMR>dvLzZ3`Fd7&AgD>7O;jj@-9&XR$}A
zz!e1dgAd$)*PVAf`sgG2dcnKTm;2ak60+ewy2VZRb!V>I`e1muG-(E`Of)5~eSuG7
zv9ci3D;m%xk*S})_|1(RnlU8ghGx=Q!M(dCEEr#ybdrgJ&;6jKEG+TP?Ix@Xm&;ft
zs7&(0*-T4?4(QSiUM42g)LfO#ET)0afDNmxF?a6V{;J`3uy;?$25ZvEt7Weg#1tWA
zffG||wcyVLe>MkyJ`aA=$_RfF;Lij672y{PXTnik9uc|V%~wJ9Qqx?uF@&4UBq9(q
z8<Ybfo529K2Z@#xTrQ|{Dt=Wl3M6TqD(i*oEab!OkVP?>5pIN#$jGMW!uq+Jg;kJg
zP5J{%X~M+MJg{c1=kA@`rF|%(t&ASU;_Li_3fBWk6~V~Q5E(-VR4mE3iOhR4vNCro
zv{333=>!n!LmvfoK@Cd|D!FI-bITxE-XYa)cyMsbri`=gXEsnD_fMv_5GxCC@7=kb
z%2jmbm6zk|J@?!VGK(2fkaqz@wQWN`ILCUWw~-n>il2EVk-3J+*BRKN4>u@L65=xB
zY!S&{k$0n^6t?pf+_Bw6tzB=EbdCt6v@dTFlGtG*_g@=jP_+vhCvt~mzSFj#rMn7p
z>hxl$eOwct{@#gS7yfnq4Z*Jw_V1a<H8OWSV=9Uq4+X8SjErAqkMy4gnYZ9CLvT>=
zmjQlJeo4%hh%nbS)e^z4u%?od$`D>GX*fxblFHX$Qk=5AWC5;Q*O00v<w9vh(Ch5_
z!oB&LkwUAcGQ}<iv!J;V4WcxJ;E*Sgrk?vF|9By3nfjW@UAcaJ!+2BdOMz>EpPW~%
zwIjQBZMPj^;)O*TfQ=y6Iy2E2M3R3zHpvt9HFLSgl<d=>odZo+p(=Uj6551}H(01p
zVLh`}EJd!@oSgJ+$`9Ue=6VEY!>SGt($L_xt(z1OWTumeT6YaIaAAS%KuG&`PMEVH
ziw+*#hp#{V=}(0L`t^#-KmN!g4_$NRCz^D|U;42>fAafJy!6sb-+$tX8*aF^udl=k
zV$}u)&iKL?{`!YM{2_jN_St9exa0PBpZ|93^x(Elx8C|Ut@99lIA54!)Sd6R_m?mK
z%gHB{)|67?dc_4oam?ZqpSbMFC%^x*pZ)BIKm5UGZ~64;>q_B08L%nD;GM|um<PZQ
z@4Vyo^Z(@SK;Ku4SupkMyz}1jt#5tv2S0e`#TQ@v@sEG}-S2#B-<}=HI@4uWUUBIo
z4?pzDPh8$tymEw8PHoOelH|N|UpCrzzWpu8E~XdE={zm$`Nr4(8S8_~{_!8aHn4eP
zM&DOn)<62u4}YHv{=^fHUw_>-8~WhUtY3ZACvnSXKK&_E8TyK!|NQ6pdhx{<z|5PS
zK7h}-1<0pBenOt8r(AmJ#~ud!S6*%@LTT+|Ves!i@%T;GU$=R^5g0HV`PW~(^>3bS
z?dI*bpa1r^EAaZUkI&t5{SDVPKo@j;pYz9O&7bVIzimrbP%+k{FTecbc=RVead~QN
zJ-h0vD<6OCF^uys|MKkjzV|)(?setgf9<OnhfDGISPJ<|Wkh*SVDNdu$Bl?>e=|>*
zMlAQKygm}SGQ$dHGdLro@Wg*Niim9T=rkD5fJKUvaDT6YL>fm{`qoV;<Iq$^$o}ct
zrc`AzSX65%R5FpzJUVN}(ocSZ{d)y|UumclfA~X};Pdm(KY#yy_dfUBbNKw}Pk&0B
z35%$oAkZFo;C`&mRiC^ZkN$QzfA76_AA9ftod1g}E-#pxsni%e=*~Ou&{H0`-;_+V
zlmbRdUf+3#UvU5Z_u&FXmOpUG#W({Tdg$1(7hZS)pKreD2B}QVkX?#te)F5(m;>y7
z1MJExE{D2u*UKN85wR|K&$|E&9)~ly(&Y2qcgaIFe>FaN#btQJ+z1ccf5#m*LK%EP
za?)IM(YrB}9bvS)@4Ab6S0v;xGc56uF@<Bt9t0NR^XEVJS(#_=zvR6H{<-_Yf`9fi
zH)9{qf5+SK`CH%oI&f=xYQILf`BOK6%U*Qh1^E26ul}9#U+K28t)CD76`!~ag!F;;
zzxNfpiNWQd)2_WRZ#S>J;xY)0_lH|r@Z9p5o0ai=!3A789C!I-@4D+QrIpNo^yODv
z28MObRezzck3IUxz4zSx#N&@E&ZCph{q(0m6)nYIeeSdFjih6p4k3@Q7peO>Oy;K^
zaxlGD{sUTWVFgGkmQv{cPq_+3oJz@WQpTFpDa=q@(XnJz$MFj$Mg});IYWZQoJ-7c
zwD?`zGj`g^J5N4o;^a4NU-L)5y#00@=bgTB@0-`mrtx>Lxf)-;ckMNM)~?yTc8z}h
z@&`Zg?%{!bJ*VKBhyUtxIP<=p6MIivbIGm=e17(8U)%ZSlXjoF<^?SM?YIBqr5~S;
zd+~MG$tUeO^<-T3!neMK^Z#_&$ET8>eQQtNecBp3f9e`sgI{s)u2b!HJ?rh8HtsoX
z&Dfj%XcxwOGp@98cAj$5uG3D^1#dllqdo4FH9Jl@>7maVFxS5ITukSKyLaF-p0)S1
zllQ%O&AwCDO!S;mr52t87GgiX{H0qru5UD%d1)TPe2)L^+F^E==djbvP!{I&<X-#=
zmf55eTo>PR%grcdTUVu8^f?<Tb!A4*Xa#&4x%&Ws1P2c6(P;9R$q8OjuXDX%_YPp>
z#TOYFJoV(06@8)i-Fq*-o^$q@82OyDkK*$Wo_Pi%BLxhfpMLr&fFWYT-|e^EhAqDS
zx~mOeFT0c)OI>097LI=AGdH8)udr;a2=rrvpK~T;`?+s9Q-eck1YUwv@b!ydytUca
zz{*gBTA1WM-g53aXMqF0^=!N48Nidf@5|#(MKm?7rF&8Oq#ph0n?E%@y}zgsC#*mA
z=%YAu*`*)N=}MK8u$;3sCXkVI(R<#F&(JuK`z<3PNzB2W1c!}sl;A#52(^&M2+Eu5
zZ>Ahdii$6nWMQ84lz57&GW{!NCo|8`!}{GFOS%w{ofx$^l4}vt_^I%KioUvP<%4Z)
z54J7C@ykE>gI63s|GnRPeED+xbS(V(Sa<g^e#L=b|NZqE>V@C_ZJqhW@BcnNKl`6w
zkEa~_Rp*cKydUlUVg9ooShnoJaKVG&|I2|f_yx=pE0*KTL+$Ol;L)y5UH=cOSB{;!
z2L4kpRBg{Me(?*)uB$$I#fD}k&wgv$+y`CMC&q^U`ma8B$L+U)M~dT`Cdq|%bl)?f
zc)tvrml0Ct_C`wO0Ut2h=RfzCx8Hu-<MT$d`UvKFo260CqsCp^LF5Pb@5W~^WBLPX
zlC<;xfZ~0OAwqG$j80!y;St8#AA1y!fT;s@2w&g!wsSnsfLRWpjrn%GET~^OILu(+
z^n>#j4RR9t7_v{mBYx#A%B~t48~ps|Upd((ZQvHea`UOEgQ4Ke^wd6~Wh)m+SMJy`
z4qV^Af0vfR^f&Wl+C<=^OPSRUQjzCSp)jTJsRANPJrOa@-6dPi%Q>X-W%5epA<7|M
z-%L(#WQx?~^jLIvF6po`ijl$5q0KFS3y9Kupk+LM>d9YQz4F2Kmk|>1`}yDct>^yx
zfBVrJ-T+LspW5f)?(*&yHiH;i*X#Jn8{ep(aO02P_+MZ8o!@EE*i$F02FCOJ8((q$
z!9XF$+S~p;Aw9Tkj*4DMNXxqe`L&6V9(O`&(*=)^kdBd%cJ-W+XSLnC#=rcfFGA;T
z?fnIR`X?%SYk4^6sWZd+?z`_Y1@gXoufO){n{K+^QJ)n!Eo^`;VfLt{lgv3AD^`gq
zmEIjNxsL`ee(g0^-*}^sCU$5=D5YfpRoR@+7w7ju&hyU{k1~S!XKvL8AArhq2erhn
ze)TIQm5}d!_d7<|`*z)X?>#VMK6TTL1aBM^g%866TRl52qyqX=c5hdG6fkD~;5xqg
zcVAJq-p+|vF50`#{}W(*>z2Fjbd?qGSaDhr-4iBz&9ztEc!N(CzL}PdbYRznRfsf9
zvWbumPVG}5D+x~j7Gna;_#bR$_e^9~D4`0gIdiCDnH+RHrHm$Y?jh$rR>GIc7FmUb
z4{+I;d`rB{F(<!MG!F~jpC#@@NTZdINXwA@Ju)~vv{~_EG1NZthW@y=v)42(=s){U
zTl34?Zo_f@rqiKB?WL}@-&8N?T_^24^(6iJj!maSzrwFL|MZu?j5D7+bM`<O!L%>a
zwN8T0whRAHJ?WfvjTfQL-FDjzZ+|O(!j1b*v*WyQ{>FE_4T_~{Xu9Q;HGAH?=B00c
z8$Z2sU@NYlIO$D*WcSG@?KtI46KmdtYj9E*ylZeP&hO!X4}SI*oVosO=bE0ma{`~A
z|Hd~=bv$Lwt~Dp^SbOq%E)&oWiZyI#lpjm&hJ~$68Q;zW`&42CN%8_!nxnJR*s8q&
zr;B3F#;`q3qYZf~Kb~{e$$d>rys#`aX$}>mfj-)yX`BI<)d(>o{i@PwWOFvs?%n2)
zgm`r7<;KCIgU|ox!VAo85Hr6-L9;TtiIj8Ug%<#ZuYdiYFTB8X!iz4t07m1F{`Fsp
zAN0j#N=k@Z@GH{_gZSVVT|kF;q~MZL3NwXk<2p*gwP<iMAwB~)13tg!J@2yeK4zU;
zNs?vmN74q59+?JO@0jq(mf4)-pWeF@X`C7Dc2WCfmwhZ{rj_bJT4I0KPU9(XCi@^1
z@((}!@FNdDJTg3_V4z7PsD&)&feI)0pwWzF=b*aQE+|5N9b}q4LMij|`@>(CIw9Hk
z43om;-m3my*|lV)dF@cAKd?#3#f^|k1m7J*WIvb$$j&yh4#|z<fN3T*J2E?RibZoa
z@YlUNwii*YpTWT!ufGOoe*Uwc-GA>r_uO^o!^e)nx6@!^FOcT(M<2yWxMFnUk;5~M
zgy$c#^G}5HXPr6AA}yvuGk+eu<dKIS!cQ+e_uMm2J%u2&sj9}gYfKrou=K;c;Q8mC
zd-|!T82#vd&%56#U|^UU%KqXP*Ij*8X5Jf1O{j8@+dvxuNB|ewnl|RFqq7S0Kk~@K
zQcj+J=4qwj-FM$TW_vvK)NSAUF0_Al$0c*VH4)MoWo7}#GQ!qsglC?9TB#C^)a&7J
z3uJ{EJWo9d>G8}nPiq9|^f?Xsei$mroIh|MP&|t!_v~=$rP6=Hb=S(F0!|P4_RvGe
zZoTyjmRe<=45J))Bk}(_n6-O$w!VJz8{e@00#<jxtRkyvOIjXU5jl?QuDj-CgC9Hg
zg<JndE^jQ_V~;%s*T~~x(T*OO#nj-ZeFZ#Uy!8v>`uE;9f3nZC2&u0XB-lH_f?}hb
z>#x2_ClS4ra8vkoPV7fuJ!35y-V#<jwvVSF$I94N<R1KlrQ?d%rF3np!cqy~mJ=5O
zU#dSZ<Zx%TrD{@grI;$?E{FSj*{bfv3-*i;4{Y0Hf|XjJ$hXOah^p}9yfhfl2!mJ+
zX5krG2>Qx1JLl75It(t@&|iX<;D-el{Lzno1Vs7h$39#z`Ua+m^Do%n^H|?Y-g~i<
zA>h^hzRo}Y{KGhZ$;C>CQL?t`d4QVdoqP6UbcR0u_+#{FMJgz?$TZXY&pG=oyx>Jp
zMINeO-uJ$XA3F9R@c7Y3AN}N&S2U1XpN8b7(wFrcEx-W4!v>fa&*b&<-g-73*Lo;K
z%FMyNP*HF#9OZxamA{3xjnC$!3GVWJdkx){=LR<a)^pF64;TNHP;ZU|5lLQ$-gP%e
z1Ab$)FMY{I6AjbdR8v5&wa!p-T7)Eh?2P`#4cE>sIDBXy{m6&q&fc?oM@#Q|=bxUB
z>_mx2{DJ%oywZ~8m283dtnW2l8i|6fd4AnBSBJs>6}<5yANg>d5!KdiVr{XT?|<LL
zxCQ>=)BCIIUycAD|Hz*g<kWlj?YbvS_N!m{+pm22i}>8ndX^R;$;*P>>??A(`{3Mz
zu898#mMGPuMM&VSdv<JZ@st*g?c6agvDpa8YYa5GLtI*)s!`J5#Pfp7#EZBR7Scl5
z!%XKA>ODV>8Hus!aj)%eTiJcQRmctxZZ?0NrF(d92RY*rt7@_aSokCbLn*D9V&tsQ
zP>v&m%3fh&F2cf#oGYf>=NZ!<8NqBha}{+_v|b^dX6B)5h57RkxMa**p=dAAP!5g~
zPs}qD)l|D`f$iAx-*S(XlN;qBV~`4NMrWvba+sT^vg$l!7*wGnLautU!ZV4|kgm!M
zhL9-Gid`aUEvl=~x-7JGh8Y%c$YK={nzkLY`vumG{ypY#MGEbUK9#1>U}B!C))jjx
zLf)qejV!&01uS0OoqCa9NH2&p+SwLER7gE$8=1)KS+r1!s3@gfHW<>8Ez5~HUld1H
zG-(=6U3r|rK(BkobRG)tm~F)TI%dr@)chm!wh-*QLRB^cVKDkk9n7N1p@e=NZBd1B
z8l|^?u=0@99RnrPe>?>)^^Q7fEK{n)OW9JX*9FEbMN@cPiF}|6D_)N3swh#sq-pi%
z$R13Tqb&4`xNb3Xh30>yq+!Z38Jx;1;Qn6TxyZ7=M}{^xLc*c~b4m`f+;zrhm9gtN
zzoAS3P_iKg(W{JNrk|Be7|{ge*iB;3WwNT~dT&EzPIC2@PI5?o!IA-hes<?jrWR-G
zf=DvQivClNxUI8zS1i6I{F6thkJT2LnrW!rPbj1jvruP}KAN6@N6Cw-B+FPzE#O<J
z)*^fLQIJeen1<`61Zl|Y(XQm-O1j#LROX5mUE5D=yQ6a2R{5v;%s7b>`<1w@Gtw?{
zDiTV9_9`#N%IOwLnkf>NBb`)Ai+DM+n0wXiDW_}O(%4jyPRbPT(1OcBhr&;VO}yU&
z%gC`x8AJOrrHqS34uIz(b2SuVPKa$HX<?zKfv2JFgV|)joQnE|^47s>H=-g_9VWzT
z85?K@{mK$*Q_HAMLn1bxUQ=pcX(>*mC1nXQl}VgbY_19oFnr>%*Ggugo<#^*hK%8a
zwI>2kzgjOL;s$I7;ivWmpUwT<wP?Yv?L$MuoBNm?ZZ!z(h9hU6(gONI?x`0kv0PDE
zFv>$s*}A|50xP9d$FCLzO8V3sOca(Ldr?7eGxaQ$R`#TO?sM-(6slb6ss@#rSmtwO
zA;m8b;qcOTI+~@~E18=4j&m6<$_n$j@J46w{G7(2?jw}Ys7B3<qLQ5$$p4fDQ-oyg
zike|R<qx};#lCJ8^Q>tix8f%<UX=$eIw>>dq`CP^k5kRFry1O+$GytC%jcypma4H;
zjvSMuq(CZDyI|KLuUc1D1SO$2X7S=v=Ru{&n^GDUIe7Di66sye(Q=Y#Ixq3OBuB6g
z9EMDFWuWFPRa9{<z_!RfH%qP>EL}wdK_M?ib>g^J;eo1ERGYARjRLkAiinjyXT4ui
zqtb*9`d0P6m>1L>_~Na^BUCyU9xsX{az)9C{y8S7Rw51cNX$w1PHFT{82e!1V<cuo
z>5b3c_9XSpYzzgjU3d4Q1^ai64ug=ea7pN&(w7uJnFeCzKR#Ggkpl2(<}E%7Q#lN8
zQdYcq5hxKcrn|%3j@&TyVJSihofHyfwTWY?Ku{5koRzKW=cdSUD+8^MR+&}r!aL6g
zDR_tdh7falP;IXY)I#N%m71uilRg=-5V2kZLlj7@#)nNpTLsT2h?MG9ghDq1Bl5gy
z71)c|w9`fAm5Wk|f#M-^x8^7qvv4ca_LM5I_UiPg3|VsupXVV1P0CV}g0!W7daWq?
zC4dq#H7&^^$u8z!nub{>&b;x}_;=xb2o$wUnZVvk17&j@u(lXEsq&#o({sTXa=?`g
zUa4;sRon&}dju`ir%)E5cAYp=u|rNot1ro16j1!u9rZKs(W3y)I(qyChFbHf1xVVG
z(jm89YKv4muPBxDW)x04t|B04Xx=d<_jVd$UY_@;EFsgwW7irox1EaM`%Y9Op9e-?
z7?3MaA#1AL*x<mxCRI>2CD6~`=-BzoL)kkvcura_UgDvKW-uqbC4e|Obw~J`;=l;i
zts!9+ea=QGt@3Oy987}JuWpj1w;HsZWqO>-&^(caXhDq71p*JL@y;yrJp9CkxXdA}
zAef5moV;-Ni<ILA!EO<f&4Qmr!wn`Pu-eLVMhgl<=_ExfeKYlz3G9o&22@^d?d>vE
z%Bs2ySt*K0WQq3-WObnHcts&eDAb9Sf$EvKvG*8K_KMu}Qg4`Q?53AlhStr)^CXN<
zSz%JBv`M@JUZKia=EbO>-MWZSAIoVCqI?F2Is{dcS9ZPZw}`o$ULu~cqlS?U%h;re
z>8Fxq=dKjU&SY=Rg#BSyhvIcmS!gVkhTe-RsW25iv}Y<qmnEr-X=utPn=Pg5Sf!S#
z&QuAOvRx}?ofoMGm((4}#d{uTGB7(e*%Sv?#fL(-s`XNqof=1KFGS49{%%KR18k&G
z6!tM1tG;;EKTH^VzGsi2*WXW6q2r9OjS9@%*Vc#DVU`&nc>kvS*uMOyGx<aN$`5U(
z{#t9MFT2=&y?bx|#DVOEY5XtFUT=vobg*O}+F}>{Y$ktZvi!@@vM;t!_sbttGB>OR
zl@(B73Er_jyJJuOZwK>7_h)~4y5q;6&5c&vGE%NfTEt^TsiljxYI|Aye75+vgVp-P
z6tI!p?s{mS@=A*kTS(}wQu0+pXwACde!98U)>JJ!#OkEcNsUqK2o<-`-{9RzTRj+D
z31L}5MlCm^+^cAA<%RN~X`iH?r<<q(*LD!O%&DAIP4(rmMlmeNv%;;KJTx-sF<LAX
zOxy}BS>U{Z%^aJ2oF1f<ZEv!hga%10i1sX}#AH_}?62iPF)q9+)T_!tNO34h626+w
zTt%+1<W4qCXBoyx8^QmsGx%zy4g5-9S1=1x$;@8)lU3>>cT1TCpH1d4s22@N09m+T
z)t}aNkj&0(2f80DhbZoC^-+^-^yDV$icJb(NwDrVHi#S@8yp+l!r}^x9Tlg?#f!7~
zi?hY{qIhWrpZm^8l{RYF_Vd|h=nN?2>udc4oMT4^W7QwrY|`w;p=@28-!yE$eqggI
z5FLI0Y;!T$@VoweOR~SR50CB_iQ9lz4L0^x6&!{ao?(~WJS_Tj(H9wGQyF{!0}4r8
z=(+#ABN@ojO<8f%u$*l9)q~mIs%XU7g{RwtZXPaM5=rURfv8F{k?O-+Y*R1YW*1*G
z=pd<Ll#QU2*JE<8aNAc6N~NDP*^{hv$}xmc;MIMetv*DlcaT#Jzf7aTTh$r9Msdx3
zmExl;v6gdBP1wBdD=6y?X_dqSwTvuP4p8f5Z%WdkToJO+=(p6QEClJLzA*L@v2FJH
z@^++YFgav?cv~+va>(higq~BBp(iH&8Awf7$EE=Cc1WROlAEhWR%1&Gv!n$jdMFd`
zplH;~%28D@drNIoKv*(IhpnQkMQEia9X<;*EFVKkAD9tF>fS=zk$O#*xkX?juNCr!
z+tk^_V!SXp@eVds;?;Uh&Z}hkR(Crk(g?yxTQ}wERtFF-+2n!<F#X@1hE?y~R0gv?
ze`%J+z?_W%{c2q>R8sDiSyRXM+1IU^vC<*q>%~L+lzi?Q<NBm(1oP&MBu{IiQaO1g
z^joz9_S5$#oAdOsEG!m`T_>a>KE2F}$M@S;gccHZuFTx=plVZB9Wje14&(uTX5ZB3
zL>xxK=O+(X+wli%7WrfYxMjVF*%MGGD}6~>=P|Vo`M3*ukQKZW!l}_=F|RX;?@;Ux
zT&Zel@COQqN_NFiC7d~4Lj!a*<;kOZOI?g9j?9M}`Zmg3DYfNlJCne_m%{$6Dpklu
za~<$v*0j^Jr*06^73J1f5sjR01&Po-_=#sWB?=4>9*i%^BcnnKqE=xj5s;Un)m~GY
zg27XG4Y{OTL<gNhDeN1b$a~b!y4@=Av;jlnYR)g$O2AXqsu^;T<c}K;GMUPt3#61t
zQYJ0AfqcYBHw{K0qbYDLT1u-TX@!RwRPL>~r82NqbuR4$At8fs%a$|DM-g$czPrmX
z>75(RFny;POZj(pLx``Vp$|fmztSc{<O2)bfRJLqZ;W6S`OnRm?;)o}SVhv}QWm}F
zN^_JKEjchpA%(&<`x^PzcjnJdK^b$Y^|P5u4$Xl53LvzcZ|*jI$*xaIFG{ne0khff
zqh(<<d}s|NJZ{-b*!b+u-4aCh|LLhTuPG71EQeekXLD?ptrTYNWs}yIyoK5@39C$D
zE;eM9M()0cI0Qq2H_3W>MRQesB7XP6$KE2#I|<jVcCD2ymdMVb`QZh2X0V~+mC=HP
zb$C!W3U|hO5BN+mHw%x59TbvsSxr_-8M?Q+mt0lAaj*arw-6Gul=zut;cS6o{;qy@
zNM>IE^@@m8Q78A3ykt$?BAX;K#7*eY22#n7qPEGo3Z+5=IvG?Y8vy5_TG_0=f_~1J
zf|_eZpL47ZR!x>yNQ`*OLg=KK2KNt(Eb0npd6Hgaxi8FbVi!&|&@|o6TL@tR5l89(
zA&rj?ZrXIZvih>YEQeTlxhVocf%6t$A|hgaH#X90Ak(ji?QBFAu#l35fibX$jh81|
zQX@`EB*-Y@kfX0aZxK(6Ec?|!=kWt(`k!llj=1v6n5I#0`RL5epBPtgO5*}aA|>Ow
zlNrmoHCl1*dNXqya{#o|(UzJjeLA1#YsqgJQG<($z2ho|S<L$%T1Th>RT;#T((lDb
zvs}eaw#~+g)%htjrqg!1LQ)!%MJ&L~L+2`YC7bGE>>y>&33?-~*RB#!@{pjZHz~OF
z&v3i9vCmAEhqsWO=*%)y;fA^;E6=6X2Tz^GGD=J79eD`aDEgPP>x=u}Q}=3SAt39C
zGljpsLSAgOfTgnJI;}){5?F?}!ewq(8dNoFu|iD9X!NVRHxKP!q=u>ZT0UX5!p<|N
zge<5G{)&y%j31Tss>-7bti=2MQv($HXwZR9E=koOmb0g>JlC@2j-m=6Wv8v}_@zr<
zvtZ}=(ALeHDtb=yk8U-F{e>~>Rw1_f#c@Nak8ZVTA2T$CHQzWr%|AaHB$DOxg5TR$
zSm&Hf%5jPthpPUhppBG$XtP`~bGlhNr>C_D%=@K0X{g^gtG|C^*0_13<<&5G$_FJw
znTn>?g#jzNn5qw&Qz84O9r2c=+L~3jjM%(5TJ@Ixazo+<8>D6A#ub*s+7ARn%M84-
zo{9D_*|+q!-XGDR+9nUXC`#=Fw1w*YRx#7cE6?@PlvqiCb>%S@p_@{cx=%6<p;(2p
z#fhAvxR{Z(kLoeEyA;$UyavKsi+G=gs`T#lW#Ss0FdG*`IyD)+g~3yXY-mwk5xP1S
z!PT3Psk8l4X#H23>q31k*&=I><dWdpvJSuu_zK(1=@MBIi6St4>|Z5+shYDYDa<o~
z3-jYeNGuG#0kvXmkWqTinaHy=qym^rP_9eM1n8B<s8a4$OS&|?FGEd73VMLl;6;fS
z-e{WHITE%8f5aX#%3zM?_?Os|YLFOBG9_7a@9bFIw)D6KJI03wwrrAmUEIId5b=-K
zDd=g-ea<>NbN@cm9j6+_y?fz)m@lss21zg3l>czbMF;jZucaT~T0F8pe-2)|{cxJ8
z-BgQ^Qi|+=)25}k$B&$~m~9sK?U9}~&qqha^nG&=Vz<jVKZiIR{Pnqc?WXfb4;1e_
z-MGVaGr#whqZtl`kW>pQ*V%w2A2O!}2FbEW^|0)hz^H#Cc87cJd31eQXqHrZlTJ_E
zl5I`hDN=V1HrZ(9Ln#d^3r+15ztVe?)V);<Po3J!#7kvUYJk#_*k{IzYFxN6`G9JD
zO)oL9l%L$32XG;%)yaCq-%5LRio}BQZj}6@mO5qP={Zf#x(xYEE{fHuoIWRE5<sfg
zdomV=0ud{|FoAE%@Fud}%8$**Z5c~bp%qay*Lmp4ESo+HeLSsQE2AuGZrYc5NVCkH
zB$P<iTkBzlO0RqK>6DTo>S-&X{iW*mz*ZUzF}2<(k%jI>W*tP{NlI_TP?CUg4bCg(
z;L5dw2#whFZh6-dBP6JH16wz#eY4(L<?nS$=RCHSoLVZJLdS055iWBa6Th>t`buw6
zmpo(`^@WHN;%oM*oH9vs??A7BfSGjmx~RHB8MdivHK?~dXssF8X<5MPJuL$X@HE*{
zTtO|qupsg-u)M_`Wyzdx&AVGDJuJMwDv#C8SuvA(Hf<h7NaHMoUp*m%=|T!y%k=DL
z=N)AUNV6@H5N{<>DNRc$r-i6gxf+RgvM)oVyA@+~r7mKxlEfodS*%rMw^s&*ls1({
z9_4Geb9OEyEka^`W8!_ri@J<>=NE}58JNQ$tH~puhRhOqFLY8Vp59w3M6tZZ3Tq04
zUWx@<4Gue!8`;oGS#Oj)cP|zbXOz5S=8&>=?4@kp<2#|iaaTBXW3^0@8r)!>u~bAw
zBb+1(RT=dvN~t7<R8GRw6JPZ5vOHA0ii9B3l>DjO0Cluw-l_^KY7B1}1IpvM#+@!y
zb0ef>Q0+!W21d4RZWjJdm@^t#KZEGP5+!=roA&Y$#|*EF5!IF<bwCT(<W7{KP^_Qy
zgO!DI55q#LDgak1hb8lte0uqUvSwM*<K<b3#`g2=T{1~4^2Nf9mbqrOdeu*=zK6lR
z8(uBr;RwYar0-UGt5j<J%?b}`hj${t*?8|B3pzp9OI%ifTy1uGu>w3xA<saW=~)^&
zC8eIO?jEGfEuYX;&vP+lW5_e9{x}|i2`%Rnw!+C<Oj_Ho4tsPS<l!|6E$28}1;v%m
zG;|(jDv&!K^0}Ttdi8_)*NJqq)|&wm&(4%gP!56FNQp&wH&j_4S*=Jy4iEY3)vE|L
zvu%2rVBa@3Q?*jU*A3PRkGParQ{r`*#oSaVQMt`lR}0mIV%&oVvSg_6D_LIM$m}VM
z)+o*+?M}VviqO(EPv@fNjd`&LCBiBRqZJd2RUjNG=ZL}g@L~aJ2Nl(jRzlO<d))H6
zz1GDF`^E={w{GT(sBA6PH<ESA8RPrsnnANy`jgTQ<T7r($xzy}g8lOLI0H+)SP+B+
z5<-D4ycCVljWs6cD2XLv+j4NJ0is#<p}IjSPj;kCa%1ai%XGBFu-IdEIdj-ZU~-)3
zy(Yz64vx}Eq85KjRUpX(ypnmeO-58r&HI;w<%MU+=+_{Y(xxWvxf|BXm(4;+rZ>kZ
znXsIMfW4ZhC!t}yH2BmrVq~U^j4SqzRBE%_vRM-1p{c)zM^%Gm;!QR3+|y^(N?$mn
zC}a@=HBIV2+&kt^aar_UI;)sKnO(^wW4S{zx2Icgh)E)~_=}V%;PEtyg@V~(p5B#s
z%TiWkcwPdQON|7}xfUXkmJSc?XU?_MiZW<73K_|bsT^GIP)X;fG7oIBG*H)3b!>)M
zw*0hdEcc8T0TiLve%g9@p}11`8uN8y<m0{GFg<mrT-x$&&{9&yNfmmss^ze#x4U~u
z`!c9@+Xsg>pP>?ol4*tN!`9@xlA49Tkf)hCT8mVe<JjBEoAyi`w$4%$qDJX2_VZT8
ztq#3Kp!H;~-*goUt<;{XO#CGuzEx}tt(S{<7wq8s_Sc8ZYr-UI*Zx`36W?HG@1!YQ
zFIS1Ba%3$VJ&9sg#d<niD4-BaZlyMQ4RhvHB<-l7?3K8t%qj1ssJGu0o`0>JUGHkm
z7lCB4aZr`4>%Ei}U%Oy0^`QQ&w?DMp<#Mv8K|7UnGFl}t$`C6(wJbpiwD<7~Z!1gb
zE>9Cr%kmy{yiq<0YS+EW*_R@u<nbid>ta0tRN*7bE=xkvhMb}TAPMi)4Ot+4)NvGg
z7I<<_Xh}WA%x$N-QbUlQ=UuW3PqJ<m`6@}r{ZhQx>^=GqDh9jq(1TVls!&p_a(~=R
z3i%Cc4e7m(laTeVuwLGJdu){DbBLX)n^&vfAk9?OJ@lM<a(CD9CXoiVo$^P2_`9oD
zE=3aS30+H9uUPuJmCIHyU%H}u$qC&{?dV#1!t$loyvy1SE$Ql5jGvZwF6nGPe&vcK
z-5ra&+80~<V_y8)Rm)a(FYRt$jNJ0&?RGs<`fxo4eC_gOukBvCs%y!K%Xx9vQmfJJ
zw1?U?T}!&!7Oz-tcXhWd#s#=#6^8AyVePUNOYzW^ywd)6*nhyhy3@b|R4WP9YXRzV
zdm;eC*VTj^7vMOt)1HfG;T9jEW66J6-oA?GalCH%ve&O@JF(k9#dD$iV$2ooOP2Fl
zHrk4%U7eWPVjILRTgv8uOIG2-ilsJ%c6%tEg)3LsM2=r&@Y_maG|YVk;A~%nYgVmT
z+TFDT3$?s$$?KN4t>Wr&aDxgLV@4hA$K$}V;Ko(<$^!%J4J$fc-`)1Q?lugvf-7*s
zie)P~DZqSU=du&KP_VhwI=fqUo5kJs(vij3tgf!b7~e81yOwme*%>{ZJG&IOW18Ka
zi#1c-zJd#mYcMtZ*Lt%226M6Pz<}^s*-YCPV-PF|#=*sS1a{#>ZZX!!?&7ZDE=&+J
z1*ofu26zxIJE7ASe|cCa%U)Y{JT`F^ue4Rg?OjVcfEauPP^g=uVT0@-oVLqdzLhws
zz1FX*h(h>}F#!nxUO@!t4r{2@6QZu<UDzONq1wjn;A)&8{K0m2+J9V(>36g(LdNR<
z`mN3d1I6p#^t+uayB8rkyS&}buIyTb+@a2{g<TyByV@6av@OI}BtdkwEnL~TXnBVn
z_}t!h9Ik2aSg4Cp+tl5$5c%ZYxE;52F2sN*bYUZHGz@iO_hS5C)pb0^U)_B?zOLYC
zt2=;g$K!K%`y$*0DT$Hou1<S&7sqe!I1VKrc*F|+U*5F{x2(oc9R@8<wgH&7g&iFW
z->`DoiVi!2r*|w}h;i(vb^{Ntm9}Nabu2T;F|s|eW6`S4<GVRXciW;9x{hDowg^u|
ze66d~Zo!SX9Ux(FJQSA!V21%f0l)sI!{&&|;+Af%$%<~9f~^DY?Z$aq0bFd$!qw|s
z_L>d=ga0<d!nXF~5P#r&7q%_2|2PToFap3^w(K={^s;5g0ql0dgP(97d!(a%>2ZLw
zdl}bfsqGZNSkZ0=3O4aXduY1>i5mfl4Z>yV<fCz51T9Y2vW0e6=b~k8fY7Fo^L7Du
zxr^hh?7)IAUcs4S8EqZ#Yv*wtowi3>Qd`xIMSKue-afaG0U&ko(H*uRi`w~=*DeR+
z10PueWLVvKJa%m*_Y2FoWXXRr7yw?!!lg@IW8)KxFqCa#`@*GdufYcZshtw4bQ6Jb
z#!hx{D?1hnSFz66h&FDV76f<c<f_ianA%DLfWwxt)9&r$4gyr$eU65Mcy7DA5`w71
iru=*Vqy5b%b^bq`XMfB=6wNLG0000<MNUMnLSTX}67XOE

literal 0
HcmV?d00001


From 00d4fad1a6ce1db120e2387ce4e41ca485bfd94a Mon Sep 17 00:00:00 2001
From: Michael Moon <triffid.hunter@gmail.com>
Date: Sun, 1 Mar 2020 08:45:51 +0800
Subject: [PATCH 2/2] Update mod for 0.18 - tested and works perfectly

---
 auto-research/data-final-fixes.lua | 4 ++--
 auto-research/info.json            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/auto-research/data-final-fixes.lua b/auto-research/data-final-fixes.lua
index 2bc616f..5a4dfc4 100644
--- a/auto-research/data-final-fixes.lua
+++ b/auto-research/data-final-fixes.lua
@@ -7,8 +7,8 @@ for _, tool in pairs(data.raw.tool) do
                 name = "auto_research_tool_" .. tool.name,
                 filename = tool.icon or (tool.icons[1] and tool.icons[1].icon) or nil,
                 priority = "extra-high-no-scale",
-                width = 32,
-                height = 32
+                width = 64,
+                height = 64
             }
         })
     end
diff --git a/auto-research/info.json b/auto-research/info.json
index 0b881ef..8dd66c2 100644
--- a/auto-research/info.json
+++ b/auto-research/info.json
@@ -1,11 +1,11 @@
 {
   "name": "auto-research",
-  "version": "5.0.2",
-  "factorio_version": "0.17",
+  "version": "5.0.3",
+  "factorio_version": "0.18",
   "title": "Auto Research",
   "author": "canidae",
   "contact": "canidae@exent.net",
   "homepage": "http://exent.net",
   "description": "Automates research. Toggle GUI with Shift+T (customizable).",
-  "dependencies": ["base >= 0.17.0"]
+  "dependencies": ["base >= 0.18.0"]
 }