diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index fe92fb9a3b..3275112948 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -267,6 +267,9 @@ toolmode.drawteams.description = Draw teams instead of blocks. filters.empty = [lightgray]No filters! Add one with the button below. filter.distort = Distort filter.noise = Noise +filter.median = Median +filter.blend = Blend +filter.defaultores = Default Ores filter.ore = Ore filter.rivernoise = River Noise filter.mirror = Mirror diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav index 3164e82223..cad5016e9d 100644 Binary files a/core/assets/maps/shattered.msav and b/core/assets/maps/shattered.msav differ diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index 1c9f4e4b2a..a78d342366 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java @@ -307,7 +307,7 @@ public class MapGenerateDialog extends FloatingDialog{ if(++i % 2 == 0) selection.cont.row(); } - selection.cont.addButton("Default Ores", () -> { + selection.cont.addButton("$filter.defaultores", () -> { addDefaultOres(filters); rebuildFilters(); update(); diff --git a/net/src/io/anuke/mindustry/net/ArcNetServer.java b/net/src/io/anuke/mindustry/net/ArcNetServer.java index 0da624635e..ed8496a8e2 100644 --- a/net/src/io/anuke/mindustry/net/ArcNetServer.java +++ b/net/src/io/anuke/mindustry/net/ArcNetServer.java @@ -1,23 +1,19 @@ package io.anuke.mindustry.net; -import com.dosse.upnp.UPnP; -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; +import com.dosse.upnp.*; +import io.anuke.arc.*; +import io.anuke.arc.collection.*; import io.anuke.arc.net.*; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.net.Net.SendMode; -import io.anuke.mindustry.net.Net.ServerProvider; +import io.anuke.arc.util.*; +import io.anuke.mindustry.*; +import io.anuke.mindustry.net.Net.*; import io.anuke.mindustry.net.Packets.*; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; +import net.jpountz.lz4.*; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.ClosedSelectorException; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CopyOnWriteArraySet; +import java.io.*; +import java.nio.*; +import java.nio.channels.*; +import java.util.concurrent.*; import static io.anuke.mindustry.Vars.*;