From f754dd13731c43e41d128a78527867640d86f30c Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Dec 2021 09:57:49 -0500 Subject: [PATCH] Un-cursed standard core shading --- .../blocks/storage/core-foundation-team.png | Bin 1675 -> 1682 bytes .../blocks/storage/core-nucleus-team.png | Bin 3153 -> 2179 bytes .../blocks/storage/core-shard-team.png | Bin 1221 -> 1001 bytes core/src/mindustry/content/Blocks.java | 2 ++ .../src/mindustry/world/draw/DrawPistons.java | 2 +- 5 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/assets-raw/sprites/blocks/storage/core-foundation-team.png b/core/assets-raw/sprites/blocks/storage/core-foundation-team.png index ef1351530119522723d7d55c98f271f3fc069d46..afb444176c819937e51a7cfb3312dc0c4121ab8b 100644 GIT binary patch delta 1652 zcmeC?oy0rAu-?bh#WAE}&fB@C3-4M8xXxa8@`#_)t%{WnGACAxcQ9SNB(2G5Eq3k@ z>+eq2N4MwS&X{wxCzr|P{%l(aH@DyzOk+fH#KH1fR`AJJ(MpFS> zM9r}po)5ntGq19F{d#Mpq=Lmmo)548{w>-v|M%`lL(_)P1Lt44?h^Msh@H?9ULozUdf}X=%)eH;J_}}*xk=wpc9~*T9k}{L zaDc^!OL5{W&(8kA$^TYt{Q>8C0Tsu5`!6T1?f${}#G*sA=S~K9z+=TAjjZIgjy>Gf zjUBx%OuBY!S{It~i7v6&D5`RG#k9RuQPx!!?>LXL=(M^B*&B9qwsCi8)FrVA^Tf(T z{%I)}&RM@bI{4}R__(UqzmD)cQWx-<@Z;B)D_`FGeq%nPVi$OOZ_HN1Gi?)A*SBr^ z!!+TDe}!q|D#mqEKdN@WwZDIF)wU4juK6D_m`s_U9P$4jYs9$e2WP%ofT2V0k4|mj z3IY3vCs`h`WeD0Anl!3^6pr&z$ZC-LD14Gd?x=r-LE{WYw+OXxv)^1lJwH3OT zXLDX*kJxGG;PRf#M{>a$hzi0QieqHp9@3r~76`p_GnYY)*ioX6Xo)C3g@{kE8foPVmtA5^XAzHm@Rp;d<2Sk3}$n>abz+qN^Nq9 zU>49776_G4*nZLLsA=zh0iF|CAkS-@nc?nol)-l)AJsutr(R~ zvgn=TaC&MeTydUj>yBCpmn+|v73!`%^gYMY{ZKC31cCkHulN2{KCo9Ns`==;1+%{M z-O#pev_6)@HY4)Sksh@KNoIv^`(4&ABGNLqEihI4@$Ju^LZ74U#s|*SKZ>7f7_3%c zShZDXe+c_2yMuyP(izt-E@%0;{?wCmEMl8ECub^L7xDA{6LT|$+bt~Eb8{&}XXTzH zKPHt%tW%z`j%DAyyxmV`AL`$7E!gVhlqbl#fU*AdVB-B0J6-ho>zLXV2C^lI2mydZJl z6w9PX{a1Rm>?VFFXSUoYxj=E1%Km%zzhB(k8-1kxmT*PsW8FncZ~tVrKF-d#w0r&0 z<&E`$z6U;s_R7=eYRDXjn@b(bl7jQEU~DV==&hHMrj$ZqM)xq z^ADFE>n5d{31S~RXKZg-Xu>7C#9|}6%*w)!1xM@MRc>VTx-c5*B{jO`tWjO@QGnMd zYw=dczUGRCiPGyCtA5AUJUz6U(`HMw?gqK0gPqgAtzx^Xq!IY)jqBg=rIIr1)N^K) zW~EzwJ$^8X_ess3RbN+JTQuAFCcnbn0M3I;d=pHM8Ola{W!WmS;+9eW(=Tz?qwBqA zPMWb#Hs|Vx&AC+*-?<9UxPEx+3D!GNJltpayPw$=r*8q3z?{<=#pXw{arjvgo$tR}rEVPIfj N@O1TaS?83{1OU>_5@!Ga delta 1645 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 UUHQ9!fq{X+)78&qol`;+0FS{BdjJ3c delta 3149 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