diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 33450661d3..7395a71b7b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -999,7 +999,6 @@ sector.mycelialBastion.name = Mycelial Bastion sector.frontier.name = Frontier sector.sunkenPier.name = Sunken Pier sector.littoralShipyard.name = Littoral Shipyard -sector.cruxscape.name = Cruxscape sector.geothermalStronghold.name = Geothermal Stronghold sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\n\nGather as much lead and copper as possible.\nMove on. diff --git a/core/src/mindustry/maps/SectorSubmissions.java b/core/src/mindustry/maps/SectorSubmissions.java index 92e6e29454..783d796c80 100644 --- a/core/src/mindustry/maps/SectorSubmissions.java +++ b/core/src/mindustry/maps/SectorSubmissions.java @@ -53,7 +53,7 @@ public class SectorSubmissions{ register(6, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926782966497322/1516634498307985460", extreme); register(265, "Dem0", "https://discord.com/channels/391020510269669376/1379928052921929891/1450757980206137359", extreme); register(161, "Hengryton Luck", "https://discord.com/channels/391020510269669376/1379926882203730024/1416686287204782217", extreme); - register(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1419213541512187935", eradication); + register(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1419213541512187935", extreme); register(263, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379928050010951694/1518065606161862710", eradication); register(66, "quad", "https://discord.com/channels/391020510269669376/1379926825941078128/1419165493008535706", extreme); register(248, "iqtik123", "https://discord.com/channels/391020510269669376/1379926979129774151/1417864622412922890", high); diff --git a/core/src/mindustry/world/draw/DrawBlock.java b/core/src/mindustry/world/draw/DrawBlock.java index 6c25c97748..45dad1803f 100644 --- a/core/src/mindustry/world/draw/DrawBlock.java +++ b/core/src/mindustry/world/draw/DrawBlock.java @@ -12,7 +12,7 @@ import mindustry.world.blocks.production.*; /** An implementation of custom rendering behavior for a crafter block. * This is used mostly for mods. */ -public abstract class DrawBlock{ +public class DrawBlock{ protected static final Rand rand = new Rand(); /** If set, the icon is overridden to be these strings, in order. Each string is a suffix. */ diff --git a/gradle.properties b/gradle.properties index 372bee817f..eae5e4886d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=41219a4eb5 +archash=da9887f6e4