mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-11 18:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Map tweaks

Browse Source
This commit is contained in:
Anuken 2019-07-27 12:21:32 -04:00
parent aa3e7a8ef5
commit 67b4fa6f68
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/bundles/bundle.properties
View File

@ -267,6 +267,9 @@ toolmode.drawteams.description = Draw teams instead of blocks.
filters.empty = [lightgray]No filters! Add one with the button below. filters.empty = [lightgray]No filters! Add one with the button below.
filter.distort = Distort filter.distort = Distort
filter.noise = Noise filter.noise = Noise
filter.median = Median
filter.blend = Blend
filter.defaultores = Default Ores
filter.ore = Ore filter.ore = Ore
filter.rivernoise = River Noise filter.rivernoise = River Noise
filter.mirror = Mirror filter.mirror = Mirror

BIN
core/assets/maps/shattered.msav
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@ -307,7 +307,7 @@ public class MapGenerateDialog extends FloatingDialog{
if(++i % 2 == 0) selection.cont.row(); if(++i % 2 == 0) selection.cont.row();
} }
selection.cont.addButton("Default Ores", () -> { selection.cont.addButton("$filter.defaultores", () -> {
addDefaultOres(filters); addDefaultOres(filters);
rebuildFilters(); rebuildFilters();
update(); update();

26
net/src/io/anuke/mindustry/net/ArcNetServer.java
View File

@ -1,23 +1,19 @@
package io.anuke.mindustry.net; package io.anuke.mindustry.net;
import com.dosse.upnp.UPnP; import com.dosse.upnp.*;
import io.anuke.arc.Core; import io.anuke.arc.*;
import io.anuke.arc.collection.Array; import io.anuke.arc.collection.*;
import io.anuke.arc.net.*; import io.anuke.arc.net.*;
import io.anuke.arc.util.Log; import io.anuke.arc.util.*;
import io.anuke.arc.util.Time; import io.anuke.mindustry.*;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.net.Net.*;
import io.anuke.mindustry.net.Net.SendMode;
import io.anuke.mindustry.net.Net.ServerProvider;
import io.anuke.mindustry.net.Packets.*; import io.anuke.mindustry.net.Packets.*;
import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.*;
import net.jpountz.lz4.LZ4Factory;
import java.io.IOException; import java.io.*;
import java.nio.ByteBuffer; import java.nio.*;
import java.nio.channels.ClosedSelectorException; import java.nio.channels.*;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.*;
import java.util.concurrent.CopyOnWriteArraySet;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;