From 92256761f4cc0bed9b4f708192185c53391df188 Mon Sep 17 00:00:00 2001 From: null <89076920+stacktrace-error@users.noreply.github.com> Date: Sun, 30 Oct 2022 13:33:55 +0100 Subject: [PATCH 1/2] contrast on large paydriver is way too high (#7775) * the contrast on these is way too high * Add files via upload * fuck I forgot this --- .../payload/large-payload-mass-driver-cap.png | Bin 1886 -> 1146 bytes .../large-payload-mass-driver-left.png | Bin 1861 -> 1861 bytes .../payload/large-payload-mass-driver.png | Bin 3035 -> 3009 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png index f04e6f0949e895238a61bacc127b75361040b7e6..deb572c795385389a8ccc197a6476bf9cdaee2a2 100644 GIT binary patch delta 1136 zcmcb|_lskKWIZzj1H&G{>GD8|u{g-xiDBJ2nU_G0bbwEYE0BhO8MBt;6*R=f75~3n zf2A=SC}`H}SPrB(OM?7@8U90oIn(Sb3=GUaJY5_^D(1Ys^?K7MEgrT9row#R>yPiA z=KQHGWG!pjx0=fOl~;}`FBN$GtN!=r3LClpDLizCuWu~$xh5m-u^W2j&s*rWoIx* z2zH#`#J28(sUov5!(x?(6=}RNk5@Y}`Y`nP9Fm-AS}=8e&WTOCuQcvlYn$u(P*wGH z|CVdlr%8%!vJ#(kV6(qp*VcWD1h+EP|1PrO7Hbs0+7xr;`Y%8KB*ovK4EdQ)ISc#-+OevzUg6!VD{-LG>9Ts>1(gpc+pdX; z)EBI~@XeFsM^vOnLv#MBfS(eFoIZR#wTt=U^eRC^_Z7$UmxLr-IZ*bCeg2=U?-3eS zy|OFVxzFv{Wi8_t|7hB;SIP0a6R$LQaoGJUTFTya#r!X)`J_h@ubUj?xfo|KXc(V8 zK6NFpPW~Q-W!Vq%50xLtVY+SYn{bO;h51CjX+vVY>I6ZaCDjKEn4UiR%cCK}jahdGY0zTn*Ow^z`EtDe88RB$}l_$j4Jy>o3 zxA_V4hopsa4Ue9t|JN#z&d4v7Z`l8vZ()5~} z_miJ{En0XS>MisBc*HF*D|oawt06;S-t}(+(*>kGHrKdH)VDzxku4xX)HOkk@3VpQZzv}X02916eg$d!m98L%vzV5hZZth3Ug$)t=*o1Ds w6`MbiYl~FIv$EgSC%#?%TCn}tzopr06Sb4o&W#< literal 1886 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 KMNUMnLSTZ1wPv0G diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png index 607b2c2443c2ed43a5f0c5b5140f2a3029b14100..0aeb3212079b11d877bed97b380b63bcd33d932b 100644 GIT binary patch delta 2565 zcmV+g3i|ci7r_^hF@JkWL_t(|obBB`ZyZG!2k^&;f)`ZfP)BZ%oKz4g zQtH%5mLOG#M029%Q$$IbifdwO3XsyKGX)y6*_)T=eP;HazjRV^zT3T9|2(@hJ1+o{ zNF)-8L?V$$Boc{4B9TZW5{Ve*r1uAC<>KPWP3dR%?tgRe+<&9X2g83SNxpyl?BIBu zo!u?Ie)Qw~6td?_Ozk0Aj{@TH7= z(5aE&OBwZe3@y=m7l47!FS8*u2Z+T-x&DjDg1uh! zKxhgu@Qs^M5O!~d34HxRsX1GvD?kapfct+Wka{ERUIKCw_zu$>5;xNU41DFxh;S-^ zfv=s}5KaX!vb_YrNY@0wNY@Ml5PO^L>FEdKPcm;Fo`1hXy-w?PokmOmUR*r6q4ezw ze0s4!_~PYnH&*=!)d4QyVQQ^`Pd}Onm$hmOgsK2@rCtqT;IoSc!d#P%HbOOkwNtL7 z{VwqFgGHE2tvyi_p$b6E^&SUd;FE`g5Yw2gg-{HTQrVy&419W_Af(($(Lg8y$Qi{J zx6{TA=YKYy6d@a6455sqND#6BO7O+Fj&UPtpynbZ0}OoIjyFOQz`%DL@kEFQI2%4m z8`x;M{QPhCeR?580StWovsHvmfV0(hw}>yL2SQ0O2&({F)8meIUAJX?DWf6W@2{&R zWeXvz8Dk2(eKc2_4DU{r)$d{0k5z|+$YM~yG# z^7Fsp;rY9RV_}65bE@6%uhGjxpsxY7*PD>wi{#^luocQItE5Uu3n8|rOW?DMHNsYp z8Gq^&zvNnQ31Q$HC%q7I=9gwQ!>kc%<69^2(ZfB~T!h@o&Ds3{6T-kZZoCjmX4V(= zh{je-0$;yaBa|-dARZHvYph--@b!-sLXDOYl~HjmgqSQZlmnlBmIzlE&wfoY!P3IC6rzW-2nzZS+<7I6=2}g$(9hh0n7oRG?3QX29F6}N(~C-xaJz0 zJrTM9416}(0z&f%Dy{JS_~&OwjW6Zp`#Y#Mzg8#+r<|ZNMGIf#<5(dqWy%REHGjr% z1io@K&IsNJ-6p8?#bBA6DtMRM&2Ib)qp_mPKYj=vDGj^XT%y33XB;%<-;nkbi?u^8RI{ z<3S{g=V-48kRri_Ev-t8&XQg+>*GQFL#`dqVhJe4S9(qo4}1VNC8e}v!!CuT-Tf+u zN3$f%0@T2V`57e=e4JZRng}`ga^o_*5!Rq-Av^%6iI4J{S~T$WLMXx46Cnne213!D z5DF|VLe0~zH$ttFZyjrd6n|LK>t!}T4k+q-B=}0rI$j7h@#QKYRtPzuBnVjmxuqH9 z^e!2I-fB~{Mrcv;N!siv2)QLb7ap+zdK0W>L(PNz%5a#ebJb(AmBbOGww5p{ALigFRQr6fsOFk;X z9Jt&st2IM|Ro}#1|9?Boj0Cxg%KCd@@ug@Y>^47ONS6`l2-}Cc# zHvmANrIdqD`@Zm_%LgZ#*Mu0HnZ_*%x!LWm$TP>cA}#r9+ZzoZfZ@GhDMBt5uVr4B-_NV- z5_dR(bWIS;?`PT>q1SpL)(CUo%NijUpETCrYxw?v+*l#3eIKh|)>iQWOwuEo8|iu> z>tMcz_Akw<5xJGk^oXVgJ0T@yd$UFppLDWHs|*EjiRIW4YJcOi*sex~0hmK_tO%{} zS!`dLApq8JjD!%=z%K2^ZjH}kKa#isEM353P>fW1)ew#}00;xD^ct@U2!L}5xJF2U zH9ErC@ReTci4UN|DR|Vytf^Td90{K!-uM7IT?29uT1=aZ*>5R*p=69E^KTM8L}ei_a}F})D>#s@F}K!7~L(ePn@-l~0$gm46W0D}Mo z_!yxjJ^=YrV7b>}n?5X-(!ykka1?w10|5m14IR za?m9BN~pJh4`5(`0KN!Y?~@D*90387DGMBbUy8?|q~||96MxQG@BvH&5P*+RV-PuI z-`ssH+vvF4mu^2sH+gbKq0=k!v8PZeuol022ZPz=O~jL@qh?WA{00000NkvXXu0mjfr-ikv delta 2589 zcmV+&3gY#_7uy$*F@KdwL_t(|obBCBixfu~2k>WuUmy^{+|6Zk7Z&mf6cQ4z-U6#9 zlT*%~Jtdx0$Sv26DC~ZMfZ#oIaqkKS@)0(NP)XZUFVA~b^*n!A(Ak;pnV#QPcU9L5 zKqL~0L?V$$Boc{4B9TZW5{X12hB@l}23om&=k8VMcVB<=?SI~54^Hn5|CuCt_~WC! z<8gd^v-teckH;sy-#{%je5E{n{u}uf zz373^6ky;RH=`iz-V77?`h`++wn|rk5_|#o|41P9M%cXsSrUMxG%9#=2 zQ~(2CJF_923SeY=34oEV34oEV83rKsHrwM{H;muOynnfW@)q?xt=n}PF#&k{&fP0Y z-@d@77Yl?>pZ|7c)sIje;1V9D)*ATqqls`?tF}O>3NTmd)er_gyJ#THHR)(0R0CK$ zCF;wiLeHZi!ku<(+gp(v|IiTGebY>6nt@hc7y>&MaaeX_|^@0eCx(R z<4ZaH^aI>KdAoNktPo;OwY%LVdU*)+HK6u-6B2xpe7q30LYZZiR0(Mz#P)Ove0H%$ z*njFVL!IK6TnjEC41D9H7edbb(yV5fH9~EC>jXY}xW}4{kUP0KyFXw;82HAG7edL* z`l24u*osNu>lbT;(q$dQV?uI`)yo9F{;@)+(K4bkDz1ePljVhS;M30%;q$+*i?^rM zET=XuSb`9PuXHCQvY%3|R|}zLn{fBZiGKp0O{@`Wr7J*8`xF-+w(V<%aG_w1L2rcJ z00urn6<+^x8jbPxicUbGQz zt~0_Ki59*HE|QXvvv3VHE+t^B6Mxq?R_n!S#O)Lur^|Wbg%7~_8ZZ!!A5VM$9hzYR z;kfa}2jIL^SBe)xizVj0^YF(bf{TJJOgf%OW$BgkB{dH4jej9Z~;)F@MLqxN-w!t)caBVZ!+%Ke)&9Rs4WHGx z*yWdFb^EL~K&Xarjm{IHS#OvWEGkWWt;bujMA!pgEhTIo2+jKgrnGQL@U^ZpM?+{4 zZG0(`=8_gJ_qkz8$TaY^4pa%@<6AdA`dMcNggJcoPu_m?lS>OVM@6lRk>a$2a$`+b}Z{(-aweFgydl5Y(UbGpY|Tdm40Zl`{bT@N50hVHT72?4+A3 zd9$ZruO7|V{b+O$rRT`D{rHL=4H$uwmlhg+z1XnL#kdyldL>JFHgnoeQX!i@W z>{trmFeoX-3SkT1A(K`JE(GWAe>Ibc2si;glfeia0d135w84BPM%b|ZG)W&DAU5yL_Fo)z&5nAE1*uFGF0IcB{2_dF|UD}P^8lS~}Byj^+ zx`4-^7^(ECAslG{5C&N3IiBk(yOw}!gcMk#Bb*Ii>ABvEdb^*3M_tUCnkB-K@JZ5R zMfon*fE5|!qM{-A+_`zFMI%fYrCZk2M}Ov zgtgz*5C*<{h6D(pgHSSs8AtB5>&J3~l5)@__)4g^fDd3`fB?P-Td$Mx3LF6jlMV|U ze=o&jP|}m1ABo@REcgH>0tmoIs4<9~vTyD_mTh$0ZOnuZU^0LJbc7m%$T{$-`^YsA zQ@1f2K7a`U0^mVt3?i4D`my_{-JQU0V@7-c6IDX2k}3_kN{CkP?OeqqRYFF)HRhcu zOF+$(N)FAT1EqZ&I=)CG5{X12kw_#G7je%&wY=9%xe*s+00000NkvXXu0mjfJJ`Nb From b9d523088aa6a29f99ddf19c6c1629f68ec12eb1 Mon Sep 17 00:00:00 2001 From: Volas171 Date: Sun, 30 Oct 2022 07:34:09 -0500 Subject: [PATCH 2/2] Serverlist update (#7783) * Update servers_v7.json * Update servers_v6.json --- servers_v6.json | 2 +- servers_v7.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 478bd0e942..153e9a215d 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -13,7 +13,7 @@ }, { "name": "Omega Hub", - "address": ["n5.mindustry.me:6569","n1.mindustry.me:6568","n5.mindustry.me:6970","n1.mindustry.me:6570","n1.mindustry.me:6609"] + "address": ["n7.mindustry.me:6567","n1.mindustry.me:6568","n7.mindustry.me:6570","n1.mindustry.me:6570","n1.mindustry.me:6609", "n1.mindustry.me:6577"] }, { "name": "EasyPlay", diff --git a/servers_v7.json b/servers_v7.json index bfc8b93d15..55dce5791d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "Omega Hub", - "address": ["n1.mindustry.me:6572","n5.mindustry.me:6971","n1.mindustry.me:6574","n1.mindustry.me:6604","n1.mindustry.me:6569","n1.mindustry.me:6611","n1.mindustry.me:6610","n1.mindustry.me:6599","n1.mindustry.me","n1.mindustry.me:6608"] + "address": ["n1.mindustry.me:6572","n1.mindustry.me:6573","n1.mindustry.me:6574","n1.mindustry.me:6604","n1.mindustry.me:6569","n1.mindustry.me:6611","n1.mindustry.me:6610","n1.mindustry.me:6599","n1.mindustry.me","n1.mindustry.me:6608"] }, { "name": "KMWStudios", @@ -117,7 +117,7 @@ }, { "name": "Eradicationdustry", - "address": ["eradicationmindustry.yeet.ml:6569", "eradicationmindustry.yeet.ml:9547", "eradicationmindustry.yeet.ml:6572", "eradicationmindustry.yeet.ml:6570", "eradicationmindustry.yeet.ml:6571", "eradicationmindustry.yeet.ml:6574", "eradicationmindustry.yeet.ml:6573"] + "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.yeet.ml:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573"] }, { "name": "AlternightBrasil",