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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

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
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
Dd$r;n

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
zcmV<O2@Up%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000JjdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvvg;@e{bv=u1dtHJau}<62fh400_^1GCa>Sn
zamCm&7ScHyuo?gSJ<VVE5sNooVhT9~i=WRvQ^7^D`?p7D{W`B7okzI;A~*K~f`~El
zz76BdFObXQh3JpGewCZpj-GTBod=gf)|GX&evCYdn6})Vdy|hzB|N!v{v5X_*W}lG
z9|1-e2$>8Gc5K&~_DT#ZICH_MXJR6icw7s|B?;g0GdFZ^0KBhW@U!j6`2ojPbh#B?
za5{1)@9|qGJzM1HUYVXPa`_H~Z}`pG)0|^_S9~ylD;%dTSJo9KR=~;YwSXhyFSw5D
z$W|9AwgLDKSF5oVH`x&opU%7Pikoh%vAG5lJq?N&i5l^eC61J-@umQWn-mS0>72ks
z19J>9-L|;3Zr1g%Si;KPVJ0~!bIRuPVO|Bldwfwer-r$6Hr-gkF4Fjd8OofVF$;va
zc`%iQuQPkFuRkT0!JsUd6C5nIZWUGBBer<)%vKDhdb>m3#eNh3BCIVi#xWSM!LhjD
zY$S@#0mlS>3M?n~RKb7~Bh+CfdFB9e66xA_C%QG4gti#v1w;r3BuUcL0a@OQ56HKK
z5GqDcltd&*lq6Y7;NXLV5Mt0eRU$_pC59MdiaD0V$tOu6#gtM`B~xaUF)=yhm{ZQV
z6f9bNfv$r21%gVItFKZ+jWyL=OGEfH-=u{WTWYzLPMteSfa#&fo_g+OxPed_e#i(T
zjx_Qp6R|dV`YAKaIMd9t+^ii|zq0nq+>cpvhc#M6>Ad)04dNIt6;8{EC}&`dyaVG=
z89+dja%PkBo|HM|%w}T4ECee>$>~lR1A~4zlId>l9?X5@%>dnB<&EAkXOz1CgE^zr
zJu&y4w>PZyvdS$lf;0<(DJmo*{aPrL3e}FREma*&r4=kS;avA%%8NrU%>zC;y|(rq
zBa3tcgnceGxz^VcK^Iv{QBJ>&BVz#qCKYL>GBmNJPEfPYg%vqQ37tvWHA`=Jb0V3B
zupLXDP&G@3*=l>Msf<LyY(1!@&u{Os0_$Z1U~G1TvL0mja4!0)PJpju{MN+wvqM-o
z6xG^8?qMPhx(%t<;{lpY&EBY%&_Z&OqCg;^I->kUI8q(eu+D8ZnVycdXv@nQS-4UR
zmQhBQ-qQSq)qjrrb@3b#_?NzD;N_q*3vKHHMu&_BvQ0ozhPlD4h?FOtkc6p&LEqy#
zV0y!QI{=y{>=T~P9(;7be6V=yab3eqG^L+{Y0-zguc=)Ok8XBo%$T}=@SXr@A8W7;
zB;}biA6+$Rul~lc`9S&m@r`SdclH=>Z~G7#h~vf@9L0|&fCX)SJ?&`QNa<x#g9n1l
z?OGL5>+n&WQ3TSPu>Qqyn3aa9RCf_|XRp1pm%~94+Z!yKrA9rsnCeJ}Hv@|P*c=_r
zvg>~^%j|glbF&Ph2Am?ubcpUSU6S8Hj_MRfJ2?3C%<wK&D4|FzbP;JcznqlZ8kOe7
zvF8pC1O>SDQcnVXpxFGB^`DGhdB2m<_?E&poE`xTt9H>EEKf;Bx4ns7M}->!ukYo|
zu=M-1*PSxxgw32(%xSfi#dz;6yjF=nuSXw8StSPjWgBQpac^g<dAZgjeADe-fHW^i
zA|?hJ!wfZ`k%!d<Qrd5{%<r1#0xFw{yS=EVAC@D~pZS#AQzYf7NSf~jp%?5<2=%{4
zZ16%IGD}AI97o)v5wH4mN+~R&<%+<O8L>$&O%c)-8W`>ROUk^qr#pqBH+ADGG{RN$
z)6bW)zT0?f!JIZRy+^nG)(dl$f>lsAN}8yw;GkM;UUF88v!-6`eqv)}YM;q5@+9<4
zI<mO;ls;f;H!3*I3EeYRd^RAMhN0^TkHWJLd>~;bKYlE(b`%-#3|wF*%Yf53Eg>i_
zId<XJd?47ni(l#idYS@ph{87e2^I%NvJw;U(P`XhVM6`Dp12*rMt9){dx)K1*t|4A
zfTfTtCF_UZWfZooqhyo@>~N)5#B~n?3*y@XNFyVG`)S7`(@S|X4=z_{jMyHIs?mgx
zs&InHUk+<^p9=ze?X%k4fp4BN!Ran<1+VUbF(F2L)J*+e*L_#rbp+pVE2m(uulTOe
zv{~7Y4f*%drdv=o4F-BY1}bd4Li_`Ia1E+=RnPg}&R|oX5oG@YN>+b;&%lCU0004n
zX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ^gM|f)){R$j}Oc1yK=4twIqhgj%6h
z2a`*`ph-iL;^HW{799LotU9<j>+0Yt2!bCVF0M|BE>hzEl0u7E503ls?%w0>9UxST
zOtad?0Zq5fL@X+%(yL;}E4na%K7=tUGs~Ehq&QlRuY36TdKckYt<U{Aden@?0G~)a
z%M8;d-XNadv<=St#6gyqRpN8vF_SJx{K$31<2TMZmj#{~G?R&W;vlh@YhtB|S>Du$
zr-(zUrc=I<@>u1(#aSzsS^b{;g@KH|vdndw!-!!KOOPN!K^X-UVIxATPKt#D?MGYq
zhg`ozE`?kLFmf!Q1P!w52mgcL-CEhn2`?!S1=?R6=OYYs>;kol<9r`GPVEHnKLb~K
z!(XZbGoPea8d~TG=-mb`t{a-N2VCv|gHMKR%C6+6DP*(2`x$*x8tA_Ty4Sqk>ial-
z0Fu;I{02BU1V(a{z24&8oz1=dd#2vs52X2WyKVo&t^fc424YJ`L;(K){{a7>y{D4^
z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jdAA5;+>kBC22j00Cx6L_t(o!(&W~
zng5>w3OGa_GT;MuZeL~~2B@g&;*|UGMjnOFgin$bgGo_?(*cw^f*8xuLzziMT%AEh
zT%9CWW3z}9pFerO1<q!H8z8REaOdSstZ_}Qg)nolsf9TLB?@qb1hI*a96cCmfEtcK
zR!b<Pn5gY5LTb?ES!flsWM@Nq114C?A20_nFfcG6JL15NUb;E}o(Ar`yopjk&@}`G
zJPK$9h$$`U8Uom|FcWeK=%7(NFj0V9{L<SIOr%!DLnaZTCqP_9I14>fJWU)xO2dSz
z4j|XZL^;4gqZntMK#Il0RNX8;`1de!e02FwEgzHGUceazuuz~hj)`&ru26s#N>Bdo
zqFL*Rs6;5k?1pGg|J{YvVtgeidZP!q+J_fJKlt}BlIj>@i*NMORz}bVdk7GlAdw9q
zI@=<3e2~q+>>Kj$VZ;|2*xHc9wkxsKJ2>kCY!1O^5xI?903eu@<VF2LtpET307*qo
IM6N<$g23~hTL1t6

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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
IM6N<$f?q==od5s;

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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
IM6N<$f>l8cdH?_b

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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

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
zcmV<M2M_p(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000E>dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1YumaMoA{MRaa3AQ{h$KyG@gSY$+*@he-v+CaS
zpbCT1Xov{QQ2*b*gZ{z6+D5W2M4!A@IBc?sGj5_<#~QV=^EwaSKjHbsPUjB{lfh`#
zqwjluhTT102zJ}ctDQpKe&Tkte>fZ(i7e6DPI5akyzF{EQ`#wI|5VQYH(^zBOn!g1
z0bn!-qhaE1v{CcQE0RGLCYg*;u56ga;-*F6YK^<%M<;YQ0G@Ym_^G<><^jiYbd=@a
zaN2h5?(v%_J!ho(jLgp&*`k7aKA!L!qs1}$sxDhkfXnZqj#B0wCKk9d^EHn%;NRgs
z%roJPDys_M8%iyt3LcVXAU?F!O=mrHpJUY(DO&CvFfvy*(-uwO#C4Kl<<x@%fth9^
zxT#>yz|3bZdd5u>55XcLH;tLB;Y<sg&nLYb{`P!vG=|7rYZXtdkQa--kcKcPSIhz-
zdTdPH#8=ZA)cYaC8ZhW4%n=1<RhEn5^g~-_@@$kNOtorBUWc|F03yV8NJbklpge@F
zy;gxaXbl`A_{qqejpYIcv?Iq2S+X_8gPh0`8}9@?=d$BvMthN^VY~^T21^HIS?jFF
zdW(=yCTE;=&UqJHbjf9Jy!Fm|AH4Lb989pm1s_6)A%z@Gw9!Q$LyR%SoH!Y@F-OU#
zkYY+HX9UeQ!&k=q3`5~!iY>1A5=tzo<O=yzTV3@v)L2u^jhks`0n~g8Ew<Eh*Bw&o
zw!7|o=&`4s2edZKu)_^M!iXb{e6qG#eP!*Px$ms$%^FXlWL|i%26G693oY%$31?u8
ztp?*k7=WNzI8#wu%fg&+rV<-6#xb&VLQd1d7#Or&vm5&4?!nwg-U#UaDQ|qo90_&*
z59Uaydt&a&+YM_i&vt7jL9z;gDLSOV@~b{`%v>5)?YxWlagI<xwc0xT$@cMaq@O0-
zj=nXyb-k*(!l7sH8->L;ld3H@S6X((%DR>LF|He^<l{&`P53k-DbEN3dFIw@r-8k_
zgqd=HG=4(HfgzP#Ro&+Tb}<z!qqkE&Ek1V@L{kB5*XD5bI{r3AlGh{><P@<K;9we5
zTTy3v>AOF9f#GNqo^NV7{qmVEez38g44osr8hY~cuIMAChOY?@^tTmu9q}4TE{O};
z@ATk5YUc$$bAgYpb!!kabMSnsTvnk_0@Sk3MO|y7=bAQw+4jDDq+du8sX`Ql;3=1Q
zLctd(jEJKkCj`sMlz2fws-`bx--chawdLSnLePDTUn2YjED5q(E)Zoq#AMV9(84Xc
z_m`$XOL%ZMgR9iyjhNn%mC4TVkzc$D^6!O7?*?&Uu^v|1?tt$p)<#!`lnzB%`mE%+
zm|uJyi#Xn3PVcK2i`cA?KQEpo1kf3Rrua=VkN)x_m9!|65*RYsZmPQWiR&mR+1BEG
zp!>G<EgO{=R@nE;qcaiz{i<D!4$ZVxFM|BKgWYg9OA_vU?+;DUUAJ2^Ew;ZqKldon
zFPi(8X7?bDzV6UBYw!Z2An$u6b#@qRWDwSGH!}U!HfZ$?v8Y25&$XVra8YX)Zumg5
zc^Hqqdf;2E*`*JXs{iz3<a0l|+vH1_9|)#59(k+D^>p1pkl<`1r3U@yA0wBM?vZ>#
z=A;{+d<nw)56Z{gq)|HRyZ`_Jg=s@WP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsJ^o
zDuNafamdgLf(20#N3B8;Dui00RR@zxzo1D&lH%ehxE37zSgbm@IP2=*DhPrfATF*>
ziY`*(|B^zBSPzc-@$TN^?j0ahi%hfH#sN*Y%|t9JrqZio$1A!pfIfsVDl^NNlcYFW
zj<0+8_<9%NS*_3gIeOHL#Q>j3Jj)EzCf*>P-n0$Q`@}((msR3(;xUshNc_lk#p5^5
zIhO^V88nlLdEy|km}_FCiCNy%h^L4{s-{!Ekn&jNyv127mRbFt{DpyxzOu}9n!|`;
z5lfIDLO~e?6k#Jmt4@lA1noy#_=jA-L@tF~1u$|fpac!F>j(dX-`!f-$q6qh5Cz&_
z9OokpbnF7PisO7AJ5KEc@IM1rdc$9;0yCeaR~lOA2<Y7gF0LDzvIku50E174Y|5_W
zrzvE!!220}QyS>M1-jR~-s<}}eE^cwRs04xI0Qy=l)c{K-JQ+7{d=a~-w&kua=UH+
z!>#}T00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-;v
z783w1f7$5b0002*Nkl<ZSi|L4u@S;B3{-SpfSxibvk1`9QnMCIuu00Kq-TUs`Of%k
z*_IVK2kKJ1{-s#5zq{WaD>(6bKVi!_9xh+s2#o_Zs}FIYCV7afJDsm<3eXQD001oW
z#3H2dqyP)_qeO_G!^dJN`KE_3mt0cZzQ(YmI&K$yTvZ49VPpw$F<5iLbGi}BXE8;4
zfQppxSdOe;u*?&iASF<B3PK{VHo@=h0j&+#qywP>j8x^^DKQ$Yrml6AAg8KNy(x_J
zT$ke5cYy@?e)mACI?0WQnrk-{?Vsh=8)_O8*CS%gG-?@Cq@3$txZ@9Y#chcbI48~k
O0000<MNUMnLSTYyvB}*4

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
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

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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
TdY0^S00000NkvXXu0mjfo3O3V

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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

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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
DaZ3V(

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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
Cm>!`3

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);