From 67b4fa6f6835d76aeb06e0e14dd250f7050a651d Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 27 Jul 2019 12:21:32 -0400 Subject: [PATCH] Map tweaks --- core/assets/bundles/bundle.properties | 3 ++ core/assets/maps/shattered.msav | Bin 16239 -> 16304 bytes .../mindustry/editor/MapGenerateDialog.java | 2 +- .../io/anuke/mindustry/net/ArcNetServer.java | 26 ++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index fe92fb9a3b..3275112948 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -267,6 +267,9 @@ toolmode.drawteams.description = Draw teams instead of blocks. filters.empty = [lightgray]No filters! Add one with the button below. filter.distort = Distort filter.noise = Noise +filter.median = Median +filter.blend = Blend +filter.defaultores = Default Ores filter.ore = Ore filter.rivernoise = River Noise filter.mirror = Mirror diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav index 3164e822235fa551760241b548948bfe7c8781cc..cad5016e9dd0c8d2605197b2a543b49711545b36 100644 GIT binary patch literal 16304 zcmV;hKTp7ToXve%b6iK3Ufx@`_67S!00c;I1qc!w7g4(?QWQxo)Y6h#qU0h_B&!8f zVE`1^oSvTD>&(L}jtPhD2isvg9AW!q>~J{R;TbzTizmkR^bhfaAN@AY{4&ounHRSx z_Sg@OP(WGto;+KgEl*|@-~0H@?>WJm?rFsN{e$Mg zzKVbJV^!Q~?gDW5=2rWlyEp%#q1D;+J<<>8+sKS$0 z`|*-tvn@#EIsg;rv6kteZ#`7Gu-OM%NLqE-CpNFraawiwhx}T8LMk{$`zSHaE`Kr zTfLz9+5~M6`&9xyXdg5?4)!WguCMTn^`m?T$ggGLCcZbaNUU80jg2fCt638^E@yFb zq4nrdYxCgxm8>bNYbzOitrK6Dk4z2~dnHS#Z1LAJcw;&nN9Y8TH)LThdz0N9UY|$Z zy@S2h{yxoG$(Xfv#8d)G>zASPE56QOkVj`^>n}9*@snNlS>yZg({y}jnMqbt6?a@4e1 zd(Ex(W>W}V6Znk``0e&4+wA)DL4BEDT6w`P zS^4pUAFIR!VHK^a>Q-xibFaO7(C&70U{!;ci~5f$*jXysZZ)@5d8c*Ie7xP<-&du_ zd(GV^8nH_Do1HC{Y<8R5ss#US_jXj#L})X}YqZT>RoriDK{f7*&H?)lsJ8p0x!+oT z)O@(t-c;57-rnQZa&vpT`%IPhce{J7<=yUDk9dE<3&yylHpRhh;sGW4FV$#7kUjC$Q8v+j{u_sFb!WY&eu`ZwOw zH5snUkWsIBWY#<~YaW?3kIb5oS^LI&x+cSQ88YfskIbq^X4NCJ>XBI$GOOQsPuFC) zF2fBsTrpI5xGuvr8LsM;wL=-L@o1e#glJW8t_sdo!MQ3p4c9c1XKOrK=MkY?6YOh( zeNC{h3HCL{zV?kgTjS9>j|kw5_a8jsd_L?|}|`-WiO5bPU* zeS@)Yd?U}+c(l%=4eiUOG*SgrQ>*U(YwrK+?*AL^|CinWuekqTb^pKS{{NCHZ?#&x zPn)`^(^VP%S3hXBI|r?;W&3e_tGV~B2`|gx^9r8Xaf4y(=iEVa&(ww8jxH>9=+V#i zb#!{7pO)H>JI%fB=C`W&qua!_Dz|d>ETwd!%sDJ9&R7_ z7?*e3njOru!vuc|`%m_I5BJr;QxlPwb)nH(-ZBBZA`evEV%Xg7?L*`HPnz2;jo19o z(x_v+{7@&EEe%nFR_Rl+)7@t_Fs_!+zIj6y4{7n^fL!Y4XQQH(Q;9z4oKt)Ft3eqrZ#Q+i*9wv+PYm%9@4@5tV_g{P z+MslxEgW`Rwd-Zk4S63NzB(z?Sv=olYrnE&eq=>9+#z{Y91dI_{C9=5!P1A42l=|9jes@+qstM>GgHl@SX zGyQak1>;AhAM`q#DBuQkLACX`C9fJ*2L4>o)@HO>*wYoF(dt%vU$6edo*`H_Y-zWA zy8Kv&Pi@aS_$`A?&D~B*$I^~2aJQFtdpo)qwlJqBKMlhl?b^M`xX#?p8}L6px+aT}gRho~zawQ*@`%a2=R_Cq9!|ERb3P_KgbXnaeD{nnm#opu0P-#d8heXQ{bT_dUH9Y9_Hn&?no$C&p8jULJr7-E)#L!;H zY&uMa-frpze4>TiQiC#f;^ww`UA-gN#4>1G)Mz)KsN_krz3p}+h3#f%(`57J-lm3p z+T7bg&T4KSc2)AIx359;Ze@4dB>88X+sO9&yV_y)w3C?Fx7F2^N_}gu*?X)v7)G{d zs(w;X-S&$xpvU(d2hQrt;gQm!5?VV>3yJHzV@ztqJ4Tx8>c)O z(Azf?Z|Fg+N~+S_)`|cg9k!UF4!Vw-PLxbZmnw!uGhfwwf|@yxn5ue&5|vPem+Wsh zAFG@;I&C7yaz?W%4~?o4X;Ky4zFwyW*{iFH?88;T zE~~EN%yOy{Eu-Gn>dm*dq*haBk+Q0*%Hus_?%&rHkuD`#+My0U(~i_~wb-p~({8Li z+Ux#&t8+^`!~TI3nH3W@_57!rQhl%2?sR+mA3rfbI!VAow%#*)Z#~lJbkMxjZf$Sv zgN}{}2d$6Vj}BB`qkFus8t}5_-VI$GY`1=>DmEajtX#cTRm1-uXiIxxTl-pJx3{&m zZT`RAe5RkOpZv|}>*#B>qtt}zC^cn93uaU_qk(4`!6(xfq>de7SJ$X)`Kh%&o8-7kCCFKf^P? z>HlWEOsKXK>#X@0nNit{R+#u7g}?w=3qd~R(YFjd$-s-|<5dRvm>K^;2Jkua@wb@M zb_f!)_`l7IvSUW0AqZCbcg(0{MxBh67Exu|N%L{gjLaPMt4u=>6dCCh^W1mZ4?`L$ zVBq@|27YEn6<*}|esI6QqZu=rF{9rzqlAek{C3)m{?h!JXDgXCqbYuIl3!rPB)?dA z?hDYE&OnuC5wc$7t(w|StReI9m>GSaMg1cdFtQx9onnU>>8FhEkIksg_(sgfaWnef zcY}Pwgd9l6ydZ0O-;5f}P=ntN*##wbH_T`t1Iw`W88VB@A)MeFw84lRQL&l;{HHt` zW*Zu^D(*Vq^Y%r{ea!KU|H|lx*v5ToE%yxg{)~B!Syz?xG|+hDs73tZPpwYd9K()I zi_A2|)4<=KSi7QWCCgQSe!#j~*DqA`hH^ufGv&rZCP5Wae z6ooVrmKW>--zZx|o;9v`r3V?`H0wZ6iR1q1IWdr(z<%LiG zCo`I3lTw}tB4x`*KV)-M*I`M_D940`nNTj&E~x#Xr6&GCE>sL{GNmwC1?2s)3>u1Q z{DI92vc5v2?LRw$o(#Rjp|8pwnlSe#L(KkiKXRgua#9kc!uSBkL~wfA^VNV;DTTma zmA$*n{QVCzI%5Nrhy@V>-*=U{z~6r}qjPMcF^8{+ zmu#F>QsB8`O!6I82{QWqSPI=lC+p9NY|%Uho7Iq%Gh5^2}eEpN%o6 zG3SLv&ITznD_O4%uoPMMW1JTf4$|kDE0>x#OdRZiLGZPUTtBgnO>e6i;j3WXWyjTFKKdQsYn8!VVx;rWMY_P+n6&vr zuzc-M6+Qk4i+c+l1gId)xJ{J-s)$j&!_h2a#@ilx!kkOTNs9L{GjXeF&b2wK&IfJ; zv2L;PV;6HGlLm<}Y(;=4_n}cRb7fl!iN0mb73)GrkrvqBVsG)t+G9KIYe(`OUheG> z^AUDoa9!WVkMT0b)+XVDWXkWbo$fH^tW=qJF^7CQ&ni)DG}D|v6e~xn(wkgDf3IIA@~K949#mswJEA zI=;N8xjY*7A~1QV=wLRT+5(1T0Z`7UFiW0iULZ_t)h=hD6kDuL??O4gNvw z4)IDaS|xV;LMdizmrV^4q$?_kWP#mJRzd2u$nw`^1mtfOR#PtA1_>cw2NauFtnme=EAgdd z?SQDwafwspzz9N#CBEafJWi*2w9M#FrqPr4#NKGf_b6$&lqZ-u5e?@ool(F#d$WV3tY8CYz(PBQpwH@ zsO7C9$o?)fHBoUPq${n1m=i%E?NLYjS3(WRYk(~~V#O9X>LnR8imb`3!V5HRuud!d ztYzgT8buB~g^yDmq0dUo85=9o1R5X(5saI0*cWiS8s zA(>}mEig%mu`{gLtD*T^U|vR9RK=ajCCdTTAO)^LqJC^7tn7rdUp?gDnhgcCv`d^< zN9-a~FY-KVJmSJD&g6hrU#JN~Id(t1m}PmdG8-|+c44E;Iyi5+3YtzYz(#|^tFWP% zjpHF3QjMVcn(?A2v9ZW(_|3CEY)BZHVY*V<=PVm!0x6Zm%*$EkW!SFj^LUB9D(!22 zMr^EwLSGBR$Z6L75HCuB1AwzcTE=`vMvQ)Dx>A+SaxjN-iag5qqZ{$wB^Q#6*@4d3#~#YI$C1cj6vYJVH{!VYxpw3et_RdYIv?d({RH(z6_n$E@cv3wV+3Sp>}S zg3huh5B4L3^oh;DS&qdGMt{i*WP(137ONRZ5zMg{I>*Z>NLM&HNP{>Ik*=E;#~A4~ zMmo<(^Bf8UX_DET52DKDQ0+yIB{imYo%J%;kJ=@6t5l7d(on>4C}&eNQIkz;mF?;( zuWyNin-G@+}9&H-{jfp9&=T*>i(RFSgre3jX#vSZ7goly?(Q&#On_nOy>Bx}MM%LK2!f9^uS zuQ3}{-f}~eH~^Sr8rXEbVMbCdNw^*l>DEIUAMg%*gk8MM8fvgMK;tIIy2Nv#0DZy+ zTnGuF5ira&{4=y2K6fTU?^u-_B~;|4l^2TXO1b(eBb{Z}h(l^s_M_W8H(@wAm>Xld za#&Jg{*d@SVWdOMP=)i6Gh510HFm2>7PVl@1ycK%)drC)u!<{8@>51N%p_~fc!`an zz%~Tq$}tVOqf})b6hj}J$Y3MKrt%SUuozN{d6A*cdv>|IPJ~J354yk4bI;p|9=P8z z#`k_0JmL@^+yFa*51FeheA_%q7)ugjnP+M+(F>tmHOUt5b*1ZE=aBKL8TAm=(Tup?jAN|(0?%FKx$*zST#-$pcbtJ`idQusVtMRs1&?BJ-B1FVWGuqV67!-M z*d>twffRgFmCm!|PZ*VWa>7UpEYTRdDG(eFb8-rmxVUtRk`PsasU7!r$M8ntdC7j< zaRpEkHd|#!I+B4;3~4LGw;3{C4w;O(KETIe7P@F-F{P)x#Y|rDkQG*D)?`O2^-vbR zqQ@yQ`626B9H-=M$;hrstmiq-zloJ{$KOf=fvWg}2I4D3}H^GdT8GSL-P?HhlSjBQL2;8HhXs|sCz7s6I;QNMcqs4OvLQ@8R zr^408+^?CJZ@h|e$M0mh+ku2-o=-+q2EH#W-L9Y70DPIz=a@-3W0A}2Sfi>n?-qv) zA|!j=&#iI@sa)K?%p@^mhJ!vV5u2`>wMjXeroMngBsoO-%&uzC@dBY$UNYHFPx3P? zfNL64M>F9Yu%fGR)@07}=?=$|j=L6+<0IW;%;ZUnp4BVK1}pLoh96R5D!EQWL?sz~^fI|O;YvgEFy(C#S-1Kx=+ z{L6Mk4p4+se7x_qCIe2(%w%GhHt6=`>@B1Regz=h%Zc3thil19Vm=5<)80yxsB(_@ zLHZn#qAe_YiTP{rT(p$SY&nr97BM-=0V>a2onT(jj&3jq@1+l_hyzG;k-f3uT?TmI zZjVLYK?~`n$W9EGJn0c9otC}10o}XL<>d{_!2@^mF?DrKI1pz~IC7MQ|+gYpF`j9mi7T(U6ZRX!OBD&RP#0hOY96H>w*n#58O@E6hpT&+v*)Z)5$ff z*F&R`Q^86GYk4;1VGdvJ9u)D1NO<1kPga3i)VIO|54Sh%`dqyh-kr%a7U}WGofu)L z$_hinYLS<5EM&voxeJaYg$-%3zRHUi^WsI^`YUsKD)DHTW0MqUbq+xh7gQ;(@~oUJ zu9A?em)Xl=&qS$TH^IE%YI`Z<1zV$4yHF1dh(ww|FHze4RhLVvj(Cndu6D8)Sr|IUW-%UaGtfvmVMQg@su@~K*pro4 zjCG6)1(6}K@u1^wY`HSI&2j|x7c&P*$XbCFhFib`tZ{L*a)wFy-+1WyMmWU8Q!xzo zcgZr@a-2#wNH{!zztgO>F&kRw*__oHU35@{cwhlrI}$(2v4}FWP#8 zbSjou2n7_LQ%#N{hr=Nj;S`&Ie-D{1)A}|^vL#`9@|U9H_rgb+ZY>Pgv8RZmVim(n zIwDN!@~a#<`^V6v*pt@ZsQSvYCiB)Tr05Oos_3bmsG%|%@xl!)ZIqsIRG55*25IcbW{PZ5B&u*Ylns95Em?p$7pB?NCPaE<4K70^ZI5OM zsM56n2`EeU;sTN%%~>oGF)3xqv6FPw9J@iq_%lgav_)?p*(#xIbId`*nqx36moZJQ zXf1K!AZ;Mo71c9h`w{=3tl=&PkuW)%G>^u_)Q&z?BF?^`Fy&Afcn?}@m&{1Mwq9Ui zQeBO{BFIK3@kXQ<|4M04CuX|_DOPUx%9jc9FDRgVZx%~-ns>Mt?H+=%X@i$63H?0w z3UDd+r43G!=h(sA7aPcczbgRHx>C zEZ?q??R6!*%9<57Qaz93oKA9H+nO?`-yZubNjc6;*4S9Hq!eS#g;K_xIm2>-kWuF)m>%91~MwNt8wT}xR`WnN$zJFXe$?nHlQ zNb^-fksqODl_eTsjXz%^;ULFy$YnCQ_2NwQs4z#&r{j()YLZ+4MJ z=P+{^Uy*2vy4-=8pfv2rfYe%BgvrQlwe4?8?@y~#t;bkYR!sRY@6l&ZLOVSZ(F|eNdl`R`7AcK&6?>J#2yl7q&cu{`frOF+bgi{=( zDm?L8ciEige$5=nU2JIyxL`zq=Mu94YEL+#_e~Ck=hAf--~z3Q5oXZ^0^A&!_*v-6 zbx+wIe$*EQD^F#ZcmvWjn3~mvRGPsLBlaexzUgHS=P|%Y!XnyD8=P9!f}Wc!4YkX(^%Q zmq$>tuP_^`KO0ADxa_P(8h@MhA}zRv)r)LfI{v}>AbYK-1lLzwKc^2H{_+GI+_W4} z=#%fribs_*iz3)K1^uCZTpjOM+xBJXZ7VM&hax*z!CUE$+sZ66Nj&??Dk2~$c9rjE z78N#&VweL`bmhM7a@e$sSP@^Ex0BZWc8-`u?z?#@vks(5H0+&t5*sIMRtr`}A{?f@ z%fK+;V_}+&UXY=Jx9gzN;CMfVmOT>)*hndR+FIT7cu`)ArC3r7d70;w3fEY$8V|Nh z7emaza@!tSkg|mr(PZk-Crd9yjv$G(I*N7ff>f$1C5B?2afYok4p~ceB}MWXkJEt3 ze7_)5VkQeLYJ=I3AK-~>fxF`v&*CZxd71XCNpk1|&R}g`Us`iHi$NxlACo)HOSWta z&9*Cb9q}L>O5#2}#%1-@DU1W)J;we8KC6N$|{E&%9mN?Ok`pGMFQ^&kgCO2$qBdZfaXFLHPvHo`4 zK2&`-p(FPSj#87Js=Ma0V;b1BzHf)SJEzzVAHkAy=ED_?($t94-(`Do)Q+NGuoAV8 z^a`>J#I0L^{%i(jX%PzJ$qQnRJjOfj2W?%)U;0giG#8#br@Fd`G*#~QY_QtDV#T^& zYeXz*Id~r|XPVZuH4$!hG0V>kr7+*+oF|8g z;_PywnCg9@pEJbVpJeW9R#!v=i+7J>UF?m>Vcl^9(UsdBu%Wu=5EM{Sbmb^2Mfbh* zo}K7Q$GXT|rLHDMA<0pjlgaZWEq-dlb;sN|PgS{r@5k0Gc3cEWoo%N`HaJ1nc**3q zK%{W^jFb8YR)pZNPJT5^eqBtqf`xu6mY*q+Q(Ac@iE5M?lCR%?#sRs&qmK;cB3}TJ z+dz#>x@4G&k7i1|3TQZg!Oto@`q*F@Wy}NpFrVg8IYjy;FYTZ;i;lS)-*zjLgh<^N zh^d5K3sH5=sK5x&!mJqt!~GDf^ZEk8E+hCX%nR7Wjd*$gd02jqD}W*=zV{4*IWJmt z_^U@9cie!rM2#-rTG(TT3ZacF>)j8G5lT<1<7&N#SMVxF(UB0JJ46b$s&@^(Nh@!F zPrk{T!ne;h=?*84md=9IUF0LPeUrtnv!5UEGw@doS(^y4B+tbneF1m5nN|=8)!EmXpJRjz=henub(ZRpoBmdurEL^scgIkxUc>sDsE5myg#p)=t~Gs;@4 z@~Zx7f4XFZc`iS4VQd-*HzC5oyp?i?FD4K}2*}f{Q~9SHekFsAHESR(zQdB*Zc?dR z3d{Hu-2&HK;16F(nD8VgYWODCF(xEGZISw_X`F#{ijn?1Thp}s3$bI*1-|R8%ntwC z7X&iKPVx`U=v7uR%yvASHp3P+%IQ-)`S&b>pcG0hLxcq(7oEj1))k_~2(RxiGnRto zRBjECfV0eoT;UmJHUt4a&WFlL%}v#gA8-tljt#!vKF3&OYdOhS;t-vUo6*Y7aZ7%|VkZ8kLi7>a(DVzUmyVbG0Mr|d zYMNbF{?VODULN_m{uEOGV7TL7GsxL0h=SlG8!(n}svr7$87&pTEJ5Z9TjxZG`51c? z@YOj)rnXus#?LXkMeB5=jTBOMw>yQDc1kI;xc-9ps+>RG3wtdU_SM@wqc4^Uhm7}` zA^*-!%NYnv<&GD$2;X#wPrh65A)8MMU+PE0v7q;CED0_e{#DQ)E#n2f{QS}&$Cnw7 ziSiE`R9PFT`+ri)3(`Tpk|s!xa}=232XK z`XZHoh3am|WGO8Du==++K;dJ99V~_FPPhuGvst+y5HYH^Z9WQumI`UiFpX(TBUN)r zlnQ7_5jerd^%fgfgCpiKRxt>@8wT#Id-^#>THyQ(r$futNNdd6I7^AIK;90e%=))nLdOh`02$LL}A^6x3(3gbJB{z!+Ea-*w7$@m4m zlu;YcCFHmwJGdEYC`D4Tl{8T+oFL)E>r73W9JrJ@!qH5Q5nwcLXWW5I9i$aPlJWy- z5#s|_YfL=#yX@myw8&Uqpb0@UcMta15=j6`U;wXww0E->BK`O=wxPL-*|*q%!s zNurim8iD<-u<9bVy4$?rtyzXhL!cqQ?Jqz5B7`K2EU}w{&=t0@&ohyBe3z64#1iM8 zB*gLsW0AwPr3@@p7FvE+@+xEbzO`}UrOy5#`wvMhSy)Dy7r`>hfl+{`?A!p0Ea(O= zne-?=w{}lR7Hy0bQ=w@EPIn)%p--?2 zAuOF`x;_?qhHcPbKU8BJ^?>RFp6h<`iLf9_4Y8ktHTeNX`7!1XY}OD%4-m+eAUVj0 zEkk4$=hzY7XY^;-u4Dm5dGrypw#aOpWlxbEq_k&K_+sWIvayaiEL~@_XfVDd zo+0?YVE2=|NAgo&aTs`@`^#($(z5M~SScybM8HEryuo2L!?C zeWp?685fxbzI^PC(}Rc<^9(V8TuApaQOrX6F8hLTb+z8B5FoN^0Q9u6fHp z_7tR5t2JWs76;Wkd}I~bn4K#9$co)b1D#wb&*_K;^11t6Is#c>Lw}!p8S)Jtm+88W zKlj^^!TpFl-x82xPj?*G(NoRn1k;f8e%gva=Mch%9FX1O!^scBJ(K&c;0}|Nt(Ke~ zwp^Da$H$rA&%e$wR7sJ~8 zd&9)qXZ)fss^4b>a*Q7_FI8TE4;fYJC~tvH@85=I0f}JGU$NxTbLYxhmU;BG)#>x* z{(gADyX{$6Fhee|4yES?Em8Mnmf&_momD6Q=+nRPOr_&~pjl37Q!}8>zhtvL@+F3j zi~I$i>uxm>_dgAlD7vaLdf9s1=THhG{ELhQh*{6_)z$mF3M!QCFF5E6rzhDgJg<6@I&7%k8Fd(|UaSry z)f>Q*Ep=GJlbY&HtHaZ(Hwt+Bn2PG1C-|J|)zx8L^{(N`dAyDA zcZOzNqvthsn8#ZU`I0(JLikyASXMoy4yROaSRGzhy>sC#&D&MLoW*m^TT%5+&|9s6 zp>URlyaMS?<4FQ;PXkZl!CM|0>aalYRX~p6`DH*Bz;j6*zU0B@!A}j?67ZmBeNP=u zt6rYqUnZ?CK%WB`zl>QC^k(4`Jg=z3H&pKwIC&3mBj|qwZ{GrB4w$VDHCHQmQi9Y8 zW*x)ITKJR1mFDLn{#r==huM9_9;x)NAo0@Z1I! z{dN#?#e}U2Y!+q$&liC06y|D}0n%FmmR9rN#|b_r{gl8@o_JV<9p*#$6VS;i{H*}q zu2g|+U>+-CXH{txhG?#}77afLTgqXqsm$Ste)~2cFB3npH#dTn+PM|zndc5*ZqCF9 z;{{q*H)*bZau4HS@{0oWU}wdKLmk7M7yJu#sIb-}9!vzxTA%B%vHz$J$FMpl3{D;E z%yX^hpQyu0=)peMv=-IjFxjgAwr(oF-Xz(l9{(Y1EWz8V*`XND6HpoT-p1sWb%H4X zr{?Dm$VVcAshLfafw3`a95AD#w><2vY8oR3<|Mt1uyzTs+4xX3`#1xmS9T2={yXY$ zCJSa5I9E)h?for`6GWatv!66;ts#r}8w0~dX!Sni%0re@(11THrdY%gX~kru-ba{~ z!>TQS{~Trwm<^|k*fDgz>cQJctKk;_KZ#Y2q0Bs-E5gGyi10a#YRLnx0@$v_5aC~k zPQHNUTqNLQkTeJN=CH((2mH4Y#$yVDIl^gIX95gpZa0B*fq-Y64LF?Rz{$YBOo}~+ zzq0^V1Uw1gacDye^-H9Ub9g&r#23gI7PSf`{1{4zC{KY0HAgwc+SMgM{(?GO^|2)kOyxCtkJS5 zObpnDQ=P6l42e;IA)gw4mdw7a_f#FO5i<)e6eugH1-n3CtE8d`kQEOyXLh8Hu7 zwo{N5s3Jzlx(Gp@QfeE8-l`s0WXec`umnMtq5KgKtmaJ1fL#QigJeSb@7IKR#56_b z%(hsqm@gBV3NyeE832PJfs+nk?y}6CSL%PMYpVFu!HS+-{ApzV#O99));}$nKSlGW zZ2nZtpQ`y&Gk;9)NL}}dHsEWKDXWciwg%Ha{#8KqgxRmEHFJcDxivgTsL|EGnHYN$ zt<>k8Yios^G_6~;Zn_;beHdcKW*=u3G)5IP0N+1PHfGaM#Y}cEww`2|353c)6YA9k z*iQ~0Yp6NTJHIv|nqh3NEa2}9;D?Z}AF0E$kawI?L(#NP4Tp)TTFqaEJV(@RqRE^7 zQ|}mztqPbY>hKIvwnXibkD*h(sxyjTP zY}(*A*esYeej9f=aIh>*N2P@duCBav16(_-!}mem4-qU z?O6Rjv^NGBV-ph$d=7@Xf(UjT?l5fb>zlcGtXdBH!3Dr*mgWt^2HS67UwQQT1sFiGpDe);LQk1}>n!=nrrjdiWdwCy-|u!0wdul&Z8jeb2-e z2R4MrFbl2bsYE}C!rOvba$|7eSvY9}9zAXja|K|AQe+OE3tu)WEyLYr%>ktYUULPK zv7!hIkn5ui{mcXAENs33>wUw6xr4W7VB~ewb#Fosr$7sCX!Nt--Wr5& z0N^w@hwB-)^#R_5p~kSZeqfO~sWbLq_ZO$JvUdSCZ@L_ke~*Dflsd+Q3NB8jr<^qb z-z9zP{-~N<{J98&zX#ysW~ZMGe9D6?LZv?B7+k}~^97VK7r{UYD~QgCaUbjmjMvvt z|G*>+@G{U^;4?(jZWsp=1AXZ0+MZ;A8+qsF`$^~;*U|0R-!qiPvDZvf1K;xJFy)=tU8F=O~t0lGa4o44Bg zf?8E&P_Y{myOoQ<(lUS%^9}HAw`Fhz?Ho*H&2;cgc=;YS_`|?vYvbdf9>JAf_W&x0 zDtTxIDcB^DA*@Roke@=FJJ3MgZLZZc0oPH36++;5fw>NfMU*afe?0(u^MPXsGE8l; zA_^PsUlqv3as;oDyn{XI0N{}t47N!?-T_Pz4U;l$t_P6_6g-O|Z<~g_gDk-$svuo8 zV*~K6QIUD|Hozt!=A;K;F%;0GDk21x0MI}<%>e_NZ#LQ(umS>I3hXv2Lv&!&4Zzs$ z(CZja!||s<*TUaI$f~%|cbKP8|0=kh0iJ18xubx;3C9Ep^*Z2RL0MG<+q2G>4FJQJ zk>YcvhBPoY2@;!JgL#NJDPb*q$O1z5JirFwkMCd~Hv}8AZ7AFBcnRs-TG0Z6Oa)W& zm=Zac(YqN}wH}?afLDWVIZWR`nX=sUBi7y$Z0^X1M(f?GA>9Kp@egg z#me{rDtU%PNHLjl7+@s=`xx?~Eu(jC#3jQ2`iv+xDQl#s9lufHP4U?li&Lf0{2;2VwKw4WJ zhu$Kns|A?YV0JPpEWNER-X(bKs*HJ{Dl_W36T(cu&Ns1l7&mUE5ROb_F5<1m@Q~i# zAV;3WEPnnL3Ka#-+gD9k?}V{xQ!*)tYRVYW7g z;xTjFkO44Ywp0$_x;b1n01Xdd$ZU3u8%}v7YIFcGg@X2r{s0rG@O^+4w;gt1iX2wI z{S2~95?F%tZ5tP{2lgqva-3SzYXHt8nAn;v=K+6$1X`eTfg&v7lKHVOW63onwK9C) z!ha0^MZ?6zw;_}w7ZIPUlwpSftX=Ozs)BNKwxY008X#}IgcN4;pq)5|eZ+^TX3LZs z#!%N4LB(!uE~0WSQZX|OY*WUI4aE_ciOfnBOe``Kk)}<_k%Kr4e-cC&q0g7#<_Rgp z?rpKHGhE#P@^RW4TmzvPy8{L|i8Z|dgTIPwvf%d7CaNspZ3|J(ZeZ=(<8YHxc)NwX zoI`uWKAD5f<9xxC#0+E49nOP|Q?QB)^cE^L2C#@gbOzSD1T`YO7#>O_<`TiYg3`SL zC6~-Os)1Pt{=ZizX`}H$o)%tJC5x}gG}*XQ!{zWTw5~O{xe)@ z5y9jZ+~J?Vx~B2`JbF8~fb$Sw|X6a9n-&pm?sesY`=FL#mui_rM`qs zp70975#ae1sO57AXtN2bIM-+$p~~l%pw*9H&oh*v?9tDFJM>h)h>U+9FtbSFd1{F; zhWm&=(K5!2HWWn|aM@g&6o5%nQJB3|CF|7%Y@N#Bq=P4~A#O|};MgOE zhPlXLX7Q_YC~5qM6DYKBUa4b?PPp=XfsX&~nr)YknMT0Wt9wSJdh2A=SfVosyDxYj z1^kL>c^fs_^9y?}`2ot0ReE&{;l;kXZ|;d4u3-^NIB=P#^S+PG6%8HS%&RhvS5Ba} zW+nXquX5B@Jp~i3U~#8`>`b%HEKZ&;kL{W4p0=d(LkZa0D~qL8A7%#b`vYu0@362 zYK%Pe7CIG=p-KC80QMHqg&F&{hE4AKpfy2;cN2NszCDIbXc<<07un$no=?$pYkP{K zN*=`+oYyqOEaXS{7`sh@i#!Sy(OXDN-@4?bHxy=BYlt2(!Q4a;*mkw0G1pIkVbt|M z4Oj^sk`71|QFVWdf&qcZ>_fXpUd3R>zA93Wq5~aXLDs9_RUXXns|{qUB3{`jr}^2& zt98&SnAC3`;$E=XK;b;XJ?!G)B`O_bQ|B0#cJX}GHF?ypf#N=_T4VSv@8dc?4j|Sk z)W(*|Z{y)A4Dw~H^(v~k-@)@0Jim@rz69BS7rwI!1^UnbE_UVi`88~F7EzD=J^1w^ z`4PW8kH!7_uFG*~k2rIbJ+Hw+Y;(gx{sTIwDv>o-D3U0^!|zP^T?G77EZh{$8lX6k z58-16P&5ReIDS0n|KLupi^%W2kZ8fdrH zkW+49e^-KrXF+9@YL5a6s(t|WxaS0viF;yZk6%6lX6@%Bf!X#&g}@qgF0+iD{}<@b zoS@r%#{qz5vI9UHUjSxNP1&%ZYqQr-uHyh&0ES>`MeOBo;KB zR#>Ui*zcSq;5n?qbpYeCqSL&>LYzhDj=Y_6&#|{y$&SyE_dG4du|U{ zfK?RC6)c`R1Euwl>)5;ABU=5YU8ay+EQT+m zK@UaujRUjgdCuHv*DzPMu(7iSuz9p+kt4L%8vwTra63oGXES(`!>l1Bqq8ui*CCg^ ziFy`b1J2(~0rs&6Hc0@p-m4+BL?#iGX7OqSEG^KrWYohZ2Q8vuIEq_6A0ZS>;ME9j z2_DDb6tea_5WWW0H6qh2|q_d)|RIBG)x_Tl<(C z#O{X15nk$)^hc1eDyY)!J=hE2U!mdCpjJ->65RlmdoYh2g7yt)xI%e(7>7hfbS%r% z?YA0u8;~Wpxi)rw8w>q09mk9#vQ@Cx9z@(`$bSmRJaEPow9BAAOjWe)jobkzUjoL~ z@O(NDdGKdIWdH}4I5>8N+&T0m2F)q9q4WJ3HpSv3fX6_xV m{+~m`2^xm>$)8a`Uc@Z>#9GA?`Z-nnjX+m3`hNg%^Z){G=yn|d literal 16239 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 Z5wq+QYZXiA=Tz`-26Q!}{~JN0=zN-BqL=^x diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index 1c9f4e4b2a..a78d342366 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java @@ -307,7 +307,7 @@ public class MapGenerateDialog extends FloatingDialog{ if(++i % 2 == 0) selection.cont.row(); } - selection.cont.addButton("Default Ores", () -> { + selection.cont.addButton("$filter.defaultores", () -> { addDefaultOres(filters); rebuildFilters(); update(); diff --git a/net/src/io/anuke/mindustry/net/ArcNetServer.java b/net/src/io/anuke/mindustry/net/ArcNetServer.java index 0da624635e..ed8496a8e2 100644 --- a/net/src/io/anuke/mindustry/net/ArcNetServer.java +++ b/net/src/io/anuke/mindustry/net/ArcNetServer.java @@ -1,23 +1,19 @@ package io.anuke.mindustry.net; -import com.dosse.upnp.UPnP; -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; +import com.dosse.upnp.*; +import io.anuke.arc.*; +import io.anuke.arc.collection.*; import io.anuke.arc.net.*; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.net.Net.SendMode; -import io.anuke.mindustry.net.Net.ServerProvider; +import io.anuke.arc.util.*; +import io.anuke.mindustry.*; +import io.anuke.mindustry.net.Net.*; import io.anuke.mindustry.net.Packets.*; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; +import net.jpountz.lz4.*; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.ClosedSelectorException; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CopyOnWriteArraySet; +import java.io.*; +import java.nio.*; +import java.nio.channels.*; +import java.util.concurrent.*; import static io.anuke.mindustry.Vars.*;