From a393e213264ba8be5fb4b3f3326e78ec3ead3fc2 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 6 Sep 2021 15:08:22 -0400 Subject: [PATCH 1/4] remove redundant Core.bundle.get (#5947) --- core/src/mindustry/ui/dialogs/DatabaseDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java index c94f69f2e2..b718950950 100644 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -36,7 +36,7 @@ public class DatabaseDialog extends BaseDialog{ cont.table(s -> { s.image(Icon.zoom).padRight(8); search = s.field(null, text -> rebuild()).growX().get(); - search.setMessageText(Core.bundle.get("players.search")); + search.setMessageText("@players.search"); }).fillX().padBottom(4).row(); cont.pane(all); From efae0d3b6a8f7eeff6fdf5bec737c35b7d4ba5e3 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:45:42 -0700 Subject: [PATCH 2/4] Anuke what is this (#5949) --- .../blocks/units/tetrative-reconstructor.png | Bin 8748 -> 4694 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png b/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png index ed8121b6b9c51d97805f6fe7a7c05d45d18da1a8..67f7ed806b71ce53498a7399d2575b12b84796de 100644 GIT binary patch literal 4694 zcmeAS@N?(olHy`uVBq!ia0y~yU{nBM7G?$phG%OxZ)RX%U@Q)DcVbv~PUa;80|QIC zqpu?a!^VE@KZ&di3=Bd6J|V6%W-ZyU>%jlZ^?3yiR~oauyn_okp8scHVBjq9h%9Dc z;5!V$jK}j=q%bfDp7nHb45_$vb#8XqW(%RVk005ZiZ?OTT>77QN@oG@=7yg3zxk;> z7nZJ@R50nE#N5ks&o@oFS9M^Q;;FMMuU($@@oO!zWFjcTrRIG>EXJSxPq%m zTwtSf$OS&<*b8+oe>j9g@>g)*>hF->!Qyz=&)NAxoQsh?$F1BI+_$ zU$AqDdT07CfB8ba40$Ep&zt_OuReG|U<-TTDejrmQ!Ye4-?FvA%&}S^cD;>pXu-}X z5P#1CD;I~Nrq$C!oKNjcZF6 zv)W>(F5q%`e|~e@>rjQRsWAa;erGnU6<(sG^v>`6=Da;dJs#{wc&$He-NL%EW5fRW zpFc18xlXyOMa1FEhNHR}eiPa_tZmK<-+314{=`3=G4QaSDIcq&l+u%r&uz|s_~Y*? zvOiTzA?d~X;CX7Vw}_R(*$=zC1Dw9Rv)i3CkN0iwl-=9*sAO|}+kPiVD--wMBCqSQfcWtrmM!`A|)11H;BmIxfAdzWHW|cQ9x#ZYb!oy*&e6D&{MUcL8<+;gj2c!}?nu-9_Zp$eNAcb@Et5?lRk7w4=e zg5N*t>^Y%yilItLh)KjzTt7q1-R$+&&bPCdSq5)+lby)+LR)I$L@Q?#1&7%S3_5oU zI~=}s#4LMJUT=4o2jdpbTU^n5C#CKz*}v@SKHq>DNAFtmWaK7Qt9K|#iStfmJHh#> zb#Lw#%XjI!7Cyb8a6)-k{KN%Udy6jzxCBmcSi)G;bSTu)`SOa6JHK*b)N;~VUc9@` zeZN^eKQ5p|oAXhJiG$~bsIc>=x>hHZvuJSK61e;K)BWm#q+*VpQ(1H?9k~TXxE6QV zEZBN$OW&yTkdL#t7W*AhYLJmblpBZY%Yx$tCveaM9J2+=J! zn#43UE`00gP}n1M|G~xQ@3}tN2I{jaI(S?VzPSHi&w~9QjXPB`?#W&K$LRP(v8wrc zZu{x^0w%ma6swxk49{==*P;-fTa$A6!P2*(S%0tpYiG$7S7V5Jp2~Ugf&7bWraksw zwx;jqk+QiMo&SB^w%0c_Ph?5_oo>xgWPDvCBiC^Et#hTz6&Aman1A66#{^*!f!2%e zS3e~8FNk?A^(%lsWA<%!hj2RwZs)cg5}y_=xbuPe*$&ACyiIv>7ex6l2rLSY;i(K1 zI9A)$t;iT~gXe;)qW}Y|i^E;7Zp9Ca6k0TN+Zw{k7q3j|xHi)=isz=~pM)L$g@#XL zx2(RLab0ltQ(=&xLvlydHi<*;@2kal)GSZlUgOlQxaQp@fv{<<;?76RZN7vp(Vft7 zA&G-IMCOV2oeIO2EsYTZnYv4(Cx|(JStTC3tV>$AZ9-fVhtTa`9nl$vDQ990|IRXW zsW4>WHC?g5@y%=Hyq)#)H3dW`oCp(G``@n6Az0uI>(+`3YInT46**2gGplS;RoWt9 zq~zdOAbj4pV?(s&&Z7bkbf&qwPO;;1iB9DE-o(IqaFxQ7Ft5D5l_@%InjNXDQ+FPn z@H}#vLe)tz-igsXo%8H%x>ExM*Vemra)_73oj1~#+`BS#`?a3!S9)_#XDn8G@sK}F zU~TH!^qc0UKW}B{r_asEd8zb#3;a;Ip%{e%UDCzr9mP1IZz z5wR@sNbK?Ul5VCV^Sn3#g_AOYI&TuoWw#Xf=3V@<@OnCfSC{1?mJ{z{UVczkT6A*N z1_lq^)6ARN*~0=BSrXXHuI(S4KYi*UL;rA z*3NAB;%K+OPixUr>yvCte4CHVU8nf#$Fv3d!V}B_MRE^re?9#qo67P_o3{S>Cc4UF z#lvUayesV^XJ2s0{1a3$F{xX>(PQM2I|9UIn_aToNJ7TsR7L1B-dY=6mYg>&l7{-*2aMl42vI>^CTI^q7OWl0Srhwpzpy}RKU$Cle)i+}Sd{C&2<>Z15r zHp!gc!bQxJ*NHyWxGFK%>ERh)gIR~}7e+MfIL1-(B5dog#4oc#59b|d?lEKK?#k{F zmc3IJ+UjJhH1EP{*785ss-u!wtp2Rm_?*bO%F#sGQJ3r5#Upcf3eQ#e8>%P#pw#8R zYtz4DhR(CLRL=BO>`t}IaZGjb@W0V~?V;`mX+@)xdP+nyZFR~OmdNSksv_j)G( zwuLVXqWAS}(|lKOo2`G_#!m{-{`}i5zZcw|-oO3e?}F$D{of}we3fFAebH+lX8)lv z-%_d3s_^eLx$JM-?z$iCVBuPjuf()L@a)qLmRD!~S$C`vZ3w6|R65vh7Mk#yomC~7 zPr&WSE3^0t<`YV{z8;#rwQEVN?CYrxxq6{8dxcbz`2w7dypMmq)N{Ib^WQ|y05uk# zfUF>cMXNek0=hpmke=tFFsib(>nZ0}NPP%@3|E9*Q*rn1e z*%#~n3j1w+d?+n0f4U&2QDfG{+$0~7!ZJ0zHxbek59}?P$r&=+qrtSnUq0MhTQ4Wq zg{fRYc!k+SgXI>=Y$?ZDw>EodB$^d9W(ji^3w1EwEKJl^7Rq6p>9DnvCBom-jpsxk zcXr)d*A-$X*jBlkN<)RB#V0P%Wm^@xDlB!{<3mxg?EK#!8yPodt<7E*yD=x`#;y*Q zrw&^=CTe9kHkq}r*|Fi*hi3i@HdA~S+zQ#Lmf_OGRhYP1NhpM6m2ZcMBe#&qx*ek8 z)2`;W%NB2peB-e7H_O(YJ2pJ+V6m6e%u7!&GcCF6f9%q2>0NzWSoe$O7PuGKTmO0J ze=PZq;6H<}>N*Zj_}$m6;T4$4yO49?gnEM(wO0lFf+=4L5+ei`B(tn?ZQv6-CC(@I zCW4>+FMrM3wFMUxnA60ij-7hQ{zUrNO^z9B+eFTn%O-F$X=dbm6h3gg-aR+_t$^5r zsS92k>C_hfV6=2}V13#q-^k4C&2Lm-ujj%U^7{n0ROf=4n27r2368h?rA3&oGNo?3 zAbmRh`jOVq`dbVy`t3hBO>x*NbD{pV&kWl$ft_bbk(Df1&VSyxSM2yuD3W5W}HTTJI!w>l-nGb~XK z+Pk=0amTFHe~oQ_I&76%kmXWi$PzkRNr=O7i-6dQFxHUXjKAMs#)`IpgmyY?wOZii zQUp`7LqKfBHHMJR4DIhZA=Re!dOE@@t}%r;wFv!O>lX9Ybzi)j;6fv(1yORR1>R16 zaYIqnDr3cqoRHaqDXgnfr_QqH-nUFuSiEfef@#w?vaUMIu*&txE6Z?>B!7l44qGi9 zrgp>}n;nGjAnBsCH`BDpQPL%}p-fqdtI4S26~kNCE7MqRcIds- zp2DainCLw1+$Jl<6K+#honV^Ov2Ii4r?&C$kfP`nD#B3c z^5oOTE7v(L3C1q^thL}>lA=?a(%!=>odi5&JKY41Fn0R=Z#wVhDv)~n{Y!DyiGp+V zpES+cuhDSixY%5ua|#U(3YST&L?Q^@3z+{vs zAv@8)rQ_0z_aTZI-W86vOV3wm=*~!Do}$e=v(Y6)( zukc{KaP7KED}{OMC7RS$+*dqd-TJpCO{zgc>8QcJMJY;JoJ_y2&HFrAEzwEHxTkei z2UpXhw@rUlG>`B^3h&-2a#+IQuuF&l%a7j6*BC_B-O4o+P&^#4s#8OsW9J?-WpUYn z6^ZjoU2YV7+U4s~>3HJtTggdWC+^?aUU^MW&^dlhr-pWi#hYJwvKQJo>W_6wJ*xI| zo+9e$j)|XcuJ07Nll&%tLk(IvoFMy#bp9`w8l+>}%QW1{7@c5B{Lt5lZMJBjTx7F0RUtcnge vCtU^}X<0H^Q{y#{t;WAAQm0t{{%3fzn)i>go5Xbn1_lOCS3j3^P6P+;(M zaSW-L^LFn3Zh7}j2eQA{H13q2^e=1FMol9!ojZMq8X>ZG%dZpdGqDFp?5=LuipL2m|VTz z_^$2UtMgyZeEIU`&-K;+KR-M4)cb<=c0Ic^-}eVkzh3jQ@Zv9v9`Fh9rEx^%yIYCfo_I=+p~3rw$+V{OWedKR9ZB9PtNEtwe*x#* zV@@B=No={-S6P+euCx2}|3c2WZpIZ`o2PBoGyTjqW4G+u&Ab0Kd%rM|I+(4RVfiY^ z_`Ry}_Qk2^I5-ZdZdsQ4A&UFftiPt8?IXfOG9cp19YJ-k$!(`8>wk7n@Fk2y(<_XHN4|^T|~XoF`S~QC#wqL4k$kfl$<8 z$&72~jwQ->Ca=-#XPI`pknJaf0xL*nGWQO5{`m(MxBIWU^q^tV@v7*)Pgj>@F03=T zRVen8K>(~>n0rs^fn!bAZwb%5VJ0-)&-CfU13}j3ROA^Jft`4bafj%N*ZU)9PoAXR ze`IN}Z>7qH3w@hUvM+FOV9;A=swfcb{Pn}^qmesj{CcpjWYUhv*zPpza~kpuPK=CS zlo!tOb5DH#|KIdf>C7dnS60_BNxjY3X}3gEOrXJA1KfI%2P9@OA0czUVVr z@(hfOj6K?lCog*GyiJXCn-IYLGw1Jjp|@o*Mw@FGT3A>N=Cwq{Xs!KxgX`8j)hj`E z8}~E9-b>!)N?O_|VEb8UZQmizSchSu}z>Yn$OsD-b4!}$C- zf4pryBRhNhiriv;a!R@Hx5R9F(B{b^xdw72(9hA+iiH!kaJV5rdQ(3 zlgrcO*V!z2BK#uI=`0INK)B=5Pn;3c1N7d8e2AJdVOdR4W%icETWXm0dahX6z;H@y zMVKAqYN11?mWy*nPUvrI+45BQg{RY5Ru+fV3VJ_T)_8VUecGs}$o=Wyw56`r+ot(1 z5a(RU!NCyjc;^#m#KeG?snbI_BPaR4dq2ZuW5i_t1?-$FIXM(!9fLk`W_Yi7HqZZE zIWK4A6#j4Jon=?1`5)NTGV2WUsg3gvE9lDSt(eO%TyVoA+bT_0G5_?ZgG(HJyC*FZ zU2{(O*VXy|i{AE?DfadKW6l5nOZUfH`MUdaYZw^*eVl*)0DJ!bo?BwlTW*-xSNu-@ zalF1RICh>(}u=OT+Tm9mkI+Wi)HaqEyM#ad=hsR7*`Cpy2UAZOt&I~=# zTjug{2`BA89R0q&>sxjpfA&wENc$fb#2imcU%qs_>h+_?$&8FA=FMHg|K#dt@fWA} zTw*KXoO*e64U_HsCs`BTY=3yTM}2z2t8`jhELW`@*6ru+=O5&XTOYVw6m7mI`*S!C~Mx%DR7(~jZq{3kja|EYYPIs3w1 zkBrqDlN=9Orj&A?e9N2=Y}Yu?zep_NG`qqlku$qmf_k^`33a|soi1>Ho43ws^$VXp z{U+=FWKfYi96eQFS)tPek9%v1Ij81tcIE%X`K4ykWd$|)hBGz_*+Pp12TuI1Se z1NmhJhFRxWqLmd-DTm5)=57}8*GHo?7l^$IudPxJ9)^G3@7Q z1)xkDVa2R3O~c+No({J zk4tiA{$wy%&nY`O;BB@<-{UQ+W(5!SrSCp%>r}{T>34t2r1QnVoxH68A7|pSCDU0veFGw5=boFm@cHDJtc?fLzsGNWD*XEO z#p54jgre51NQ-p3@iZdVuGr|6C*S5vn(Zw?wKkUgE8Lu-Pg{EJ`yMK+B4OaIyQAh< z>a@vsuIWye;(W>`akH~SRmf|t>g~lXhwL;tch($B|1vq|)zd3NoQdo50*n`G3LVl( z@trF0ebJpM3X%D{MODQ1zkYkd;FTxe=QJBvryJ4QFTxECgbuA+#DAf^CF!vZ%|lx#eQe4W`9(y-Paxs#kZ4VPHz7n zB(%sbL}`D|F4cuXKUub@hMZd5?!W0im%gU^*F4cvT)Ni@w zAJ$h5QJ(LRFBG+G=Hv;d+vnd?3F*4x$=C3F^>J^`sea2fvRKfBb=Y}sOdp-EOJ89$t2e^8+iRQ$%3Da!1Oj?keu(oIXY)?{6}FlBz&PF-)0 zS1RlZ%JVO6VmZNdD@%ZrGm=Z_l-(5R_BnI+tLVO+7@jFXK^c^-Mjn#qUI;Z&Sqx`MTJ*Y9N8tR zGHLGr569&<&AmCRhT#iHe^8;sBOTFr#_qR!+DbU5tqM6=zGq3>>6jy*?(CAu{>Y*+ zwf*UWHJasTCp*0UD0=0dSgoDtkYIdbB9@j{Y615~aw*Dy^f3VyB9 zy7kAQXRWp;J-t?JvFm!yXj}DT$;uk0u%?ztW=qe67zn-cv}5$yshZ{z-Kn1?cVqIL zmX@qn3nLsZd7CZEiBVP}t8rzKQzu+Y zz5YTdtM*OUW9z%RpNzoUfp4VUh22^zBAFMuJz9pm9@|u&Kx6}XUQD052{WoVlvbXHS z!}$NlX5AB-KEc>{lCaVHe{*eI4NgvLITzEkHDX7`$+g}6tJ8wcS#aMdWO$Wt@%&d+ z_fNV)RiB(;yM9?Omvb(MN3h+>{fUK~mYWa!T@f4Xw0j0qfaXO0XWM1; z6w^zVJo}m9nK3=u?nY1c_RfbwMQ*M|lN8IO{qkaKV)n_ncU@^r@U@!N^6g&j|0nXt z)u!F{h_YjNsV%-zb-F9KM{sCo)_mpWr)E;2b_`9R&d1VI2@7-18BV*Mk@Ay)gPY@k z>XfSB=-oMeZ?{f$o6hgR%*eQe|A^`np-YFJ3QzZ6Eq&>%olnKZ}mX%v$AplUlZ%^2+7*vYu`*yM{r8g~ec6%eG60yga<^ zuDn&bsHeS6*X!2ILp`4u8E#bmx_W%i`#bpoo0|SjTe5B2`kyjhYZ=zW7BNm?-Sot_ z=-n3GYb#4+0&h<8?5x>wjmc}F5fj%J8=*sQZdbJ=`r7R@@v>TX)M{$q;wYWI8m61e z6Ta6~xo?>uHm}cf`Ta+0as%y7ZwZ=zdEv9vjefc@=kgY6%KQBH?Q3v)xO2byUbku$ z6<_X?ftj}EE4NRa5V|nn!nE_B?i(&*iW0xKs%6XboP>#7FXWyyd)}VZQZ>fio*o3V;$@9|zyza>32dS2}v;k_r+zkfGoI_2pW?4-GdeSPbv%+u_Xr+=;5l=J@{8 z&0BTi3u4st7Mkdunt1x~sv3jT6_#dtRsE{jpCaFHkJc8PKB4a4N=q|CofGN-N{ZZH zvu*2Fe~Nr}-bnbC>XP~TPmg+ef8q>KNm*F8_IY-!9pkoe!x$&4pSe%(&aPpS;EY@m z|N7@wCHV#?#-n@%Wt^G(SBq0O=*(}pKV#i#cW=9;wUc!g6g229-1hSNrREx@Yp1hJ zr)_x}e97F?d(%4pg8z3eE-NsJPw-8Q6$*-Ye<3%L2WLlXOq z+a4KaRa5*IJm0kaNLNi!{e33Y1$P*Cwd5E%vCBP_P}!&^|K@$8v9{8&C5@IBZtN@n zuebZfBlmbaQQ!UUZm)M-)2r0^aJF6C<+A;s*Z0l-_f6yui%EBLFkL+J#=cA0ziPgJ ztzPu<`>~8qj1r$`WKEdnzh-~&DRzY-&M>WoSKjL_H0!w&=x%4m74?Zxqx!L|g5J6p zwhF6S43t%-Pk4M~q2_#s(zElgtkA3!meN){bvAAKgvV179qkz3tZEO*k+^wn4diV8G%pD0Y~(UWIj2IW!9bF(C$FekV;^gTY)$;tThY{qfRv*P#n z3;D+Xp8bKblyPT`O!{m|l_gpV)B7JUk&Jc9zq;qCT=WE<=F`Uu3u-?8)xJ3U($>E_ z(v*_QSf)hJTYO}Jp8WBJiG?atqPs*tmso2myt(Bt<foJ>pT%A^If0#XgO6=ZRyWRDgdh;z7?~#1}sZ;r9$(vViKZpA7 zSe5U@?lnE>?MvZ}%0^DdWgkkYT>SOP=jEj}*%yQbS9)*URg-g}nEl<(H@X|u6us`N z)Jm5AJ$m`x6Xi}{~hC&tb~ zXUg$aEq~gKdjnOr-1&FKR$)y@jGc+jl+&|XV(e1C=q>zOmY(Nyeb2{p2Qxl#Mrh0z z<=k2G>P4ti^!|K1*42@pm$yx+31UyTP0(4WtN8lU%hr(CrN35AYe}l_w`*G;`E^6f z#izmvxc3FVd{J05xFXU9Nbk{^Jz0brgbn5H< zH>X!DKE2%J!iKraLKUX(DcJS>-S3N^3ilnjHM?foPmk@Jzi`-nJ=!g%zu{THU%iO+ zpANpe{YxjSQ02<%8jYWx#{+d|DKC^+^3=lOWu)C{lcc#C)9bRnD26V(@y&Gq^#ifj zf{JnjFQ1c$(wV-Z?i*akDyVF@#lSwt( zE*&|g{_Vd|s@BiFs!^#+x3Mmr>pdgT$(Pk+QO&f>;HS#Iuh=%5u9+gLthjb1S4_mD zfX&qo%BR_zuhpo&eY`AT>6)PL&o`VY@n3P0qr=(GwEIFf`?haylGCM6Z{C#sh{?KZ zqk)i+c)%-%7&|@r+!&`q&aFQ_^{i+}o9@4gN9@!yndF_lZqp~sXo#`fzd^5i=_bqL z5qXOzs;Vd{Og|ra=(2EkYH{DjJ8p};GPZwBHb2wYqb7g+p+l6Dl-`Z0CoH~m=&MRh z?|*z`;-r9cjCX=lo$T#*vTRmRoZkQV$-`+ArqwWneQz*Pee$VL#wJGS(iHv!$9yv0 zMNatryzjw;00k{Q`Sh@?G@oQP=}Vw`@8_4#*7@7ao=v)N_4f0{Gp`rDf46;h{q|4i zrW)%_OY&Kyv+#fWzi96@|J~&e7svGJa-Yu)*8X(y)a8qZqk0PGGfZ#pPyZetzI?h= zjmmSzs~#Dr=fntYQjzDbw0^rmDmg~z)~-)0CkDJbrEV>_(Zy+HV)WV;om0nyBxNjh zwya;$60|+mOQmJ!+ooBZz7qwW&Dt2^H0`NyM&z`;<@fD>rkh2{?_O#(ZGynFdHSwS zH>&r6J1L9qY*^&Ag8e5;)RdK1Pj!i9*1i#YJuTR23cH^KXP}(L#CxpXo-3Z@S%x{; zo>W(e+!k?b+Uw@-Ysd3;`dO-keA;5Is`%>iyBEnnL|!{xw_D{cI?LJ4JTFdpy5`Zv z?fw^T7uhfT@U`{U)q@;{VZXkH@Vu^zH@dp)MedKM9v#W^9CB1r0`0DtSe{>?H$OS* zOsAykv82+YhUfDwg|y~A58oqmeDC~wiL;lm6ofg2Jq@0;?TbO3+D{gh{>m*9(bq+v z&*nS-ZvVPjDKR<=q|MiFJfC;&uJEn@Z-jRgrSeammXa{#$-=Kc=f=&Slz2*4apA?} zp6ZQ1tL^tX?}~{DR#}j`bjzd*|I+6(FdS$-J$)17B_#u|Ppd>3ORw%rt+Vy)2+BJ* zmB+o`kn<;tm#T}{g|Ji)Zw(eV1yKcE=EW-hdYn^hn%A&%P6apj-TDnZf3kR~xCjNT z5?V4XCx+cELEFKEX|YQFyNLp-wWozvX__yuVKP1*(RHOnW>w3q+8G;KA`)2iV)n5x zFtD??FFCd_Ovvo5wE6mlm#6*uA*=Rbi~XMMtzkQDkCiC)HUzPs`@5}L&wy#h>#wS+ zhh0wD%}Uqws+#8J6!r9*gtl_2rMs-+r1y-up&{L^-AOi8KUnzq_#R&UEWRSwd!w9! z>dS};6T)_G{KP1sd@O2BSyWMF)EAMQ$iQ2lIG->rQ8Vzml%ctB*59>y`ieXCL+u*p zCG$9xoqT$!I{E15207cBBsaUph=u|dH_xbB&Z(y>vt{#F)-c%~muTo|$;vw;&Yki9 zj^OF6%*LpnEY}zhNlK_@Zkr%*y!Y6((;ZiWiq35P#Q8-gnPHF6uBzWPR~?pkIOtB# ziD}N9A)p}C=&0$wK%Dby)0d5Xa>)#3(_+-@+xm5HM*NDC*j~eQ`uK9gB7d`>-))~f zZ0vNGKGWvho8V~IcrSU)Gj5BGs?%3~X7p56=v9?wR!wid@;LZRa_AYeN$D$v+~hbT zC!NJfX$S2@F|6;OF^2w)58nW&!xH}0{QYct8zJZL* zY+*ifF?pKA?MVS=4>enIy0Tu$I(h8Y$)2r^f`_vjEZ$0*9!sj-b9K^b20_NHQJW@K zt9=zyZJc;}S=x-ZJ?`fXr%jshWYXzIW2UT)1%ay^=3HTM%Zr{qf!V;V=jg8*aNi_D z<>!$FEN*A*&h7akksKvtC3u17Q=yD{Ut3FAu;lbdp9<&LW$G@Bo!|BWep~)a-DN=zF|H(X8OX6oKxBs!9D|u=*3H z2dl>oby0=Ar_Ds0T1#%Q#;X4}8ruJ^L5rcF31k*&FK?(+EBKW(cG z3@zIGrtNe1`06M3mzjM*?_!Q`QJJqQU;A^5#@?{w&3}zv@ffx>KEBa4J%#nb|2`A; zDCNGjTaxc{uGe&5|LNpkwZLhnVeU>#J&s0r7b!1X(V%lmeSxgPX_I0`qwX4w+c_7V zoW8%S>-I~(B5_$kb)hd~_*G%P!)pf5 zr5pJsL_Q7P%-`Vcp><4WgX+RyrdOVJjbV&UH_cg2y!o{9Zh07|=g}Fe*MzJD1NuL4 zda!e(%AdM!=swLqS8B5-NY|z*7tUQ?Z&#xyTn~!`_ zu6pyhvSD9RkFh>yUTh5yXpThPlE0&Q+Ir0l))UtZk1@4m@9Po?@_yl^zju7$p9 zPE#Z%pX!&sX1Y*!!AHL^o%3rKep>TsqMx+$s=TFo$9F6^65($mD3GQks;!l4G_^iV|i_OfN3Fq~x%nGG<53$)}5_To<$T1W8`nQIxtqD^if_ ztlmMl$pWfxV*<{r$e*>D{zXAC>z0gAmZm&IMzL^}=WAw`3$>p9L3TI%=Ir{pT9>JB z)73k7wpAtXa?4q2zRdJjS}`Nz3z-#cdh#-hJx&OPaAtn>oVq+gYI^e8!k-U3r?P5K zoAvnNE}6|NPm6qt9Tt3(s7vA8S@U8?%a4N|9>23(O64we2o?RD@>uARx~gLCPX>*< z%u&e;l`JC5nffFTEIysy`OS7=MBFXoo!Jrhg*RP#?sKL^E>mU8RmUvre?FfWFUWHq z{q}w(-*p{#r!a7bfg#yLLv+E?gVwWam}Uu0%5djq;f$Qf-=N6I_(fOICn2c0JnScn ziHgd_zA%pIiPL_~&}3x%qN(WRkhJ}+qaA--ocMnIOF>RTZ!=n-+A4V0o;l+CLN|&> zRMSy}``aalGo^AqyKa5Dc&2}rxqEH!rKcUbdP$RobYuEvN;9%9(Os)4e`ep#1zS|+ z-?(qFQj*j2r21CQy1)b4~?LPq)u4Ewk?smbTe zTBvjFY4E08P6^JfQ~dSLUK7%)l#cUu+W+fw{JOiD^RgM;-Tyajum3Cd=Ntci{ag1} z)iBlnx?B9?`TqYBe{H|cR{hEH@8^5_L-Xst$1E^8zT}m5XgGt_TaT6fF*-|DL@Mvv z)<5;aQ4WoOtjyP+R-Qb(sK(;k(S(irf+{`wTP(y@WuKKJQfv4J&$>J>+i17QCuI=kX4?hovC;5%JijWZytId(RFjW z%*|2VmL<67wavDs?e0Ifct|sZ$A{e#JfO;Au(M&s;pCGKdYA6i@jm}4b1M6?eOqo9 zo_r%TE6ic(^=Co{XL}d_zjIOGQ|46hW&5_=D(s%AYO=H;E1#!`E&udyA;YZK%B@fR zmV>5bmD^idmI(`lr=Mn(Nn6<^_as<(VT_cR)m%60DAxMU(Yht}-w8T))M# zy4T(L^f-ML6;4*mFzjbh0$KF5`R`segft%~uf9U&PZqo1?`5auE?K#f-)H%OoaCLC z!Lz(40<{-DWZlBLy~b&QP1O&TUA{kjjaMvr>U{HB((=nW?k_XNCSCE!uwwK)slGvU z&+Gk}C7VL#?ff)l%62th?yrk4_8EI+Xfb-8R^PyL<;Kk`w~p+;VP^Vtjpt>jzZqK| z=Lkvt%l+Y?{WD;r+2P7aImonp*zJw&zwHe*@-O-uGHsHPxfb`2=eLK<;v-9Ac&FVi zoHp^o2c}Ir@~bni-B~kj$IhI!bx}(#n_Jq%0{A~o^qT$qhNYU)wiD8a&%C`M)YH-? z8sP7!J(WFNwqQ@!MWgqi#RF`XoV=O~^>pkzZJa_IRDkf7J+&H3E?paxSICA=|O6D_n`=;HPbisg0N;6~WsSC~@ zs;r;ATqv8oM%ARH!HwtE0iT1f-*y}?vVIofwW6A_S7uA2WYhKA6Z?*q9T8Ib@;}*D WWnS9sFMJFP3=E#GelF{r5}E+C?L@Hv From 34d2a0d3a041535d2ed43e0f2118cbe245bc99c6 Mon Sep 17 00:00:00 2001 From: TranquillyUnpleasant <62061444+TranquillyUnpleasant@users.noreply.github.com> Date: Tue, 7 Sep 2021 22:38:43 +0500 Subject: [PATCH 3/4] Hide all button for units (#5953) * Hide all button for units * Add bundle property --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/editor/WaveGraph.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4ae1258e7d..b16bdbdcfa 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -401,6 +401,7 @@ waves.sort.reverse = Reverse Sort waves.sort.begin = Begin waves.sort.health = Health waves.sort.type = Type +waves.units.hide = Hide All #these are intentionally in lower case wavemode.counts = counts diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index 76bbc82d2b..dc7dc6f112 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -181,6 +181,17 @@ public class WaveGraph extends Table{ colors.clear(); colors.left(); + colors.button("@waves.units.hide", Styles.fullTogglet, () -> { + if(hidden.size == usedCopy.size){ + hidden.clear(); + }else{ + hidden.addAll(usedCopy); + } + + used.clear(); + used.addAll(usedCopy); + for(UnitType o : hidden) used.remove(o); + }).update(b -> b.setChecked(hidden.size == usedCopy.size)).height(32f).width(130f); colors.pane(t -> { t.left(); for(UnitType type : used){ From d257adf0c1448ecc232a4eb088ac74722b17a41c Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Sep 2021 12:20:59 -0700 Subject: [PATCH 4/4] Show All (#5954) --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/editor/WaveGraph.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b16bdbdcfa..8b4a050c05 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -402,6 +402,7 @@ waves.sort.begin = Begin waves.sort.health = Health waves.sort.type = Type waves.units.hide = Hide All +waves.units.show = Show All #these are intentionally in lower case wavemode.counts = counts diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index dc7dc6f112..af80ab18d6 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -181,7 +181,7 @@ public class WaveGraph extends Table{ colors.clear(); colors.left(); - colors.button("@waves.units.hide", Styles.fullTogglet, () -> { + colors.button("@waves.units.hide", Styles.cleart, () -> { if(hidden.size == usedCopy.size){ hidden.clear(); }else{ @@ -191,7 +191,7 @@ public class WaveGraph extends Table{ used.clear(); used.addAll(usedCopy); for(UnitType o : hidden) used.remove(o); - }).update(b -> b.setChecked(hidden.size == usedCopy.size)).height(32f).width(130f); + }).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f); colors.pane(t -> { t.left(); for(UnitType type : used){