From ecd73dcc2cb37cf4aea5b31dace4afe5c0c8267f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 24 Sep 2019 17:02:34 -0400
Subject: [PATCH] Various bugfixes / Added new blocks to tech tree

---
 .../conveyors/armored-conveyor-1-0.png           | Bin 0 -> 2432 bytes
 .../conveyors/armored-conveyor-1-1.png           | Bin 0 -> 2566 bytes
 .../conveyors/armored-conveyor-1-2.png           | Bin 0 -> 2593 bytes
 .../conveyors/armored-conveyor-1-3.png           | Bin 0 -> 2546 bytes
 .../conveyors/armored-conveyor-2-0.png           | Bin 0 -> 2234 bytes
 .../conveyors/armored-conveyor-2-1.png           | Bin 0 -> 2182 bytes
 .../conveyors/armored-conveyor-2-2.png           | Bin 0 -> 2169 bytes
 .../conveyors/armored-conveyor-2-3.png           | Bin 0 -> 2262 bytes
 .../conveyors/armored-conveyor-3-0.png           | Bin 0 -> 2050 bytes
 .../conveyors/armored-conveyor-3-1.png           | Bin 0 -> 2032 bytes
 .../conveyors/armored-conveyor-3-2.png           | Bin 0 -> 2012 bytes
 .../conveyors/armored-conveyor-3-3.png           | Bin 0 -> 2037 bytes
 .../conveyors/armored-conveyor-4-0.png           | Bin 0 -> 2209 bytes
 .../conveyors/armored-conveyor-4-1.png           | Bin 0 -> 2224 bytes
 .../conveyors/armored-conveyor-4-2.png           | Bin 0 -> 2177 bytes
 .../conveyors/armored-conveyor-4-3.png           | Bin 0 -> 2228 bytes
 core/assets/bundles/bundle.properties            |   3 +--
 .../src/io/anuke/mindustry/content/TechTree.java |   4 ++++
 core/src/io/anuke/mindustry/core/NetServer.java  |   5 +++--
 .../anuke/mindustry/ui/dialogs/PausedDialog.java |   4 ++--
 .../ui/fragments/BlockInventoryFragment.java     |   2 +-
 21 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b158a77288b2e41d69ea7ac73759ebe09ed709
