From acb14a0986cbe9687fb6aa2467d573b289b002ca Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 9 Nov 2020 10:40:02 -0500 Subject: [PATCH] Bugfixes --- core/assets/sounds/conveyor.ogg | Bin 7040 -> 13441 bytes .../mindustry/ctype/UnlockableContent.java | 2 +- core/src/mindustry/net/ServerGroup.java | 6 ++++++ .../world/blocks/distribution/Conveyor.java | 2 +- ios/src/mindustry/ios/IOSLauncher.java | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 core/src/mindustry/net/ServerGroup.java diff --git a/core/assets/sounds/conveyor.ogg b/core/assets/sounds/conveyor.ogg index 9f989d70d0bcf801d0dccff02105472e0711e914..67576b44a4b20800f332809686e8afa39c512dc3 100644 GIT binary patch literal 13441 zcmajF1z42N*Eha&cc*~V(p>`5uuCtYq;z+qfV7}=w{(NF(%s!9B`FAqgtY$~{Qlzq zyzlkAbIs1qJ!j^enR7m8?lZHiYH6tff(QMRYVzGM9;%bkMcZ)Ha2}2>Cf2SG4RHR= z4_`p?gnRt@0;l>g^55xUBsJd9v*jbxsKeDHR z(C~0^^K)@?@zXGWOAr2c20!pa1wOJW(yB7DFfll!zkI+_(%Nv36mBJ&UjK<0Ef5G7 z1TvxrW5-)Szy%38%-$&p3JLLsMA`NbUwNJj~}k+~+-fby7m~zWC~V3DH{!G58%~Od9%6zVu!D{g5A*P6G$Z zekz=_3C^V>&;2Hxix3=I4i7SWPzeoM9340=4^n7hQ)!*vU{%&&KU~8$T!Z=81q26l zc}UsTX@&nsw$Mp3|9@u*s{s~}1fa`)XUcwOdRZ8KzY816qlO0_tStd!>viFicjfDM z6$P@qo6KN>(&(8I&cBTC00b~-AIowl7_LYO|?8LpYm)L4>| z{%AqFF|tj-mf)e(-t5$gG}kc*W?I4Dnm2wrN=3;O&_=eKf!#-D4D_>}N<%4Gdt;MEFv=Z6lfiP`fhAI2uKJX#1b=kpS#w zyg=HQ8A#(Bg=|7dTSyyE?G}w4pUpi0&Zmxyl7p56slmvY3fux8S55;01>-)V_+P~% zl>eeQKkhxt5OeJa&oJ9VQQkc!a!}QcD~-twpqPyxKyhUKPL^w>u!3zt{hTgqK>`d4 zF8J$FfKh48VkD8t9-SmK#bpRw1bD@N8}29lI3CsHf93HLN_Bh&AW!nJYw(I`X==Uj zu-8d;U;Z3ou;9Kn@4Gf1`HCd;e*){@o&y4$Ciu}O6HFqw`!j-6q|p8v_+OsmOxPbw zIT%Z?SVONo#WwnjPxX{M10SUMG&xJIOLUtt2(;dr2<(|L`2E z_eCl1i^AUThD9-lCs~K5l{V(u4OJdA{Xg@+JxAV!9>{>_$hy$~m*;eFQ%VEgRKuox z`ge_DlYm0qWJ&(p03c9D45s4aKB5j|pM~+y!q~Mm#r}7X0jRTl%F}#+ViQ3iG7#t~ zVB}!j_bxF~4q`7+xp(N1a)gm{dPswdaCtF>vFO}lB$>p%#0hs}p02}~iDZ<5A{hju zXt25p^rsKB;|2vP@u{J96Xdq`czAcNU5W87$&2?N4R1@Ti5FnbayFPNba-*hu0 zZwfM)pFpbkJ~JQRG`s>B1VRBm7&#L$L~s&>Adm?r3>_Sj02>4E#K4BQw<%#z;i3$U zF=14y;3010%phEF0j0(mxSuk3L~=VLXhM=11fuDH13psBd}gvBTqe-E6a9ERpCTcH zB7y8Uq4_+4@_ZuSC?CJNrq(cl)~u%1GO@B&1A{Vwvhtax7J;l5k=AsQvR1wQIG_2V zrq&9v)@+0MGO^!_B=$6lJAC_mca}2#ot;w#D047AsZLI8>A1M=V#pk zs_~q;@n`onX6rO-o802kH0ILMlF|nI(#i_G+`ZD=(xDp5(#rCononhwb_W2pvbeN{ zt+bS_tfu^?l9P*j0s8Zgt+iuBU5gBl0c?(zdEbuC|mMDsO4 z1052FHNhyo`N-VT{U(;-Hb4;f*FHzeW-dyDWdVSYSyO@GYdY{7ZQORb&-q4V^TIvv z6DC@JG=L4b2W$`wN#xM7!ut!sfsko;2{mw8dTHEnVf!@sn%u~=t}4)8$^L`NU9b_Jk>2o07g6-3UBWT%O&0 zvoQ!-LEQrZV6~f_k1Yi)$R|{UvTKh3K+cE*MOAN1FQ=2i4~#T4TO3Q+;fz` zh!=Ak_?P(tkz-sV8_@j*NlmviPYET>$T9FtB8_9@&U=0E9Hyhx(l*S3CZT8Qt;+8H&Ig!Zo__ zTpQSR{1HGB{%Gde4_nBC+e(JP#vsOeHQ#Qed#wh$JdQ{g^Nq+&d?X z%1}V8$im*MZ3_kit6&G>jz_meRu1olL&wrV1IYkh+(!fKJIG`Oq(Kv;`GlspbOoe< zT?z8_!BD_b*2keZL!PqQ)89~@ms6@atfOpl1Fi_x10R$l4%LxLCf`q9D z0u1_{2518pxIGXOVCWzaixUtLRjHe~2F7LsdnP={`(e+73ZvvC$btK465?QhIABR7 zE|`GsdbJ-23A#UM0BG3pd*A}F>eH2mR`kBKt)wlOGb!hv2S8lElV%GA2)3h*AkbGN z6i^icg{%M*DH;o(+2bPoX#h1waEB6_yyxD{kVXafrT{TcA?ZWt0lZ`%;*SV`06g{q z1mRuEha$r@>OXrMe?j7$|A3f{{P2F#Nq4Haf) z08j!31MmSnIzbnj>I#FgFcc&`Y#lSYPa=TE@^|0Fdn2OLP(7MQv%JGg$%B%&VBKd?j0nS9`%)5QR- zJ2-*-6{?&=6Z31kCf6TrO$!9uQjgkxI2gbHTVy|=g;oX%py~l5w84NG{`eQ2>_aRFKosF&7k;`&pEpEj$G6dipk_4y1^HuwK+X#` z2jIB@n%<1yB*owu7hDq#JlK0-`D$|ovR=~J1nvSt4Vdj-hDn6FYNjcaySqF=8_FCT zIOS4a?=b=#2We12T)4En0TOV8qyvDUU_>w|yQ*V?TOSc|3!eua6TLs!b;=q6gd047 z85{Nz6Q7_oAlF0$^itnw0L33OGP3Ri#vV@xlEGJZnqV44+OS?Y!WjP`0tc^eSgKz- z(L`hmupdvu>mU#{2o#4!Lr0e;9EBZ?6N4Lz7l$8DkO06J1ge7b#{v1%BZY;9Sw!V^ zZz9mkm<8weY#}l{k{=3G)W1g+#K-#I({cx}6+Wbg)AEBD>Kw5|Qg-&9y7tEY!H(Y6 zFI_F|{cWwS4ec#0?ZGZ3xEH0`ZP)Vi&4(lQ|Z=i6PSJ9jcU%J zGYd!C;r#WBytl6oqcb$0E45K!d?3&>C#Y|e8<4Eu!+EKhm|BK4@R4mjTytK$Blzkz z@J;c^k2do^4ZJ~?6$#w1;keW_27QSfUzmrvFNeth^Pq)6ry=Rn_Q`ENAcO;y&_|BX|i~)yuw$DSce<_2Dj5>I*;iI8IUtg&SMgJ8)?l9H-r`$&l^rWKTwYscx`7jXByK_-A%rl z5xv@W1u^@il=qrBsnaaOVb$tc;-r%f-J(;K4g_f`F~Ocg%F$23UrH8r5~<1J!j`Gm zU|PUkTJdX6PD1r+Hi(+sKn{-g;vvjA2UgNSW4EudUZCpHWkWh1^vTx#(H z)XXM%44X zXnqefoljbtps5|UC(&#~TBDV@1UL1*4^TqD+mF`Ns@6wUIRBCzQK9Yj?J^LAdJ8;TPArM z{EBuj$^2*0IBv-~xvOC!>L*VM_$A0nq+vZWi(5L3`f!$>Nh*Z(yL{b=SP0FxHipaRyzvR_F6R$71C8oM8 z`FKSIJxS7_9o@E(L_R;Ys<)_o=5jEw%4BgRRE31f?&iGaqcIeF%U6`q9GDQ~9pBSJ zfpDjUM!XvrGPs14Q;Gcar_i)h<8}U=o}HsZYyqC7`m81(~JssIa87yvL!I>3|SCd9s`tE;b3BEkQpJ-O?cXGf7bu3yy4~a z()vn6^Zlqf3WS`a<%FTk2EKis{yPn?Zp5lb~r%(|!wK;o==Ija4%&c*L9D8?SXL7{7C1^QFPB@WGwhVz= z6%oTB-Vc0At1cKXpIOuZXNC}L3nIN!qZb*L2%m1wERy zp4+dts=S;$QE$ey$Ps6GYp~9>5|)a)_Y0k!2%5oRV2Uq44ZR=GZCl9isw#{jF2QH1 z?N8#Kq}S=(s@x#kVUf;de8!%{qJC5zEW4nrQ)|3=1f@lYJ5pfoS(y)1B-s?I8 z#knx?RU0r!HW2+qqD3yFK8R;`eZR`-&^5^YWHx7c@y}5bcEYF|Y3z2cF&gEEcq97N z9v_!=bHvE63(7?Aw>6}ULq!x4J~zhe8U z#vt!Q0qo)}sivFXd?aFaIVg*#R|LHc3RvLGpHU)maGG-v6ih6kR}Y_0E9;gJaD9g2 z*&-TCzH>%z`y)!g=X9aJHp+5TovGuE_wYo%jC(||zRS$<=7i*sb$HZoYmF)CW=p1NHuTChks+23Gvq_>W3<`4`=WNBRG{Wg@sj( zb=aVDcQRiRim4A&$>6nNV_LHiA;qxqW8ky;WWEhq>J*V(Ixye}^UkXL7}(!u94JEl z%-7C&-9Hlb_<>c8z@hh?I}}Ht0QOvbd;= z(Q-s#GJ@m`s+ui-W>{wGGL+oeI=J_-n)!uTWQ>2|}pFp`Q@-edP-=$raN@V2M zG3cF)#=XSs1EP1v2)AY4G{Hy?p?qwp?VM}G4qcfp&T<#DorOaqw|P?k zT-~1c)A|Z{L|HxQ2z{?MQujxueJggo)igD6J3Kk40kyWd3enJJg^AoJ&{$%nFxnP> zrV}2i82uAL3@Pl*NQd2@u2_RehtanYzv+KnkDU4y>h&d%+gO{fPW=#Jk)tCIAr0+M zwz%>0SaW}xT&&c+v16P57FA_kYei^xOpu^EzcG1BKtNM*WW32o$p0{vfYB%K(9T&I zI}OE*Q0gE;sZ`Q>yvx;^mJxSQd~`Jx75O@GraDWnow*He7LIUL1oioaCncD5_@{@O z_~Md^O$4u(%(AH0xCpZv2#(zFy#W)MkK}Z=_AfgfWlq``F8+oT4$D2vOumQ`K2Fm= zua}Ci1m5df>aqL~b145@Nbc;#46aYREaprfb2f-6&pk|%6Z+04o=~YI7#_L|X)swk zQMSX~Sf;s+Hy&3yFCsh4OclY3V+^5r&nhi!@+Lcc67?Y*D9-N;&e z$9@^@-rV5%rAdf;NHk*6?6;Mv9{3#$ML4nf&~(;OmamGnWAZfu0j-TWYMn=0y1T=o zOIXVN{d7Adw2Pt%zQ)mGTL09pA3op;7Q|Ic9JSQ&yjKVKz`N( z8~}-_-Yyq`CcfuQ)C5n*iC=y}<^_T7(OZxB z#^|~I`_j!RvEaw)v7*h{Auzbhj}9`PxqG9$hV zaq*&voSvDbRmX9bpMy)t=$=#?blkVw%Hqc;9G-mLPlG#cDyua!8}m|)8*K2L_~zQG z615ll7KBE$A2F#Nx6QNbdE*lt-dNkiFGasFkP@^4HYKz#$4|foIvy%Tt@I@1tSf^*DCe7kVb!-mfk;J6n@#4~$>P?9?!dogvuMudv3N z^KyOsW27b~#mN?ryh{}IV&CXTtKn1+gY(Gv=1xw7rc?Hvg_ z#X!99_)bB73Vr9b--kR#b}?-8Gs-IGNm;~cwbSu%>}pSP zP4JCej**>LfJ7A#@87pput}xMRmYY`iu$s`zf?eJ+Ao}}V(vl%jdn_W$T`U#YP4VM z8Qfj#Fz9aj?b=-vP{JcrhV2@y)S2IQd>mtp!*yMJo~_P>SWn^ENL0kcge-mgk-zJ= zsNzy!AQ{DZR2FH)=bM|ISB@>G%xkf5_D{nb_~GJ)^|B;yU%GKa%L@$8EHA%mzP!6x zjwVVt)7QN7VKmIY7MPti)x5CFcM7PO^YFe^GegB4S1UVsk9s|Ed$tU3L;w=EF|Z^~ zF|txK{k8R$m41S+W1)aR2b|lF>2~A6b5a=8eH9y##i39B=c-+2YUgm!Va+!Kagzgs zVi&(ghXYLX&J{0VYdXp&fUM+TJ0#Obsyr}a`FfMmnx9fkT{4@gMCpmxr{7rZ&r>oE z#*etV7Fn*)jP2=Mz2i_!c{rH!_eJEEaH(4ZX8HMwkTck|WXX(Bh)NlKZBjjM!c0^S z5Lv;;#}yr_d(B_6^=`Za(EJCt;8w|7%lY=;KKq+#4c>(g=d$`c&E_Y#^r2_(TL>M{ zHvV$?BH(gmiQLA1nw7p?!p_ZoQQ*F~bfo<5#q)-iM4jbn!4(db?3v0~*JkvYgQjvR z+sjBVv&2sgfwJm-m~1SZ?wzmeLRYc7?;|vt2R$a^khUdp@J>JN(>Wm=fBrUp6BvRt z{+w*nU9^+$wB>huB6c~ouaDX^;r3~UU?$a_1v0&+(}c98>@7JR%ZdDM_FEna6s-1I z_1yhwDCi!NnT~1_SSS&>x4E`m0wD*LcFl$oTC*XX$!{cMW5{m$p!n|U{4Qx9*1L2tgy;epU5vO*GDj24B+PZ!O4 zfFJ>KGZ0BKo~p%6kiVi&dg^qd|J2#<#gk;acAumsVF$z4-`q}o#4bd~284cOltoL3 zyA1!BysAKw2)tr4xPztJ^3*7N#=&o1Vqs2GdJ(zE?GW@9v-d~F+tlgewLVCu*t4S$ z`^4ai+oVfnGcYWJG*~*T_QUnvA}M!F9;(wmi1bjzISKl_ZkR&L_w#p7im{e@ThfcS z7E+ZYUwc-xM=(fnK~~G_4!vIs^s#9AIDy9-s9}waHG|2lA_f#;+qs(=wo_>;oI+XZgLU4 z3g?E9@+Yrn5QrGwQKE-4AEciwa$=2Pr9cjHNv`k%CEK#j+pzMvmWO`kFPRru&V5Rh z`|;hx#l&GqSG@%*hd{mVISPsfV+r=hFnMbpB&GJ@UYFzBBp+HE^#lgaAY!@m!fdz+ z8LmapKi3_VkGCC<*BuBzm9{t1pSZWJxwpT&tF@)Qqpz!@zpZJwx3Q}ga1$jy4vzSz zlJU*u6u6l1Q`L;tVf4PN%r!2Snbl)Aw^R3fS6i)?_qQ%%+qNhRYat^Ub0WN&Pf)^; z8fFte%Q(uDqLlbJrIGm)Q=>Y^9(}E@m)O&ZOj4if$5g52>FSAT|M`XK8Jq0q(27_c zCtEXI^D~cfsAmz(Kq|FP6RVXw!{o{0jFAy!b0>v9Ln~T4+aM{{SE-Y7j@l?qq+qnf zT?EG4fLy|8bF8usk37sBGF|GY1@c#+YV4eie)38IB~Puv41&6C}?CEWJ;Dfr)0?`UdeG7$DXdek?rJ5o)E$xsF}^Ksc4Doaay68Y zx)Xi9E8?T)$Vq&LA7^T4OvJZDyaisHT^awQgjpFe6IrK&OXmvV&wp+6tSTqP4ISm| z(yDeOx}5ib@A<`wIIdm$lnhhgY%NeZap|^3gM4th33mrs;3r zRApRin`L^S%JX_ud__FV7Gjj&mt2YkpuSOb!e0~v)9I_;vN5?_d!mlb&t2KOkg@bp z`1H|ApR?xQ_{nd@oW*AmV=;4p*PK)xhr0C>bc`pO8v{KIj6sF;-0UL;l5pZID@>F< zNE(6UxzTww@KxoAOLbE-EK>?h%(<0j_g2n1W(RWJtn7!k<*}R$o~zMzx`l3jQ*-9y z0@MkIS?4$1;kFy(0m+36Pj@7*$LoAnZ@%-QpCa9i5iQ;J)-11^q8HsQFdrU5Q!>+k z5^DYFuMM+8T47z|I-jlxdeN7-){$NrnWZ@+rJ;glX<>%8o)sqWPp6>+1GVbR{x zJa1-sF{rj^#t;4Y$@Zs1MSJ*9hxVbf*e#p&T5nytJ4MwV!aHidFa%^&^6@X%97G-Y zU8dWK$K`NmbF9B#p*?@%o2Z(Myi{fI9K#FXu zKoVEMpg`2B;GqtEEyxVQGA2FT7X8+Dz+i(VzNAlq=_eVF%XifMLy}QBQ(Ne(u67Lr zEF}+CIf=c`_{>XOz=Y(F+;XH}8t*gi0Qv+SbWUQAE>54>x+jT#t+gh*Xn+&HI84>D zEX$Lpop+Q=_7$6y)YD6{FtNme*r7Kpu$3dH+m6QTkw7J+H>9%b%wG7^4yp^ecq%9R z>E_FAk~r9wm1aydn+#AhIg+CNvSBJDJ6K83OPum(NP*1C{Y-y1a^(GOMT}Z(=*c{s z0R`ea*CV9t7l){Dlk;YBRpY-=sQ;pxW6TcCYSR-Y&FOn#oNS>VXR z35KKAYklH|Ou&bfLq2^Yn~M;mtp%1nBSJU~@E)Ek*(JlNoVraEUB1G>dHy!_3z=uP z+3^1BX;OruAPN%u=fa}-se4rlw@%h?`r!H)&z-p?2g2Zc6dE4` zetPG6Wm3l#S^;C`bw@P{X4}Bju}X>l`LQRqv;*rhWtE!-R*UfbeW)|l z=Ec7t{^@Sz){y-<)8eSInRi-BKKW`}%x0u85~27o+OJmX^dpFz14~u!BtFGsnXcwBJ|J^<_~CY8{pVX})H5vnT2^6v{aP zNzW>&;GTaqwB)ZIq0&aqRb%*~TsZqnkay;SCekJQu%*8D2>X0wXqLE-GsCH4_vv8z zYm_XO)(9Y4g|qtQMiy&k%Z#qDyvmmi*?=&Cu1KV>z2Ci_*4zo2McjD){ExEu;>WDI zxF17#l3#M=nb|{ikSQ3aNb*qX$eA%Db|9Ji83t$pb&%4piXX?$b6)o$tzaX|B#ZFo zkLyO!EaFnE+=q=F!$xAaGe{=I!flDcP1^}_Grk$<`cD~TU5)+1Q; zu|69}Ry?n9e4R%zec+DwM7ZC^?M*Li1}C%+{1ReyqjHBeljo@2&2l*u;ky9y0X0$?ONRPZ~wN4~N3#y)lrb zsb=MoSKu4!?hjMxh@>;`w+r&yY$yj9%06SIr<4v;u`esYCSlu1T%*;w=eV%4qY7KO zJg-R_a!N%uir-wgJd7pFf>m~lswBTi%p+nU^>*fQ6`{6Ce1ojRbf}H8TxhhycN`p5yZn2qJ#CnCdg)M)0Iy%bGgQA@;HH`Kp~8XhsqK?e{qFm(?FfHKwzNU?*)OkHBaed-dC~*; zMUfd5(i@lddq2&!OPV3BimZ&$ZJ(^?ZGwvpgw4UvmC@n_b#ZIxLlH>ens-9>4YHC+|+5x?#vzn^zY1 z5)CX=FysZPv21_6KFj{-42r^^KvGlyga+tl3wV2)7r+d@gWBW0| z3VcZpFVu6qZb@}fIP+f{9qSRf;Y{Ny3dr(ZO$H8^CchAkBr~p&{xq))BJKD#$IG|W zU@=@dh>I>{#j?g-kq1qVu=!XvzzU6eKiRjmVI~V>d|k!kxd;@VM8km%mkWFtRLv7F zkSJFoug#SJRjz6%p?P@L-KHvY$8b&>-6ZXj|CmS!aAh&1_8*iVV_r@K`6;%(k_lEp zR>iVWQW-9PLQT4CnEq1n^?NwKJI`A_e)qkVneSJt$gG3$Ou0mN==7kSbn%-pN26ZPePfrlkwcj7ZQBJign)iT~ipJvtRi*$~EP!KLoA&c%!Wa9d%0=elP1( zrUcmp0?OJK6;b?+;1FZwLi}b*8Z_-DqHQ**OSk@K4ZVMD87rbW_2kE|gXqu4Eo}$k z37M7YA48VxiFzock@P<&Q5DqclypOl`9kVUED@%z26PYIiq;}Pmp);0D7;Kn0%NMR zQ54qX2~x&9W}yK=b9)0Nh6427zJ*8h0dL~((=nTl-uX0=u1Ipc!}8@9%{xd$r1cLp za8w=ZlntIc8y6FOnZ6uc@V>d&^05C*R=_jd_QH zOREn*ZWrpqIpDBlC4EMZWYQYR8t6T~aQk{hD@6LkP=Qv%a{u%r3{FlWlQvNZPYjv#vCQyG)Zws2e?;Y#9~*jTN^_ z-5h#KU@JfR#L=I{E=BXpaC$r5LnQi%%}IhF8+og8_2q?!zfHHPEPIBzM1xqu$=PA4 z^KtK0^jUPeU&m+=JOw5SasMjbO8p;?U z3WgW{N0~kcNNXd4j_LL~_J}WR=kVO`g~LiPy?wp~d4+zKq|`I9Ht7m_NBk^v8Z3d^ z78gNGaN{L)M;x8u|6vT(!wZkh^#{Lq@Y8FF52kVGK3$)VWDx~1zs0Ll#1HDyy@j9n zS!J-0X{ZhIV-b@}`j#z7kESkt))+2F<2)%*u##W4 zkFJsFM#&`j9A^j%1=9;RhVzCE%HvN~U(Rf5r7)qfMJrRbhVuBswKo{jCjW_WIQpVZ zXXN9&w`b@{<%TAW>atkH>n(#;oD`dE{KDY(YSZPA__5*Em9>~4X4;wM8efDTM^z4`^=OaR7>J7P|GCC^ z_%}xjp9LXW>tGKvBQpa#J8+$?#5awT0?*g@BsWwKo0PSJvByv?tT0-=!J&R zmg&^5jV0FY0}g*${SmwMsZ_T59ajCy7gWoE|IX8Aqjt08l zZy9HvL6Vio8N8!YSMrB;vr@Uy4lnV@Uiclk-5e>ub@aXPwM>1sd(7c0Lc(OL%2-Ch zP-sV%*IE{vA0ZPtz8n7PQ=JNHXo$zO{OTVhl2#>f>^!N*otR!lh}3PN&SQx2BhAslY~FRLS+ zXRTxv3r1u!zD_QeCW;eB`K9Hwdj=m+gx}Sd)*rcom{*EK|Fl`+bZQ}h<{+7J>U4$v zw33kn8gF0!p4D*pMBkw9ANMBFX47n_BTYy7Q)IK{FJF2tjpftx6TJH^&VQJEkVvqhKsGEdS~IXBTc3@%~6=*=gl^_m&L{5WA1iyiH9u|MvoF~1-Ou}a2V?3Q|e aZ)+GGh@pX#n=a7#@MHXv4)sN>&U)^M+}Nllqs@g38{#p z$WF*IRLGVsg$Lz#N6+(ozu&)p=XLJApZoqS=bX>^e9rw`D=#lR00I7PD~`Y7SmgC% zv!QI#Y$1WcZa!odz!vtL^#Fh{ZMNO#Q#LD>=D&@l$>NMXR|yjE+xf2+&i>oX9*}Es zHpEj?>xc&O2nvZ}2LVCw(#P4F;caz;DQ<40U=NDBpAZO|7@fiy>5>B}0Uk0WPfwEj zg##c;3UCkfAO-7!cHBWbS}Z$AnR7mFzlUJs{QW$LF|cC;^Z-DPEUs+KAd5x8Br(PQ3?7`*(iBkhtx<#U66`H zgP0EsgJJ%;8KJ#Fu0B*MY67XvA33GH0gp05JHS9}MkZ=6=4n=BF&Y$>(=@e?719z#ywG$oQtzePOCSRb4L z7y7A4RGWT*WRx-*dLT+h!$TBE0f5|lN(uLrcwv$iyg&;8!1QcH-Uh*2Z^B#4;e60N zj-23@0Z>rRG$G$KdD1jh&M{Sfw||L$q}o=o+tqf}O##5#hTkYignL)d0|218+6fGY z1crCQbX+ntDyA3$gaH5tIE;n?UdM!H*kwx?to9%IukM^dlGs%TeF*FI@hs$uL$XV7 z?d}6OjWEFkWK-BbP7V{t3f$u^faB^+4_Z!>IA8K zbVvRyP;Q#ul zO;T-Ee|-kYBN<7@%=OH8=hKcs<P2@`;_3Ur7}Xi(t@jyu1FB z0ez3*lJH2eVOe&ILp-Dh^C}nocBc$$YXHFN8@xwQ>OXx2-X$n+BLw!teQKJ0cq0OZ zG?+ngtf4x8h$gO6nPA_boOQ?`IsQ-oy>#$AkO71J_d*bF#L4aG895s4pJjp@3Y-@) z*^M`|3OVy$xsF~{t5ppvVO<*$qdpBnk0{aRsK1RCsZW!L*CG<^{OvRRovSG$nWT|* z>iB8Ppa4DjDp)) zv$yXkKiU-mU@Q?6I0G9)R3vwpG zawa%ABOFNVdN+)pw*rozwrCe_TDJ0*I zJ50bI?#CJR;|c#?v+UEb6b2p3!%En0Cvtm9X0rZFab}BBe(vBY^q2g>cBKgVGz{f_ z>n#pt!2c#gKZ?c)I*kLc0rLvgf@*>Xcbd(~8FiwSr5JC}CWZIk+hEHdI333_s%`xy z=-}%+C5DrEkrcz$?@>9Z1aN~FUtV{LD4U)L0EF}7coESww@$=#3ho{H3*0RM{gCe7 ziB`&?y+bSJqzNGy;45O9PU|%LLQm^8Qv&0ofepMcN*W$U08A11cph$KT@jcT7kVX9jWv0gzg1$-q|`!h5DHANV-C5&i+Tuqw`L>mIh5wsjabQ~nu4^TnN z{dmhEQ34@@Fw{>XWKhmrATaHSLxTjz0qV#=^qB$btAa<*0^XID7F85)RUFxRwlGgK z>$6}@sNc|rU}<0FkEi%M3mXlJ68bZY@D$Jr^$dkHG-%jEF(RasSVN|hh!;urHK2+= zA%r@9fk@1x5FI?7*Q5I=6kOGno{o_xv+!TLRIZG_+2zU!#JP__RhH7bgs^gD#Kh&&WBu zPGv0er4y>7!5K{7@+UfkPRwlAt6iWtgSzGI^`$z`gD%9J0CS!T4ge4fCHCl;Vkq#L z0}zj*8(8Sai9~`&0U{~|*CZa*jz&n3aTr8lG!Az|JTe8XAWuGpRmx*nW6krT1~7>7 zXq?lzlKw2G8=6tQPD+d_YwV3ehNQEfrg5Tv3q36rt;nG5GTPC~Ig#KI3LbP$s)%L> zw4!`uGL~DGk&3mDXNVgpm#5R*K*k5BbG6O4$V!anRO~r}r^%o<#AcW_1( z4(FFn#(}0t0$63x6c&pDX9b!Pz+gdBcq}+8Hx)#`1J<`3G-Zw&u*Tg08Rl3NXeyw5 zYCzxnaK4bclKdMn_tKIoNdv_1!TZJBOX^sI%fCs*Cb0%jss)e3Q{_`xPQ|s&AN>4l ze`Jxn3#**)7PYKd)p9zL7waOs!Id{#V-riNoSYNUv40PqPz9RuD_;W{peb{#X0^Cq zvgTTrQxVAU^DY09MP5RE`GEJ+tP%GE$8Z8oeHm~E%PMvO@OV(5g@btyVdXuCEEdI; zryqx!&ewpVzR+n2sA-ve9O?@^3a2(LLrcZ6C>$>%KNaVfN5kQKOTfH`u=0MthP)Uz zn6~mj3NPS#9^Up%$3}xN6r$R?YS^OzW|q`00%o6o+i!$IVeZNhC`97Ap^YXOz+iyu zf?6QrxJK=>-9@US&u9?rK_r7T?m%S8R8ySA?fO}Wzw^-;=Rpc{J^C#ASWUqEv!$(9 zE63jgz%mCnkPF#wXQGXeFb6#R+U!X#*Q4Kjb3Hwe|93RoKEnqYdJWTfzLt zco3S2Xs$dO4fNF6L==>f|K7M{r1iZ!Q4BVn(eh`5*5u6?|^gs67%>(JehiLx&5 zcOoydipd+O_0h;>u)uUlL{CdcEjMzX1%Qi@?0{iJl6tXRj%YI1KGtfXJb(<$4cuTl zn1|r9L1{SnaaNMY?P3BLsJzEN7=xDhTaJf8OZ{68tRvK>b3t7Y!(n%Ip)6|lUkt&j zY2x4dN z^X!uj+l^m601#=i!^h|7x1+oYWud5oLJSrWgEDw0^8kV8m5r7qC&)tbn(fS+!4Er( z1Au}qKcZMZNP+!0Hy`5o4;M$`Q+*4hW(|0XYSwNr+x_v(a!f=LLz6 z5l0q}!7#80Skq^K*R-LL=cvv~jN<4=j+}cq?%jVFR{+=x0B<>Af<18Km^WM|v2VFe z!D<+6Pk{z*pg|U5Xs8i;Gq1d{=hF(C5bL+(cjMsT*d@R?1UNW$e}p)~?0@rEKSC`0 z7>B*Zp@XvbZfDcd(lWEM=(%?paA~Ria4EQ)qU`;g+gTZR@52wuTbzw0PE=pd623KI z-rH*wiZ5Lz&}ruCP3CQ%Mzn{rD%dTiPN{Y30(->ZY;)HP8YMDv3#D$BVn5J>6FhUu zFnk=6!wa30d1cyM@9(g3S`u##<>XpM*)^4Y47~PbzE5R!{M+NW z*RPW!2UZ6vN9c=&rcIt>^&>y)D(?taw$=Csqad)3hR#r0(VC0q*c8m7xWg+lL^J$#$V=;F+E5O7rR5}HPeZAHLt&a*R`Iw+ehPG zY5tCC>?C`>V>1UE3S$tieEL$QMkBsO(KQ-w$_6D&0y}-EVk13eTex3=Yt+0 zZ8l#LRiMCPV$m>1UIXqU1Y+sLgIRwN4`i0Yd?M8{30L8SgGVM|EzS)jBHZ9>4PGSIB|Z zlC-y+5kVF_3CZ=9e|Y(~N=J8mdvAFM}hrigrH!@xXXyCwr&OC*6-t>*NPcZ`G+D zG#B|8GyLfCU9FAJz1BXiVKg#hmG(Bg5-K>y?KC zx599TA8@)zyQRlwSN=rQW^gA5Zl0-YRUMx>?fA6TCSp7G`GfO|btkTp@?P86yzxmk z`w3;*EiA15x+3y^XhhZWz+VCOWo2cR0%_}z&hS7+niF>_C+5I2wi6?|)dvkDeX|R6 zhc+)BckoEQ$76Z30o=73YQN^l(55f)`-h3^WBlw*G*u___D>d5i?ep@AE~;9(N{bG z*OhycCa1>xySBV3vt}tWPasgvjVblhb30NsT`xPcuW-3^@p2%Tqo^%$OE?;!p#^L_3A zQg+X)taiD~7Vxl0`S$COP2Z$zojY}4%9NhiHZ`W{lCk366`aEDiFf5SKP;>DoM5<`FS1P8#cC2FxVX&8vK@yK*54Ii3_h|5y@wh5&zZ@1IH*G!kt+Zpzzuae7^{fP)U;~`kW=_WL?bF|;Gz5HJa8Za5 z6C6?j?vX6^^Kv!<8Q-xFuWSXLtkmt){)LpR-`oxi^CHdMyjd+W&Z`-po>wzOOK!d} zy>DM!&PYMmuMy^wzw0pc)PU7pA1sbf7>-ymsO(o>Gae4Bm|x&Li|K-2?@N!~yu>IN zUw6_Kv1a=au=Z43V(d`$_w*LZe#3n+2&Z7?Ew)iM;KUX&Q*5;H5`Tfz>7wf3SnqhW zHxTz)oJSt1cNKZ@WZ%^GV)EtLH3M(vYgdJ6v2c}ZiJrw9V`YQoH=K~&vPD~p-w1&u zQXQao?Ucf1DDMxV`+D}}3@gXbhr}fh!}f{r)%&xUpl`iJ5!YwP+fP@kRO9;YjOW@B zz7MMS-1*Mwnim&ho>|j<*D>2Rq419|c+$3Fu!+K)C~$g&So1*M?p05&T}3UyO~H&D zA{@=n$#pBYDByYD_ME6W`EfpeyoKF-y5g;Qawg8(gdlNvwl;wSrBfiK+~CpLe{_Xm zp=bOte5|!+rt90-%+-xA(F>oae`oDMiB%C@%F8FB!2$4*u5Rd0Nn zO!YOuu>orMn}TZM4Leop#k8{F{=I)J_`8u6+4tICD1GplqE(VsXIL?i<#96dXtIuJ zdB>X1MuYYrZ@mf}v=eovw>(~1U5a;tlp4pD8=6c0Ns-m~Zs#Ji`e@?x^g@e|ee9&m zk1j7!CbsHPS>Cn$8!gDt+9YV=(lpcj9f3B%*`3`g^ZHWYc3|v_U=e@G18B6HFe*67 z67ZPynW>H4nLZWlh{ve9`iRh(_`2QvzOvc*mb53K25U$*vfd9YXjz=@b?Z;_9H55d$)DfrFEt|ue=`P zHoe64(JxTC7HhEFcOM_b^g1L7=WaWm?cNcH71ANqg=_;t$Jv&JYSYb)UQ}HyiWpec z@9t(snmfj<_DuBgr+;6C*t%a{pe|TGlslU;d1b%ZjQ6HuV&;>0t7ZJBP-j7%V4-7= zqz*x^G-%{0ET4GsqwOu3n2~eTAT}44i&c_m^>ide`FF z_%%rh2al62di`2Ty|F#5!`0MKXW5NYfHKPBalT7636|-WPIN%9v8DMQ587(aO-h(@fp!_ zO}ihuQghdftD5+MQ2w!eM{eFxuJ_pL>2AwK*$=4-dDam5?uV5fTbVwd$720=j=cHV z^yAYQ({?I6665yks>W3-Qfq}4F>G5aWmYg$_AWcb`gYg4B#-InPQ|bFbz2o!ZT+!J z3Y|RAu~VAcTg1L2t3qA&ZK#mKDIeW;*{^Rh;kj9A&1i zkiQUC;d8*jLu}Igp^2(95hZ$QhreB@u}{49gO1YW$yOe&*g# zOOo4HneO>KN^;*%;{kp>r-smlg?086m{m~zc=9F**%y8zuK`G&IJp_uaptKzd_6Yi+n&tx zy=HvZV$$AkO9>LyLa8#RzpW*NJP3NN7n((Q%zdd3qVuPg)PmKSDV-`kes19$x#@28 zB;IC1z#yZfg-!V*hj-+1^3ChauLoQ2b>nAHV_* zB#|jP6UsJLRCkni@pOtv*S!;FN2i%)dfD#Ym_z#EY~P{(VwTfX`c-bxkJq86YE4aVcc0q_3yG zTr2ETk-d>i0WL|GUM+rg{5(Dq^jcNXfr3>b9+xUT)B1=Fj(SPG;S7WCc@}!RH&t;? zACf|NGQTjGY17`*JFl*F!^!Pxrnq*%$jDCUy)SvFl-FMOeS;gB^%DC#EG!@*n>>-V z?U>=aP<+WisEgyBivhyJMjJg4Iijn;($P6Ch<|X$$rmOvD~F$N-w~CATECTosE%`l zeqvK{;6^GMp<1v8RZ4}rm;GXD^7lIxL2F$2VgU|&^~*kiD+x)Ru7A1!KJi7wo#*r@ U3UFxdn%~XG*_~O(S5$%j15yDxg#Z8m diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index ab16eea106..57fcd76392 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -126,7 +126,7 @@ public abstract class UnlockableContent extends MappableContent{ } public boolean unlocked(){ - if(net != null && net.client()) return state.rules.researched.contains(name); + if(net != null && net.client()) return alwaysUnlocked || state.rules.researched.contains(name); return unlocked || alwaysUnlocked; } diff --git a/core/src/mindustry/net/ServerGroup.java b/core/src/mindustry/net/ServerGroup.java new file mode 100644 index 0000000000..9f925089fb --- /dev/null +++ b/core/src/mindustry/net/ServerGroup.java @@ -0,0 +1,6 @@ +package mindustry.net; + +public class ServerGroup{ + public String[] addresses; + public String name; +} diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index fa7d52b918..4a0f88cd84 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -42,7 +42,7 @@ public class Conveyor extends Block implements Autotiler{ conveyorPlacement = true; ambientSound = Sounds.conveyor; - ambientSoundVolume = 0.002f; + ambientSoundVolume = 0.0015f; unloadable = false; noUpdateDisabled = false; } diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index 9f610e709a..e876eaa59d 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -16,6 +16,7 @@ import mindustry.net.*; import mindustry.ui.*; import org.robovm.apple.coregraphics.*; import org.robovm.apple.foundation.*; +import org.robovm.apple.glkit.*; import org.robovm.apple.uikit.*; import org.robovm.objc.block.*; @@ -173,7 +174,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ UINavigationController.attemptRotationToDeviceOrientation(); } }, new IOSApplicationConfiguration(){{ - + stencilFormat = GLKViewDrawableStencilFormat._8; }}); }