diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector.png b/core/assets-raw/sprites/blocks/defense/regen-projector.png index 412c3e3039..7c54117503 100644 Binary files a/core/assets-raw/sprites/blocks/defense/regen-projector.png and b/core/assets-raw/sprites/blocks/defense/regen-projector.png differ 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 -> //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"]])