From 3644825dc53c2650f950d5e4b9af09ec7be31d89 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 6 Dec 2021 22:13:06 -0500
Subject: [PATCH] Slightly less terrible regen projector

---
 .../blocks/defense/regen-projector.png        | Bin 1445 -> 1946 bytes
 server/build.gradle                           |   5 ++---
 tools/build.gradle                            |   2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector.png b/core/assets-raw/sprites/blocks/defense/regen-projector.png
index 412c3e3039b03c7bbe53750775aee55afdc65296..7c54117503587722ba2926bf6c09971c55c60b4e 100644
GIT binary patch
delta 1933
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
Bh=KqB

delta 1428
zcmbQmzm$7|ay@H~r;B4q#hkZyefxwB1y~<g%IjFN2|Z#vpzF3~r{JCRfc}Cf7JAoL
zuL|EbyF}&vt*hUDPx@E5=-lbk55E5T9DeuSnzwJin{SPL)qCt#PxVcS)n%v8{q1Tw
zKQHEHob=}Hc}xd*6Fq;tcrt-=+wJU!)vwhUZV1LTx67Vqai2V8TmAJz->>;H>`+`G
zaOQ)g@YXM9SDik^=%gWC^Yho-osTaw85pk+Y<pP$<HyUl8QKD6OdcHj`vdAtynd_}
zxb^q{&yPR%RyOPZy}gV3@P6lt_6djP_g=VN&Uv9Z;QQOFaT5Rjsway4(_zWnU)mwo
zvTc4yec}&u7SkH-rYrGI5^p#2)(bhl_$v9<nM;1I`<8<Y98K5m@2b`J@lWp0mOQ}0
z_%{D$omfL@j1P;k1OLI`WOD}pXtn_56yJ9|3_L964vrON4H`|-3q)?nDq8>1XyRU=
zyGi@dnh(kxX$&g^L>#48nAWVlr^lhjuy%$xqpXhhpSc1F3|kh6KD^(gz<bc-XT5lh
zsseW-UxH)Cw8Muvu6;QDdOx#+K+AiTGrvD>xwmgR<AQL$d7WMym&}XagobDOT>6*J
zu%)}5pFzke<&eh@Rt4dOSLAyYg%@nEy3P7R(M5e-Ydmv`!j-LC3sV?8PCr*-kanD1
z!hOIc<F!)qOu>Cz2b>(#?l31Pe92n$_#|JwJX42~%c1j3C!994@iTAX*nH?b%L#`K
zZTU<Z9L9&wvz>6-@Tcl9OTo4e;fgaDyq5nr{SzygS9x`A#Om(dt>>LGp1*Y6QGIyZ
z+z9X8yIbX5FFfm3vXL>=nI0<EusCz_S0<N_63JaL^Zb}MC|tSiekfTv;`we_hNcU*
z?UYT_p4G2paN}6~_GUZpvxhpo3+xz`uWy{jxbWe2j(NqNEC)ZeIlr6#VDg6*i`x<^
z-6Lk1*Jw9wUHI^O(Ho`(bC+&Q{xOr|-iO`hN%xdya;*7aEU@U|b&mJul08X2EM-4@
zSi*k1f9>!!TfAk>2T6|1hl@F;h3=C*+^?|Up|T~f_#C~4nEHmqAL0jC3m9V<xEa??
z{%~lr!Rt?_r2hrSx4jek7ksZnR`{Og9~~CAA2}_HuWgms&av>y&S{J1@>&*oSY9jL
z_RmSJE8tgFV%3E$%I#B<qtkD%S6R%F8*fr0a`2O;+|`?(ynkvmT@mM%ceLPjP%$w}
zlg;`fQ^eJ9B2oEu!86PH={~F({t9snnLC?XALQQpx3sXD(JkD8pW#yEoi2lzf~bxM
zy!%~0wAt_BxvIA`fF)OGwZNi>)5A^vv`ZVF*18`lSjPQ7&-MgUfr!2Ip*J7;cP?kx
zVm-5U0_Oz5y3CM<i+!5}H!<9J_`PT$gUg|Gg%pOAmiMkVeg(2#{Gi&hrv8I1N3h(r
zMx`^mc&;8R>@l@s6H)wIXe!ncX`U4IW2x)0OS7$65;RY^o#5H;=5VNA$)mWQp+hW1
zDWyGLN~(^9@m!*)LwCYVna9<cCN=tpG#R*<lxy^xQrC#FSUIRMY1e2srLW;=ddZu?
z7}1#!8Sf~dlq{<_qn{zH!G~pKedOW%={3et{0D>8|NQtBdw72DgSC!(pWf5`6Uj00
z-^1+p>FgFp9STcqmVAk1c*V1aV`cv<S>7shhW9p$ID+LOba|`98(!Ebaa@+WeJ`)Q
z=Hh+s%b$xsT(nzr`n?C67|V<EHaB_yZf!NKdGh?h-Va-+CipW8e%ZhIEMI-g1J3>R
z?F}va86N)o-;%BnQD6RqcfYH{;rSgOe*FJ*lVe_dd_{Bm6<?PF|HJFje(YvcQ9SYR
zI)hJ(q+{x})TbA0-=ruTsA=Wi@0%TJ&dkU+zt$qjH-J0dX@;qtO3iict^;%Ch}Cs(
vNb0%rA)7&;sk-RJj_|&Xyz$IGxZj2?5&C-mCod}l0|SGntDnm{r-UW|QiPNK

diff --git a/server/build.gradle b/server/build.gradle
index 0f526c9f56..a15d067065 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -8,7 +8,7 @@ ext.getServerFolder = {
 }
 
 task run(dependsOn: classes, type: JavaExec){
-    main = project.mainClassName
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
@@ -22,7 +22,7 @@ task run(dependsOn: classes, type: JavaExec){
 }
 
 task debug(dependsOn: classes, type: JavaExec){
-    main = project.mainClassName
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = project.assetsDir
@@ -39,7 +39,6 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
     exclude("music/**")
     exclude("sounds/**")
     exclude("fonts/**")
-    exclude("zones/**")
     exclude("icons/**")
     exclude("bundles/**")
     exclude("cubemaps/**")
diff --git a/tools/build.gradle b/tools/build.gradle
index 914fb69e25..a6b527ae39 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -45,7 +45,7 @@ def transformColors = { List<List<String>> list ->
 
 //TODO implementing this in gradle is a bad idea
 //d4816b
-transformColors([/*["4a4b53", "6e7080", "989aa4"],*/ ["3a5651", "3a8f64", "92dd7e"], ["bf92f9", "8a73c6", "665c9f"], ["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"],
+transformColors([["4a4b53", "6e7080", "989aa4"], ["3a5651", "3a8f64", "92dd7e"], ["bf92f9", "8a73c6", "665c9f"]/*, ["6e7080", "989aa4", "b0bac0"]*/, ["bc5452", "ea8878", "feb380"],
                  ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"], ["d4816b", "eab678", "ffd37f"], ["d57c65", "e3ae6f", "f7e97e"],
                  ["ffffff", "dcc6c6", "9d7f7f"], ["df7646", "b23a4d", "752249"], ["3c3837", "515151", "646567"],
                  ["5757c1", "6f80e8", "88a4ff"], ["8f665b", "b28768", "c9a58f"], ["4c5878", "768a9a", "a0b0c8"], ["62ae7f", "62ae7f", "84f491"]])