GIT binary patch
literal 2432
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
AC;$Ke

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec888dd9c390afdb338cece2b7509ec7fe931790
GIT binary patch
literal 2566
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc64d4657969aaf13362caf82ab4c361a07d7fa
GIT binary patch
literal 2593
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANN9Q>sEDN`ey06$*;-(=u~X
z6-p`#QWa7wGSe6sDsHWf$eyLF&hzKIW)X{k$AQ9%y8HJOj{9?F>`yOK@7#NNOD0dy
z)R0Nnd-m7+ein~=(mdmUp{Ll!idGpT(K{-;<Eu-|*1WE|SlM#k|MRnN4F*pQfBg+S
z78!4F{=5E>f@iNk@9BK|X7V|==LfegygvEsmbxAr>B?K5-_@A?oDuTm;M~vV(y4PF
z?ULVH$0wLja;$D15AXXuvEjGWD<d9m)|dF|HP0iR>D^8Dn7QBI|ClLVBG0hr?%oIK
zw`YDYxA^8ZJ^EAA<(cJwB=@&oTI|}Fr+#^{>kR*IAHR0of0KD`<6dnkcgqunuZmLd
zCMqiMO7kAHe$-zmf8F}=+?<WPYf5)S^{)LfL6-63%cj@scDy_$H9OnD@WO(Qi7O_?
z7oT)Lb>+`8hJ15PDTB+kOy<02Dt#`W72AI9Y?U0Jx5ZBDH7f0A=WP1<!)(3q|8IY{
zT%05I?A*<g!(3$(kBOfNc=n|$RN=_kW=;K?xi_0@Yc)5@@qB8sJa{na^}R)#b|0S>
zZ&Q7m&Aa*T&qqo2(hN#-&Kex6G)OpFS@tMLrRyByah5tRo%V(RR^~q5;P$B^d&DP9
z_Bem6d{K0EXQsb%oC8a><0KVd*$JXd?2h|XTLKK<SQ>0DcyeTBcLnDmB_Y?+RW9<*
zPc#gVi4^OcTt30VvrBX79Is_>6q9o{J(&@FZl{P$l+(dD*4Nx>TA}gIPqj?1g%s=Z
zKD_MoSWS1^l_KrAyWUS=xV-fEysCGpI~oI|5<g53beF1}(it(kuI*%S+MLX1k$G!m
z!{$d;r@pJcb|<k{EO3|Jy~x8QJ=ewjp0-RiHgG%G_;Ce~!U9jr%_mzOPR%JwGp>AW
zE4(H}b-8sa4^P{}j^(=x%hTU^-{ZOPS2O=hr{&@+f920eE`8Uyv;3ajhHIxMMepah
zq{Ff-z@z_5c94eXD%r^BD2=_3nze0@#O*K&d-XU(t)Q^+qd%*}G?$}CpUvx$jl4E%
z)ybvVZ{8pOTB=d`-uK+Tj>W|dU)F86nU(vyV(qM@<`2v!`ZVvA&9<AErWGn#<r_R%
zR<+vJIkMV<|Hihy>aHZ)3D->vemuMUdc|tqyykw68RhmO%;E{XvO(W|ZU_jP-Wky#
z+V#X~T8x?L`r4(QMRSy1r$>k^bP(KkCpKgAN1hb>9Sau!6wZ-%+acRA(QEy`S>f%f
zpO5W%{)<7{WW)7!%&$()xa#j;RMx5edq2~M*?}83&%FJy=y>nXbCTf|@{z8$nB8Yg
z+{vcBk8i>CO(%ax-?0C~u|_-K%WjYBDSh)-$grwtH>|sMWrb4RwU*BrpTZP2be(mx
zjC4}q5xY_*x7Eea<Ibyf5)Eb=>$r0y;+{F!B_CJo_$~b2;IDAOGwYP?PX$&_S-0e7
zn6hu4;GQ*4(|(=mm{7gjl5_R;Kvn0I;Ac`_ZzZi#o*O)Y>!qTy=FHd6%ojT?ldM{?
zGx=#KZ()1ylf~`<T)pCMt_~u3OK0}f_QyQ5+M{-svxvFvP<@{p?}^Dy0jpwOa|*h3
z*XY#C?p>jFwPT9@s=!(0#}_%|PIy)<Z+fuikd$?x+X6AcwXT+iy3_8J-~ZHQ)Fk(*
zLH}Fy-Cu6ozGdWH4B&r$dFq$uHT(UHquC_SoobE#EyM7@^2@v}QCH4ZPBYXq>HW)f
z&7C3VRmoLteSU3*jNWX6le_si<%DiIX20NX*kvkzW=nISpZ}j-t5-B8uk||iH{_;W
z(nZ0Ww;%mFm~_A>Oe3VlX?iH1fWqy^x3tzwjc%Itwe(5JH;p9sOU-|7oKxL8pOtyP
zTZO3_vrvmz!ZVAml=OanjiT$9u7#(F?_hNfKR&@)YR0_}OX4mRNh{d?KNs=&__cbo
zs>pVW$IRb6R_<?K_)IQHKzv2shrKKI&bbhH_mc3X*X|!T&u)}Ax^pV*)$|Sf`!(!$
z9O3+){?>SB#lB5)J2=nIOFou(_w}FKTfVWrh$;-PTol_Tq&lVNDo<#~CP}9Yj_qk%
zN~WF2P`_xhsL}e(g3X85Pgtwm)3<YS*KF^NtsS3?H`pu`hz$1E<(;!{U2`;Zz!9ao
zUjegT_$^gfzF_;UH5m%CBE8N?&i#^Ff41lTvW-739@ELt?91#}sh=vmcFx6n>wYep
z_&Ddeb8eX*cf>_42VvFKrqgscuU4+@Rx>)Fl^yu?MZ<H6;vYNfQVvCxXSrK!dtjpx
zp!`Sn>(meHCPZyzY`XTjB`fl<M762?*Jb|7WpQz@>!-~)?YrgS%|FarE92Lx$(gw@
zFfg`eIy(n=Iy=MaCkBR!IkgjQJq|m_9E}e?%CFTVCRljl0#_4jprHF&Cqb>2sD+{I
zlfCyZ@N}N^=#j<_F_}LRYpixyyngjSi=#<iL2sR3mtN4L|C5}$Bl!D%e|&fE@jF?C
zkZzyNw~jITZa?dyqqXeP>ZIe^y9^raS`4*}PtTaV#3HJ1ef5tYRpJjL*Pj1tS#_o7
zD8qaYo6|g()$S?GySIh+-0vff)24?$Dt=@*S<mCoiPEEw&Cgj*XPqZ$GP$$zk;29q
z*-1+~Bkx`5Sl;2hYFY5U37;aK?l~H%JuUL@yg#jtJ^MDDDV=q=BT>+Mf`XHyB&$fG
zveRn6u2z<}?$JNmWA?k~wZ^a-6zMEr;obC_{eScQyHPh!a_Vaeu-=N7d9KV;@`h<^
z*W(&_YrnTFAMBaKs}9GnVltk;BwQ-$1;>lKY<laYXKiASdB@P~-<ES~-IL{-DVq=c
zmaGkyda<8%*Y!R3Uj4SHWtem&^bebb1&dqJl)d*J-JN@O@89ZW_wMsA`B}6(_y6H_
z3=9lxN#5=*4F5rJ!QSPQ85kHi3p^r=85s1GL71^(seKs(0|R@Br>`sfV@@$4OTJ4#
z>SP%h7;8OU977@w9}PFmJ8ZzSM3Vnz4-?}ai4#hPBmcDXxGu9>SZqI`{0r}2m*t0?
z|6f?@xR>RGkb=X7v)&W+dX<k(ap6un?7MA&_2lEib8T$*&3T|-c07E6(^S(Im)~Cv
zE5h#BN@SPpEs+&r@?-ra(Keyr?cQ@ntM)KW4ZpbW)He62rSV>KU2f%{(9ZZiJ7eY6
zm(Mrd<MTdn)<wg@n|Y&0fi=6M!m%xDIT*dn&E78fa{cuI5zZ$X@kRm+J>RPT*NEw}
zM>du17i3@V@nG$hdbP&w4A(sus8}4|*1Ox`si-&m!q1Icxl4Y>>Rk&waP#v4iTC}y
z>rVX&YLa-6yzbTK%9UGA)I49R_+a6IE0sUyKR9Q0C3$DW;djq{Wn>r_cCYbF(y~6m
zzCuGyyYR!j23_u>DX9VzIl`o0z025~HNE-OXSZ^O8Rxbg7An~4z*zbA_o>|7hv%Gg
zm~MLV%kO_rloNl~ex7JxY`EO@Myl_lQ*5TrMbEun-P>5k=z4@z#OlsJrUQ!?>Ss1=
SKgz(sz~JfX=d#Wzp$Pzcwc;HB

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..086915a1f1f74e7e9c94fa8ee9db605fd510a221
GIT binary patch
literal 2546
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
I>zopr0KoH}TL1t6

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..12a7f74198af718e1c2ed0bb9317ca3b10f001c3
GIT binary patch
literal 2234
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
DUqdCG

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc232cd074c3e77cc07eb29f3042944d1007352f
GIT binary patch
literal 2182
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c5c0318842fc26ab465798999622d5a97ea592d
GIT binary patch
literal 2169
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..4caa3d231a538c247ac90995406f4cf707bbe4d0
GIT binary patch
literal 2262
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..847ac502d40afd5e86b2e39d1097330f5a06f26d
GIT binary patch
literal 2050
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
Jmvv4FO#p7X#@zq_

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..06755ed438eb57cad1fdfcb22d642d83393584dc
GIT binary patch
literal 2032
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..818d0dc61efb51b14f2b7a36287d43770ac1fe2d
GIT binary patch
literal 2012
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANMUC#ymtN`ey06$*;-(=u~X
z6-p`#QWa7wGSe6sDsHU}&z!c|g6Gfs;4^|cH$N50tbc!&_t}r&I42LMN$+OzTXD2p
z3{vHc+FJkb-7EbZpEIYr`1P!oZ@ihItUiZj?>1G>+m&;q-$(DLyRiB(n{%qd*<B^M
z>-{gB{>zxZ-Om2iRQ=n2H`>1S&UQ4m;m<E+-^nW(S9R;U*1HLlte0-C-&-J~b@KJK
z&s)DTEarM68Fq(9(zbt(jigKBBF_nrPqbBLq-2@&CA|=}FLfwqd{FqUWxif?{<{Jl
z=j~hW2>V6*7xmtEc_}0K@!`z#f{Kyr&)=5ZALsl&H+A}&;D*z0m*lNHW30on<l33z
zGG+bqAKW=_o5XMRlIfaO&{?na7?&i4dnbdIy3D;brIpKR%bgp}M&f3{;yuq#q)tjY
z?l*TYlkruSg5U#l8fW!KWc=zqEI)^}VqMEr9|O1Mv!B<^6a8OWZ*b+eMzNAC-x>k&
z{$EZK%{vQ^XbCvgCTj`D2YJ7Eo-2@jV1dsJW+5Ldec{L#anWg?a<*vbY_0mr{c{&D
zgVGN%7H2k|jP^rn?zfDql^#eO@OOHWqmypnu&70QQA&0Xvt?s@zRlyzb*T@R9;;v!
zOq%m?0oz*UO>0D7U&v=voiasYqtc@z-V-!VN~X`Xc)mxvSgZ2!TJiULz8`d--^6L=
zQE;$bAjxCm;)4>xqOo5Lk4OYJT}~0sQC;I7kaAA#w$9De`ObZoqEq}gx^`*rYZ3BZ
z72|u9Bj9RiymPOqX_m&)wAm)tYq)i{T?x#-TXK8p?swHMHZE`8diIra_W3ilX}xCI
zHl0$h|I9UAv3LK>1%`ep1#HJ|2uXZzW)v~uKUboVU1?x$ad~2|k()%|DTU>i5_ouS
zx#`U1d-v|l-lx8dckh2X7Jg=><K6iQe!Q>z&g}hEb}-7f_|7cP3oo1!x;Qg0)E!mj
z>nwJ?er|Ka?BGRAU8>qYq>aVT{cUhME>+T<r*|?#-Sqkc-p{`0jvMaD)_u2O_tMo<
zuk5(prFZ&oMPS~{beEl1LR7D-+`MF@tr+to@W959m<{C>=_k)<&z)2`EqiOk<3MTk
z>Q@&Hno4+<uecWyohh6D@6B?-{zE&D<a#c>|Lfn}Jq9K-4$j=Lqqj?U*G`jUPX3>B
zmi%H&w4YS&yoE_JwtUJZjjudx0{)Ap=<l#yQdOQDsc^3Gz~t?fKOC%CtvhFP#Xj|j
zTKYrp^=gUx$5-8B|1EV}??m`+E7PZ!BHAn!>V8VHX2$PISk`1FIfYB@!QAt217+9U
z7qHPWnDav4^naB5X6wJNWcHlAlg?rOAt`i?x%xA~QxD^Jw_kCa*;dfI>=#3E+g{6}
zH=WPQbyo8){jqw+mGD=Im%@6S|B0N>m^lCF=fo3w)vx~Z-rOx;YHFNjw|GfR_Oq>B
z@vE$M$y}{Cl$23_@RN3k$J>RQ`@5oY9^akk{L|CkZqv5kmMTU+R~F^BT8sQrGWk0B
zVd2q7n?vf;zTD@HP54`S&)(xJ`?G&8&U+78Mm*k9kj44m=B&Az-8?0`pjF;%`sZfl
zO?;d@;rf|>UqklJyX95CX40D|H=b*cwHKY<Hc5N`0XMB9U(@*CUi_KiJ^R+Or*Ca8
z=cj$kncbr1{dDQcp6u7$hvv409RD62@}KFY&h-eDk9#T@7#LeKot*<bot<HY8UsVc
zoZ5-D9)}%dj>ZQc<=1Kw6D&M&fvbr%P|$s?lb}{h)WT5q$=>@Hcsfsd^hjfen9QGu
zHC8(;UcY*v#nB|MptsJiOE2ir|4B~W5&V6>Kfb&7_?@gmNVm`CTgMoEx1V*<(OPzC
zb<%O|T?P$yErwdgr)NxFViDE1zWT?HD)EPrYtR3+th&;3lwrPy&1s&?YWEc8-P^)@
z?)MSLY12a=6+beZtmpCPMCsAT=I1P@v(A$=ncP|VNMYlQ?4+fgk@v22Ebnk$wJdnw
zgijGq_Z*GXo)-Cc-k;XSo_(9nl+HTbktparLBYvUl2s&8*=e<3S1Zd~_vjz(G5cNg
zT4PuZigXsR@NRm|{=fPD-Kd)<IrTLKSZ~G4JXhu^dBe1|>v4^|wclHo5BALARfpqO
zF&WQa5-t_>g5$+qHobMyvo^8EykltgZ_7Eg?#Xh^l+6czOV$QUz1YvX>-wI1uYOz9
zGEBM>`iITJg2k<9%HDgA?#?~C_iy#Gd-wU5{4Cm?`~UDd1_lPUByV>YhW{YAVDIwD
z3=9mM1s;*b3=De8Ak0{?)V_>?fq}im)7O>#F{hX?gK_J%tBni{jLe=cjv*0;pN3nD
zH5mx-d@f?F_SV?haqDJOwXXg{UyX%ZzH>x8-7Da{X(r2u&9W)!>7Q=D3A=teH)NXa
zyz-|}ceiwHT=@RpzqjSfPnzFwSZdI5cAlW%r&3D=MSnrXj~jQcI{eXQ)zq_g!8az=
z2s0jZ{;`$m)v~3<tPu<PXLPcPS+slhva(5h=Iz~G$rQ98^4%QW&z%mPlExCsOx_cg
zuQ{@)(n0CpcH@OlQe8R~ETgwXx~80KpVstd<DJ<L*Rp#}joDb3ZyQk58Jw*6d;)K+
zxnfGv%dP8f*Q+h+7kQ93-E8lyC5E1rX~}kN;>Etozjt}o<mk0ng>Td2_!)Hfqmbyt
bjpAlirFZ37B|kDSFfe$!`njxgN@xNAwD`8;

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cfd971499b5684b531201594ce58192af069392
GIT binary patch
literal 2037
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..226ea151002fdb1750b61a7eee4c485986fcafd3
GIT binary patch
literal 2209
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
b{~7N7D$jnr-|GYe0|SGntDnm{r-UW|qWKW!

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c03796c1858473baf9dc837348d3ec30dbef0d1
GIT binary patch
literal 2224
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cad7f9e2136d6ed073ef20116943e092295a1815
GIT binary patch
literal 2177
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6842c71975c1e1b6f7bfe2a88a41e6a9d1c7dcf0
GIT binary patch
literal 2228
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

literal 0
HcmV?d00001

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index dbb8103280..ef4bfb08e5 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -51,6 +51,7 @@ minimap = Minimap
 close = Close
 website = Website
 quit = Quit
+save.quit = Save & Quit
 maps = Maps
 maps.browse = Browse Maps
 continue = Continue
@@ -861,8 +862,6 @@ block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
 block.command-center.name = Command Center
-block.rally-point.name = Rally Point
-block.rally-point.description = A marker for units to group up around. Requires issuing the 'Rally' command on the command center to use.
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Repair Drone Factory
 block.phantom-factory.name = Phantom Builder Drone Factory
diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/io/anuke/mindustry/content/TechTree.java
index 0c325b47a1..cef721908d 100644
--- a/core/src/io/anuke/mindustry/content/TechTree.java
+++ b/core/src/io/anuke/mindustry/content/TechTree.java
@@ -45,6 +45,10 @@ public class TechTree implements ContentList{
 
                                 });
                             });
+
+                            node(armoredConveyor, () -> {
+
+                            });
                         });
                     });
                 });
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index a5c89e6305..de84a6fd25 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -258,7 +258,7 @@ public class NetServer implements ApplicationListener{
 
             boolean checkPass(){
                 if(votes >= votesRequired() && target.isAdded() && target.con.isConnected()){
-                    Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] {0}[orange] will be banned from the server for {1} minutes.", target.name, (int)(kickDuration/60)));
+                    Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] {0}[orange] will be banned from the server for {1} minutes.", target.name, (kickDuration/60)));
                     target.getInfo().lastKicked = Time.millis() + kickDuration*1000;
                     playerGroup.all().each(p -> p.uuid != null && p.uuid.equals(target.uuid), p -> p.con.kick(KickReason.vote));
                     map[0] = null;
@@ -330,7 +330,8 @@ public class NetServer implements ApplicationListener{
             if(currentlyKicking[0] == null){
                 player.sendMessage("[scarlet]Nobody is being voted on.");
             }else{
-                if(currentlyKicking[0].voted.contains(player.uuid) || currentlyKicking[0].voted.contains(admins.getInfo(player.uuid).lastIP)){
+                //hosts can vote all they want
+                if(player.uuid != null && (currentlyKicking[0].voted.contains(player.uuid) || currentlyKicking[0].voted.contains(admins.getInfo(player.uuid).lastIP))){
                     player.sendMessage("[scarlet]You've already voted. Sit down.");
                     return;
                 }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
index 4937287922..bcda92faa6 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
@@ -72,7 +72,7 @@ public class PausedDialog extends FloatingDialog{
 
             cont.row();
 
-            cont.addButton("$quit", this::showQuitConfirm).colspan(2).width(dw + 10f);
+            cont.addButton("$quit", this::showQuitConfirm).colspan(2).width(dw + 10f).update(s -> s.setText(control.saves.getCurrent() != null ? "$save.quit" : "$quit"));
 
         }else{
             cont.defaults().size(120f).pad(5);
@@ -91,7 +91,7 @@ public class PausedDialog extends FloatingDialog{
 
             cont.addRowImageTextButton("$hostserver.mobile", Icon.host, ui.host::show).disabled(b -> net.active());
 
-            cont.addRowImageTextButton("$quit", Icon.quit, this::showQuitConfirm);
+            cont.addRowImageTextButton("$quit", Icon.quit, this::showQuitConfirm).update(s -> s.setText(control.saves.getCurrent() != null ? "$save.quit" : "$quit"));
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
index 0f1b31c3ad..63c4828f7e 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -149,7 +149,7 @@ public class BlockInventoryFragment extends Fragment{
                 image.addListener(new InputListener(){
                     @Override
                     public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
-                        if(!canPick.get() || !tile.entity.items.has(item)) return false;
+                        if(!canPick.get() || tile == null || tile.entity == null || tile.entity.items == null || !tile.entity.items.has(item)) return false;
                         int amount = Math.min(1, player.maxAccepted(item));
                         if(amount > 0){
                             Call.requestItem(player, tile, item, amount);