Fixed #917

* Stash insulator prototype

* Fix automatic wires when placing non-powernodes

* Implement requested changes

Stopping lightning has yet to be added.

* ❤️

* Implement lightning absorption

* Visually distinguish insulated power lines

* Stop lightning infront of wall

* Highlight insulators instead of recipients

* Attempt to implement requested changes

* Implement requested changes

* Remove spaces between if and (

* Snap lightning to insulated blocks

* Update bundle.properties

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,10 +3,10 @@ name: Bug report
 about: Create a report to help fix an issue.
 ---
 
-**Platform**: (Android/iOS/Mac/Windows/Linux)
+**Platform**: *Android/iOS/Mac/Windows/Linux*
 
-**Build**: (The build number under the title in the main menu. Required.)
+**Build**: *The build number under the title in the main menu. Required.*
 
-**Issue**: (Explain your issue in detail.)
+**Issue**: *Explain your issue in detail.*
 
-**Steps to reproduce**: (How you happened across the issue, and what you were doing at the time.)
+**Steps to reproduce**: *How you happened across the issue, and what you were doing at the time.*

.travis.yml

@@ -10,7 +10,7 @@ script:
 - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
 - cd ../MindustryBuilds
 - echo ${TRAVIS_TAG}
-- if [ -n "$TRAVIS_TAG" ]; then echo versionName=4-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
+- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
 - git tag ${TRAVIS_BUILD_NUMBER}
 - git config --global user.name "Build Uploader"
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi

android/AndroidManifest.xml

@@ -14,7 +14,6 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
             android:appCategory="game"
-            android:usesCleartextTraffic="true"
             android:label="@string/app_name"
             android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
         <meta-data android:name="android.max_aspect" android:value="2.1"/>

core/assets/bundles/bundle.properties

@@ -94,6 +94,8 @@ mods.report = Report Bug
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
 mod.disable = Disable
+mod.missingdependencies = [scarlet]Missing dependencies: {0}
+mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
 mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
@@ -230,7 +232,7 @@ data.export = Export Data
 data.import = Import Data
 data.exported = Data exported.
 data.invalid = This isn't valid game data.
-data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
+data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 classic.export = Export Classic Data
 classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic (v3.5 build 40) save or map data has been detected. Would you like to export these saves to your phone's home folder, for use in the Mindustry Classic app?
 quit.confirm = Are you sure you want to quit?
@@ -853,6 +855,8 @@ block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
 block.titanium-wall-large.name = Large Titanium Wall
+block.plastanium-wall.name = Plastanium Wall
+block.plastanium-wall-large.name = Large Plastanium Wall
 block.phase-wall.name = Phase Wall
 block.phase-wall-large.name = Large Phase Wall
 block.thorium-wall.name = Thorium Wall
@@ -991,6 +995,7 @@ unit.lich.name = Lich
 unit.reaper.name = Reaper
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [[WASD] to move.\n[accent] Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent] Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
 tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
 tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
@@ -1075,6 +1080,8 @@ block.copper-wall.description = A cheap defensive block.\nUseful for protecting
 block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
 block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
 block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
+block.plastanium-wall.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.
+block.plastanium-wall-large.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.\nSpans multiple tiles.
 block.thorium-wall.description = A strong defensive block.\nDecent protection from enemies.
 block.thorium-wall-large.description = A strong defensive block.\nDecent protection from enemies.\nSpans multiple tiles.
 block.phase-wall.description = A wall coated with special phase-based reflective compound. Deflects most bullets upon impact.

core/assets/contributors

@@ -82,3 +82,4 @@ AzariasB
 amrsoll
 ねらひかだ
 Draco
+Quezler

core/src/io/anuke/mindustry/content/Blocks.java

@@ -52,7 +52,7 @@ public class Blocks implements ContentList{
 
     //defense
     scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
-    copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
+    copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
     phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, forceProjector, shockMine,
 
     //transport
@@ -795,6 +795,19 @@ public class Blocks implements ContentList{
             size = 2;
         }};
 
+        plastaniumWall = new Wall("plastanium-wall"){{
+            requirements(Category.defense, ItemStack.with(Items.plastanium, 5, Items.metaglass, 2));
+            health = 190 * wallHealthMultiplier;
+            insulated = true;
+        }};
+
+        plastaniumWallLarge = new Wall("plastanium-wall-large"){{
+            requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4));
+            health = 190 * wallHealthMultiplier * 4;
+            size = 2;
+            insulated = true;
+        }};
+
         thoriumWall = new Wall("thorium-wall"){{
             requirements(Category.defense, ItemStack.with(Items.thorium, 6));
             health = 200 * wallHealthMultiplier;

core/src/io/anuke/mindustry/content/TechTree.java

@@ -104,6 +104,11 @@ public class TechTree implements ContentList{
                         node(door, () -> {
                             node(doorLarge);
                         });
+                        node(plastaniumWall, () -> {
+                            node(plastaniumWallLarge, () -> {
+
+                            });
+                        });
                         node(titaniumWallLarge);
                         node(thoriumWall, () -> {
                             node(thoriumWallLarge);

core/src/io/anuke/mindustry/core/NetClient.java

@@ -205,8 +205,7 @@ public class NetClient implements ApplicationListener{
         state.set(State.menu);
         logic.reset();
 
-        Vars.netClient.beginConnecting();
+        ui.join.connect(ip, port);
-        net.connect(ip, port, () -> {});
     }
     
     @Remote(targets = Loc.client)

core/src/io/anuke/mindustry/core/NetServer.java

@@ -331,6 +331,8 @@ public class NetServer implements ApplicationListener{
                         player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?");
                     }else if(found.isLocal){
                         player.sendMessage("[scarlet]Local players cannot be kicked.");
+                    }else if(found.getTeam() != player.getTeam()){
+                        player.sendMessage("[scarlet]Only players on your team can be kicked.");
                     }else{
                         if(!vtime.get()){
                             player.sendMessage("[scarlet]You must wait " + voteTime/60 + " minutes between votekicks.");

core/src/io/anuke/mindustry/core/World.java

@@ -185,6 +185,10 @@ public class World{
         Events.fire(new WorldLoadEvent());
     }
 
+    public void setGenerating(boolean gen){
+        this.generating = gen;
+    }
+
     public boolean isGenerating(){
         return generating;
     }

core/src/io/anuke/mindustry/entities/effect/Lightning.java

@@ -20,8 +20,9 @@ import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
+import io.anuke.mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.bulletGroup;
+import static io.anuke.mindustry.Vars.*;
 
 public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
     public static final float lifetime = 10f;
@@ -34,7 +35,7 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
     private static final float hitRange = 30f;
     private static int lastSeed = 0;
 
-    private Array<Position> lines = new Array<>();
+    private Array<Vector2> lines = new Array<>();
     private Color color = Pal.lancerLaser;
 
     /** For pooling use only. Do not call directly! */
@@ -61,10 +62,30 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
         random.setSeed(seed);
         hit.clear();
 
+        boolean[] bhit = {false};
+
         for(int i = 0; i < length / 2; i++){
             Bullet.create(Bullets.damageLightning, l, team, x, y, 0f, 1f, 1f, dmg);
             l.lines.add(new Vector2(x + Mathf.range(3f), y + Mathf.range(3f)));
 
+            if(l.lines.size > 1){
+                bhit[0] = false;
+                Position from = l.lines.get(l.lines.size - 2);
+                Position to   = l.lines.get(l.lines.size - 1);
+                world.raycastEach(world.toTile(from.getX()), world.toTile(from.getY()), world.toTile(to.getX()), world.toTile(to.getY()), (wx, wy) -> {
+
+                    Tile tile = world.ltile(wx, wy);
+                    if(tile != null && tile.block().insulated){
+                        bhit[0] = true;
+                        //snap it instead of removing
+                        l.lines.get(l.lines.size -1).set(wx * tilesize, wy * tilesize);
+                        return true;
+                    }
+                    return false;
+                });
+                if(bhit[0]) break;
+            }
+
             rect.setSize(hitRange).setCenter(x, y);
             entities.clear();
             if(hit.size < maxChain){
@@ -83,6 +104,7 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
                 y = furthest.y;
             }else{
                 rotation += random.range(20f);
+
                 x += Angles.trnsx(rotation, hitRange / 2f);
                 y += Angles.trnsy(rotation, hitRange / 2f);
             }

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -357,8 +357,8 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
     public void drawOver(){
         if(dead) return;
 
-        if(isBuilding()){
+        if(isBuilding() && isBuilding){
-            if(!state.isPaused() && isBuilding){
+            if(!state.isPaused()){
                 drawBuilding();
             }
         }else{
@@ -458,7 +458,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
         }
 
         //mine only when not building
-        if(buildRequest() == null){
+        if(buildRequest() == null || !isBuilding){
             updateMining();
         }
     }

core/src/io/anuke/mindustry/game/GlobalData.java

@@ -66,14 +66,8 @@ public class GlobalData{
             throw new IllegalArgumentException("Not valid save data.");
         }
 
-        //purge existing data
+        //purge existing tmp data, keep everything else
-        for(FileHandle f : base.list()){
+        tmpDirectory.deleteDirectory();
-            if(f.isDirectory()){
-                f.deleteDirectory();
-            }else if(!f.name().equals("zipdata.zip")){
-                f.delete();
-            }
-        }
 
         zipped.walk(f -> f.copyTo(base.child(f.path())));
         dest.delete();

core/src/io/anuke/mindustry/game/MusicControl.java

@@ -22,14 +22,12 @@ public class MusicControl{
     public Array<Music> darkMusic = Array.with();
     private Music lastRandomPlayed;
     private Interval timer = new Interval();
-    private @Nullable
+    private @Nullable Music current;
-    Music current;
     private float fade;
     private boolean silenced;
 
     public MusicControl(){
         Events.on(ClientLoadEvent.class, e -> reload());
-        Events.on(ContentReloadEvent.class, e -> reload());
 
         //only run music 10 seconds after a wave spawns
         Events.on(WaveEvent.class, e -> Time.run(60f * 10f, () -> {

core/src/io/anuke/mindustry/game/Saves.java

@@ -22,13 +22,12 @@ import java.util.*;
 import static io.anuke.mindustry.Vars.*;
 
 public class Saves{
-    private int nextSlot;
     private Array<SaveSlot> saves = new Array<>();
-    private IntMap<SaveSlot> saveMap = new IntMap<>();
     private SaveSlot current;
     private AsyncExecutor previewExecutor = new AsyncExecutor(1);
     private boolean saving;
     private float time;
+    private FileHandle zoneFile;
 
     private long totalPlaytime;
     private long lastTimestamp;
@@ -47,16 +46,13 @@ public class Saves{
 
     public void load(){
         saves.clear();
-        IntArray slots = Core.settings.getObject("save-slots", IntArray.class, IntArray::new);
+        zoneFile = saveDirectory.child("-1.msav");
 
-        for(int i = 0; i < slots.size; i++){
+        for(FileHandle file : saveDirectory.list()){
-            int index = slots.get(i);
+            if(!file.name().contains("backup") && SaveIO.isSaveValid(file)){
-            if(SaveIO.isSaveValid(index)){
+                SaveSlot slot = new SaveSlot(file);
-                SaveSlot slot = new SaveSlot(index);
                 saves.add(slot);
-                saveMap.put(slot.index, slot);
+                slot.meta = SaveIO.getMeta(file);
-                slot.meta = SaveIO.getMeta(index);
-                nextSlot = Math.max(index + 1, nextSlot);
             }
         }
     }
@@ -110,73 +106,63 @@ public class Saves{
     }
 
     public void zoneSave(){
-        SaveSlot slot = new SaveSlot(-1);
+        SaveSlot slot = new SaveSlot(zoneFile);
         slot.setName("zone");
-        saves.remove(s -> s.index == -1);
+        saves.remove(s -> s.file.equals(zoneFile));
         saves.add(slot);
-        saveMap.put(slot.index, slot);
         slot.save();
-        saveSlots();
     }
 
     public SaveSlot addSave(String name){
-        SaveSlot slot = new SaveSlot(nextSlot);
+        SaveSlot slot = new SaveSlot(getNextSlotFile());
-        nextSlot++;
         slot.setName(name);
         saves.add(slot);
-        saveMap.put(slot.index, slot);
         slot.save();
-        saveSlots();
         return slot;
     }
 
     public SaveSlot importSave(FileHandle file) throws IOException{
-        SaveSlot slot = new SaveSlot(nextSlot);
+        SaveSlot slot = new SaveSlot(getNextSlotFile());
         slot.importFile(file);
-        nextSlot++;
         slot.setName(file.nameWithoutExtension());
         saves.add(slot);
-        saveMap.put(slot.index, slot);
+        slot.meta = SaveIO.getMeta(slot.file);
-        slot.meta = SaveIO.getMeta(slot.index);
         current = slot;
-        saveSlots();
         return slot;
     }
 
     public SaveSlot getZoneSlot(){
-        SaveSlot slot = getByID(-1);
+        SaveSlot slot = getSaveSlots().find(s -> s.file.equals(zoneFile));
         return slot == null || slot.getZone() == null ? null : slot;
     }
 
-    public SaveSlot getByID(int id){
+    public FileHandle getNextSlotFile(){
-        return saveMap.get(id);
+        int i = 0;
+        FileHandle file;
+        while((file = saveDirectory.child(i + "." + saveExtension)).exists()){
+            i ++;
+        }
+        return file;
     }
 
     public Array<SaveSlot> getSaveSlots(){
         return saves;
     }
 
-    private void saveSlots(){
-        IntArray result = new IntArray(saves.size);
-        for(int i = 0; i < saves.size; i++) result.add(saves.get(i).index);
-
-        Core.settings.putObject("save-slots", result);
-        Core.settings.save();
-    }
-
     public class SaveSlot{
-        public final int index;
+        //public final int index;
+        public final FileHandle file;
         boolean requestedPreview;
         SaveMeta meta;
 
-        public SaveSlot(int index){
+        public SaveSlot(FileHandle file){
-            this.index = index;
+            this.file = file;
         }
 
         public void load() throws SaveException{
             try{
-                SaveIO.loadFromSlot(index);
+                SaveIO.load(file);
-                meta = SaveIO.getMeta(index);
+                meta = SaveIO.getMeta(file);
                 current = this;
                 totalPlaytime = meta.timePlayed;
                 savePreview();
@@ -190,8 +176,8 @@ public class Saves{
             long prev = totalPlaytime;
             totalPlaytime = time;
 
-            SaveIO.saveToSlot(index);
+            SaveIO.save(file);
-            meta = SaveIO.getMeta(index);
+            meta = SaveIO.getMeta(file);
             if(!state.is(State.menu)){
                 current = this;
             }
@@ -226,8 +212,12 @@ public class Saves{
             return null;
         }
 
+        private String index(){
+            return file.nameWithoutExtension();
+        }
+
         private FileHandle previewFile(){
-            return mapPreviewDirectory.child("save_slot_" + index + ".png");
+            return mapPreviewDirectory.child("save_slot_" + index() + ".png");
         }
 
         private FileHandle loadPreviewFile(){
@@ -266,11 +256,11 @@ public class Saves{
         }
 
         public String getName(){
-            return Core.settings.getString("save-" + index + "-name", "untitled");
+            return Core.settings.getString("save-" + index() + "-name", "untitled");
         }
 
         public void setName(String name){
-            Core.settings.put("save-" + index + "-name", name);
+            Core.settings.put("save-" + index() + "-name", name);
             Core.settings.save();
         }
 
@@ -295,34 +285,33 @@ public class Saves{
         }
 
         public boolean isAutosave(){
-            return Core.settings.getBool("save-" + index + "-autosave", true);
+            return Core.settings.getBool("save-" + index() + "-autosave", true);
         }
 
         public void setAutosave(boolean save){
-            Core.settings.put("save-" + index + "-autosave", save);
+            Core.settings.put("save-" + index() + "-autosave", save);
             Core.settings.save();
         }
 
-        public void importFile(FileHandle file) throws IOException{
+        public void importFile(FileHandle from) throws IOException{
             try{
-                file.copyTo(SaveIO.fileFor(index));
+                from.copyTo(file);
             }catch(Exception e){
                 throw new IOException(e);
             }
         }
 
-        public void exportFile(FileHandle file) throws IOException{
+        public void exportFile(FileHandle to) throws IOException{
             try{
-                SaveIO.fileFor(index).copyTo(file);
+                file.copyTo(to);
             }catch(Exception e){
                 throw new IOException(e);
             }
         }
 
         public void delete(){
-            SaveIO.fileFor(index).delete();
+            file.delete();
             saves.removeValue(this, true);
-            saveMap.remove(index);
             if(this == current){
                 current = null;
             }
@@ -330,8 +319,6 @@ public class Saves{
             if(Core.assets.isLoaded(loadPreviewFile().path())){
                 Core.assets.unload(loadPreviewFile().path());
             }
-
-            saveSlots();
         }
     }
 }

core/src/io/anuke/mindustry/game/Schematics.java

@@ -19,6 +19,7 @@ import io.anuke.mindustry.input.*;
 import io.anuke.mindustry.input.PlaceUtils.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.*;
 
 import java.io.*;
 import java.util.zip.*;
@@ -44,6 +45,12 @@ public class Schematics implements Loadable{
             previews.clear();
             shadowBuffer.dispose();
         });
+
+        Events.on(ContentReloadEvent.class, event -> {
+            previews.each((schem, m) -> m.dispose());
+            previews.clear();
+            load();
+        });
     }
 
     @Override
@@ -63,9 +70,9 @@ public class Schematics implements Loadable{
 
         all.sort();
 
-        Core.app.post(() -> {
+        if(shadowBuffer == null){
-            shadowBuffer = new FrameBuffer(maxSchematicSize + padding + 8, maxSchematicSize + padding + 8);
+            Core.app.post(() -> shadowBuffer = new FrameBuffer(maxSchematicSize + padding + 8, maxSchematicSize + padding + 8));
-        });
+        }
     }
 
     public void overwrite(Schematic target, Schematic newSchematic){
@@ -205,7 +212,7 @@ public class Schematics implements Loadable{
 
     /** Creates an array of build requests from a schematic's data, centered on the provided x+y coordinates. */
     public Array<BuildRequest> toRequests(Schematic schem, int x, int y){
-        return schem.tiles.map(t -> new BuildRequest(t.x + x - schem.width/2, t.y + y - schem.height/2, t.rotation, t.block).original(t.x, t.y, schem.width, schem.height).configure(t.config)).removeAll(s -> !s.block.isVisible());
+        return schem.tiles.map(t -> new BuildRequest(t.x + x - schem.width/2, t.y + y - schem.height/2, t.rotation, t.block).original(t.x, t.y, schem.width, schem.height).configure(t.config)).removeAll(s -> !s.block.isVisible() || !s.block.unlocked());
     }
 
     /** Adds a schematic to the list, also copying it into the files.*/
@@ -251,7 +258,7 @@ public class Schematics implements Loadable{
             for(int cy = y; cy <= y2; cy++){
                 Tile linked = world.ltile(cx, cy);
 
-                if(linked != null && linked.entity != null && linked.entity.block.isVisible()){
+                if(linked != null && linked.entity != null && linked.entity.block.isVisible() && !(linked.block() instanceof BuildBlock)){
                     int top = linked.block().size/2;
                     int bot = linked.block().size % 2 == 1 ? -linked.block().size/2 : -(linked.block().size - 1)/2;
                     minx = Math.min(linked.x + bot, minx);
@@ -279,7 +286,7 @@ public class Schematics implements Loadable{
             for(int cy = oy; cy <= oy2; cy++){
                 Tile tile = world.ltile(cx, cy);
 
-                if(tile != null && tile.entity != null && !counted.contains(tile.pos())){
+                if(tile != null && tile.entity != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock) && tile.entity.block.isVisible()){
                     int config = tile.entity.config();
                     if(tile.block().posConfig){
                         config = Pos.get(Pos.x(config) + offsetX, Pos.y(config) + offsetY);

core/src/io/anuke/mindustry/graphics/Pal.java

@@ -75,6 +75,8 @@ public class Pal{
 
     surge = Color.valueOf("f3e979"),
 
+    plastanium = Color.valueOf("a1b46e"),
+
     redSpark = Color.valueOf("fbb97f"),
     orangeSpark = Color.valueOf("d2b29c"),
 

core/src/io/anuke/mindustry/input/DesktopInput.java

@@ -182,7 +182,7 @@ public class DesktopInput extends InputHandler{
             mode = none;
         }
 
-        if(mode != none){
+        if(mode == placing || isPlacing()){
             selectRequests.clear();
             lastSchematic = null;
         }
@@ -379,7 +379,7 @@ public class DesktopInput extends InputHandler{
                 deleting = true;
             }else if(selected != null){
                 //only begin shooting if there's no cursor event
-                if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && player.buildQueue().size == 0 && !droppingItem &&
+                if(!tileTapped(selected) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && (player.buildQueue().size == 0 || !player.isBuilding) && !droppingItem &&
                 !tryBeginMine(selected) && player.getMineTile() == null && !ui.chatfrag.chatOpen()){
                     player.isShooting = true;
                 }

core/src/io/anuke/mindustry/input/MobileInput.java

@@ -153,8 +153,10 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     void removeRequest(BuildRequest request){
         selectRequests.removeValue(request, true);
+        if(!request.breaking){
             removals.add(request);
         }
+    }
 
     boolean isLinePlacing(){
         return mode == placing && lineMode && Mathf.dst(lineStartX * tilesize, lineStartY * tilesize, Core.input.mouseWorld().x, Core.input.mouseWorld().y) >= 3 * tilesize;

core/src/io/anuke/mindustry/io/SaveIO.java

@@ -34,37 +34,23 @@ public class SaveIO{
         return versions.get(version);
     }
 
-    public static void saveToSlot(int slot){
+    public static void save(FileHandle file){
-        FileHandle file = fileFor(slot);
         boolean exists = file.exists();
         if(exists) file.moveTo(backupFileFor(file));
         try{
-            write(fileFor(slot));
+            write(file);
         }catch(Exception e){
             if(exists) backupFileFor(file).moveTo(file);
             throw new RuntimeException(e);
         }
     }
 
-    public static void loadFromSlot(int slot) throws SaveException{
+    public static DataInputStream getStream(FileHandle file){
-        load(fileFor(slot));
+        return new DataInputStream(new InflaterInputStream(file.read(bufferSize)));
     }
 
-    public static DataInputStream getSlotStream(int slot){
+    public static DataInputStream getBackupStream(FileHandle file){
-        return new DataInputStream(new InflaterInputStream(fileFor(slot).read(bufferSize)));
+        return new DataInputStream(new InflaterInputStream(backupFileFor(file).read(bufferSize)));
-    }
-
-    public static DataInputStream getBackupSlotStream(int slot){
-        return new DataInputStream(new InflaterInputStream(backupFileFor(fileFor(slot)).read(bufferSize)));
-    }
-
-    public static boolean isSaveValid(int slot){
-        try{
-            getMeta(slot);
-            return true;
-        }catch(Exception e){
-            return false;
-        }
     }
 
     public static boolean isSaveValid(FileHandle file){
@@ -85,11 +71,11 @@ public class SaveIO{
         }
     }
 
-    public static SaveMeta getMeta(int slot){
+    public static SaveMeta getMeta(FileHandle file){
         try{
-            return getMeta(getSlotStream(slot));
+            return getMeta(getStream(file));
         }catch(Exception e){
-            return getMeta(getBackupSlotStream(slot));
+            return getMeta(getBackupStream(file));
         }
     }
 
@@ -167,6 +153,7 @@ public class SaveIO{
         }catch(Exception e){
             throw new SaveException(e);
         }finally{
+            world.setGenerating(false);
             content.setTemporaryMapper(null);
         }
     }

core/src/io/anuke/mindustry/io/SaveVersion.java

@@ -3,6 +3,7 @@ package io.anuke.mindustry.io;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.io.*;
+import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.ctype.*;
 import io.anuke.mindustry.entities.*;
@@ -166,6 +167,7 @@ public abstract class SaveVersion extends SaveFileReader{
                 short floorid = stream.readShort();
                 short oreid = stream.readShort();
                 int consecutives = stream.readUnsignedByte();
+                if(content.block(floorid) == Blocks.air) floorid = Blocks.stone.id;
 
                 context.create(x, y, floorid, oreid, (short)0);
 
@@ -182,6 +184,7 @@ public abstract class SaveVersion extends SaveFileReader{
                 int x = i % width, y = i / width;
                 Block block = content.block(stream.readShort());
                 Tile tile = context.tile(x, y);
+                if(block == null) block = Blocks.air;
                 tile.setBlock(block);
 
                 if(tile.entity != null){

core/src/io/anuke/mindustry/maps/Map.java

@@ -181,12 +181,14 @@ public class Map implements Comparable<Map>, Publishable{
 
     @Override
     public FileHandle createSteamFolder(String id){
-        return null;
+        FileHandle mapFile = tmpDirectory.child("map_" + id).child("map.msav");
+        file.copyTo(mapFile);
+        return mapFile.parent();
     }
 
     @Override
     public FileHandle createSteamPreview(String id){
-        return null;
+        return previewFile();
     }
 
     @Override

core/src/io/anuke/mindustry/mod/Mods.java

@@ -164,7 +164,7 @@ public class Mods implements Loadable{
         return requiresReload;
     }
 
-    /** Loads all mods from the folder, but does call any methods on them.*/
+    /** Loads all mods from the folder, but does not call any methods on them.*/
     public void load(){
         for(FileHandle file : modDirectory.list()){
             if(!file.extension().equals("jar") && !file.extension().equals("zip") && !(file.isDirectory() && file.child("mod.json").exists())) continue;
@@ -200,14 +200,61 @@ public class Mods implements Loadable{
             }
         }
 
+        resolveDependencies();
         //sort mods to make sure servers handle them properly.
         loaded.sort(Structs.comparing(m -> m.name));
 
         buildFiles();
     }
 
-    private void buildFiles(){
+    private void resolveDependencies(){
+        for(LoadedMod mod : Array.<LoadedMod>withArrays(loaded, disabled)){
+            updateDependencies(mod);
+        }
+
+        disabled.addAll(loaded.select(LoadedMod::hasUnmetDependencies));
+        loaded.removeAll(LoadedMod::hasUnmetDependencies);
+        disabled.each(mod -> setEnabled(mod, false));
+        disabled.distinct();
+        loaded.distinct();
+    }
+
+    private void updateDependencies(LoadedMod mod){
+        mod.dependencies.clear();
+        mod.missingDependencies.clear();
+        mod.dependencies = mod.meta.dependencies.map(this::locateMod);
+
+        for(int i = 0; i < mod.dependencies.size; i++){
+            if(mod.dependencies.get(i) == null){
+                mod.missingDependencies.add(mod.meta.dependencies.get(i));
+            }
+        }
+    }
+
+    private void topoSort(LoadedMod mod, Array<LoadedMod> stack, ObjectSet<LoadedMod> visited){
+        visited.add(mod);
+        mod.dependencies.each(m -> !visited.contains(m), m -> topoSort(m, stack, visited));
+        stack.add(mod);
+    }
+
+    /** @return mods ordered in the correct way needed for dependencies. */
+    private Array<LoadedMod> orderedMods(){
+        ObjectSet<LoadedMod> visited = new ObjectSet<>();
+        Array<LoadedMod> result = new Array<>();
         for(LoadedMod mod : loaded){
+            if(!visited.contains(mod)){
+                topoSort(mod, result, visited);
+            }
+        }
+        return result;
+    }
+
+    private LoadedMod locateMod(String name){
+        return loaded.find(mod -> mod.name.equals(name));
+    }
+
+    private void buildFiles(){
+        for(LoadedMod mod : orderedMods()){
             boolean zipFolder = !mod.file.isDirectory() && mod.root.parent() != null;
             String parentName = zipFolder ? mod.root.name() : null;
             for(FileHandle file : mod.root.list()){
@@ -256,10 +303,7 @@ public class Mods implements Loadable{
         loaded.clear();
         disabled.clear();
         load();
-        buildFiles();
-        Musics.dispose();
         Sounds.dispose();
-        Musics.load();
         Sounds.load();
         Core.assets.finishLoading();
         content.clear();
@@ -277,7 +321,7 @@ public class Mods implements Loadable{
 
     /** Creates all the content found in mod files. */
     public void loadContent(){
-        for(LoadedMod mod : loaded){
+        for(LoadedMod mod : orderedMods()){
             safeRun(mod, () -> {
                 if(mod.root.child("content").exists()){
                     FileHandle contentRoot = mod.root.child("content");
@@ -337,11 +381,13 @@ public class Mods implements Loadable{
             requiresReload = true;
             if(!enabled){
                 loaded.remove(mod);
-                disabled.add(mod);
+                if(!disabled.contains(mod)) disabled.add(mod);
             }else{
-                loaded.add(mod);
+                if(!loaded.contains(mod)) loaded.add(mod);
                 disabled.remove(mod);
             }
+            loaded.each(this::updateDependencies);
+            disabled.each(this::updateDependencies);
         }
     }
 
@@ -466,6 +512,10 @@ public class Mods implements Loadable{
         public final String name;
         /** This mod's metadata. */
         public final ModMeta meta;
+        /** This mod's dependencies as already-loaded mods. */
+        public Array<LoadedMod> dependencies = new Array<>();
+        /** All missing dependencies of this mod as strings. */
+        public Array<String> missingDependencies = new Array<>();
 
         public LoadedMod(FileHandle file, FileHandle root, Mod mod, ModMeta meta){
             this.root = root;
@@ -479,6 +529,10 @@ public class Mods implements Loadable{
             return Core.settings.getBool("mod-" + name + "-enabled", true);
         }
 
+        public boolean hasUnmetDependencies(){
+            return !missingDependencies.isEmpty();
+        }
+
         @Override
         public String getSteamID(){
             return Core.settings.getString(name + "-steamid", null);
@@ -549,7 +603,7 @@ public class Mods implements Loadable{
     /** Plugin metadata information.*/
     public static class ModMeta{
         public String name, author, description, version, main;
-        public String[] dependencies = {}; //TODO implement
+        public Array<String> dependencies = Array.with();
         /** Hidden mods are only server-side or client-side, and do not support adding new content. */
         public boolean hidden;
     }

core/src/io/anuke/mindustry/net/NetworkIO.java

@@ -28,6 +28,7 @@ public class NetworkIO{
             stream.writeInt(player.id);
             player.write(stream);
 
+            SaveIO.getSaveWriter().writeContentHeader(stream);
             SaveIO.getSaveWriter().writeMap(stream);
         }catch(IOException e){
             throw new RuntimeException(e);
@@ -51,9 +52,12 @@ public class NetworkIO{
             player.resetID(id);
             player.add();
 
+            SaveIO.getSaveWriter().readContentHeader(stream);
             SaveIO.getSaveWriter().readMap(stream, world.context);
         }catch(IOException e){
             throw new RuntimeException(e);
+        }finally{
+            content.setTemporaryMapper(null);
         }
     }
 

core/src/io/anuke/mindustry/ui/Styles.java

@@ -27,7 +27,7 @@ public class Styles{
     public static ButtonStyle defaultb, waveb;
     public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet;
     public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
-    public static ScrollPaneStyle defaultPane, horizontalPane;
+    public static ScrollPaneStyle defaultPane, horizontalPane, smallPane;
     public static KeybindDialogStyle defaultKeybindDialog;
     public static SliderStyle defaultSlider, vSlider;
     public static LabelStyle defaultLabel, outlineLabel;
@@ -225,6 +225,10 @@ public class Styles{
             hScroll = scrollHorizontal;
             hScrollKnob = scrollKnobHorizontalBlack;
         }};
+        smallPane = new ScrollPaneStyle(){{
+            vScroll = clear;
+            vScrollKnob = scrollKnobVerticalThin;
+        }};
 
         defaultKeybindDialog = new KeybindDialogStyle(){{
             keyColor = Pal.accent;

core/src/io/anuke/mindustry/ui/dialogs/ModsDialog.java

@@ -29,8 +29,9 @@ public class ModsDialog extends FloatingDialog{
 
         buttons.addImageTextButton("$mods.guide", Icon.wiki,
         () -> Core.net.openURI(modGuideURL))
-        .size(210f, 64f);
+        .size(android ? 210f + 250f + 10f : 210, 64f).colspan(android ? 2 : 1);
 
+        if(!android){
             buttons.addImageTextButton("$mod.import.github", Icon.github, () -> {
                 ui.showTextInput("$mod.import.github", "", 64, "Anuken/ExampleMod", text -> {
                     ui.loadfrag.show();
@@ -62,12 +63,18 @@ public class ModsDialog extends FloatingDialog{
                     }, t -> Core.app.post(() -> ui.showException(t)));
                 });
             }).size(250f, 64f);
+        }
 
         shown(this::setup);
 
         hidden(() -> {
             if(mods.requiresReload()){
                 ui.loadAnd("$reloading", () -> {
+                    mods.all().each(mod -> {
+                        if(mod.hasUnmetDependencies()){
+                            ui.showErrorMessage(Core.bundle.format("mod.nowdisabled", mod.name, mod.missingDependencies.toString(", ")));
+                        }
+                    });
                     mods.reloadContent();
                 });
             }
@@ -96,6 +103,7 @@ public class ModsDialog extends FloatingDialog{
                         anyDisabled = true;
                         table.row();
                         table.addImage().growX().height(4f).pad(6f).color(Pal.gray);
+                        table.row();
                     }
 
                     table.table(Styles.black6, t -> {
@@ -138,7 +146,10 @@ public class ModsDialog extends FloatingDialog{
                             t.labelWrap("[lightgray]" + mod.meta.description).growX();
                             t.row();
                         }
-
+                        if(mod.hasUnmetDependencies()){
+                            t.labelWrap(Core.bundle.format("mod.missingdependencies", mod.missingDependencies.toString(", "))).growX();
+                            t.row();
+                        }
                     }).width(500f);
                     table.row();
                 }

core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java

@@ -107,6 +107,7 @@ public class MenuFragment extends Fragment{
             container.add(join);
             container.add(custom);
             container.add(maps);
+            container.row();
 
             container.table(table -> {
                 table.defaults().set(container.defaults());

core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java

@@ -232,7 +232,7 @@ public class PlacementFragment extends Fragment{
                 frame.row();
                 frame.table(Tex.pane2, blocksSelect -> {
                     blocksSelect.margin(4).marginTop(0);
-                    blocksSelect.table(blocks -> blockTable = blocks).grow();
+                    blocksSelect.pane(blocks -> blockTable = blocks).height(194f).grow().get().setStyle(Styles.smallPane);
                     blocksSelect.row();
                     blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX();
                 }).fillY().bottom().touchable(Touchable.enabled);

core/src/io/anuke/mindustry/world/Block.java

@@ -55,6 +55,8 @@ public class Block extends BlockStorage{
     public boolean breakable;
     /** whether this floor can be placed on. */
     public boolean placeableOn = true;
+    /** whether this block has insulating properties. */
+    public boolean insulated = false;
     /** tile entity health */
     public int health = -1;
     /** base block explosiveness */
@@ -241,7 +243,7 @@ public class Block extends BlockStorage{
     }
 
     public void drawCracks(Tile tile){
-        if(!tile.entity.damaged()) return;
+        if(!tile.entity.damaged() || size > maxCrackSize) return;
         int id = tile.pos();
         TextureRegion region = cracks[size - 1][Mathf.clamp((int)((1f - tile.entity.healthf()) * crackRegions), 0, crackRegions-1)];
         Draw.colorl(0.2f, 0.1f + (1f - tile.entity.healthf())* 0.6f);
@@ -313,7 +315,7 @@ public class Block extends BlockStorage{
             tempTiles.clear();
             Geometry.circle(tile.x, tile.y, range, (x, y) -> {
                 Tile other = world.ltile(x, y);
-                if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, tile) && !other.entity.proximity().contains(tile) &&
+                if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, tile) && !PowerNode.insulated(other, tile) && !other.entity.proximity().contains(tile) &&
                 !(outputsPower && tile.entity.proximity().contains(p -> p.entity != null && p.entity.power != null && p.entity.power.graph == other.entity.power.graph))){
                     tempTiles.add(other);
                 }
@@ -322,7 +324,7 @@ public class Block extends BlockStorage{
             if(!tempTiles.isEmpty()){
                 Tile toLink = tempTiles.first();
                 if(!toLink.entity.power.links.contains(tile.pos())){
-                    toLink.configure(tile.pos());
+                    toLink.configureAny(tile.pos());
                 }
             }
         }

core/src/io/anuke/mindustry/world/Tile.java

@@ -4,6 +4,7 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
@@ -93,6 +94,10 @@ public class Tile implements Position, TargetTrait{
         Call.onTileConfig(player, this, value);
     }
 
+    public void configureAny(int value){
+        Call.onTileConfig(null, this, value);
+    }
+
     @SuppressWarnings("unchecked")
     public <T extends TileEntity> T entity(){
         return (T)entity;
@@ -148,7 +153,7 @@ public class Tile implements Position, TargetTrait{
         return team;
     }
 
-    public void setBlock(Block type, Team team, int rotation){
+    public void setBlock(@NonNull Block type, Team team, int rotation){
         preChanged();
         this.block = type;
         this.team = (byte)team.ordinal();
@@ -156,11 +161,12 @@ public class Tile implements Position, TargetTrait{
         changed();
     }
 
-    public void setBlock(Block type, Team team){
+    public void setBlock(@NonNull Block type, Team team){
         setBlock(type, team, 0);
     }
 
-    public void setBlock(Block type){
+    public void setBlock(@NonNull Block type){
+        if(type == null) throw new IllegalArgumentException("Block cannot be null.");
         preChanged();
         this.block = type;
         this.rotation = 0;
@@ -168,13 +174,13 @@ public class Tile implements Position, TargetTrait{
     }
 
     /**This resets the overlay!*/
-    public void setFloor(Floor type){
+    public void setFloor(@NonNull Floor type){
         this.floor = type;
         this.overlay = (Floor)Blocks.air;
     }
 
     /** Sets the floor, preserving overlay.*/
-    public void setFloorUnder(Floor floor){
+    public void setFloorUnder(@NonNull Floor floor){
         Block overlay = this.overlay;
         setFloor(floor);
         setOverlay(overlay);

core/src/io/anuke/mindustry/world/blocks/defense/Wall.java

@@ -51,5 +51,4 @@ public class Wall extends Block{
     public boolean canReplace(Block other){
         return super.canReplace(other) && health > other.health;
     }
-
 }

core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java

@@ -17,7 +17,7 @@ public class ArmoredConveyor extends Conveyor{
 
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return otherblock.outputsItems() && (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
+        return otherblock.outputsItems() && otherblock instanceof Conveyor && (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
         || ((!otherblock.rotate && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
             Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == tile.rotation()) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }

core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java

@@ -413,12 +413,12 @@ public class Conveyor extends Block implements Autotiler{
         static long toLong(int value){
             byte[] values = Pack.bytes(value, writeByte);
 
-            byte itemid = values[0];
+            short itemid = content.item(values[0]).id;
             float x = values[1] / 127f;
             float y = ((int)values[2] + 128) / 255f;
 
             short[] shorts = writeShort;
-            shorts[0] = (short)itemid;
+            shorts[0] = itemid;
             shorts[1] = (short)(x * Short.MAX_VALUE);
             shorts[2] = (short)((y - 1f) * Short.MAX_VALUE);
             return Pack.longShorts(shorts);

core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java

@@ -108,14 +108,16 @@ public class PowerNode extends PowerBlock{
         Geometry.circle(tile.x, tile.y, (int)(laserRange + 1), (x, y) -> {
             Tile other = world.ltile(x, y);
             if(valid.test(other)){
+                if(!insulated(tile, other)) {
                     tempTiles.add(other);
                 }
+            }
         });
 
         tempTiles.sort(Structs.comparingFloat(t -> t.dst2(tile)));
         tempTiles.each(valid, other -> {
             if(!tile.entity.power.links.contains(other.pos())){
-                tile.configure(other.pos());
+                tile.configureAny(other.pos());
             }
         });
 
@@ -167,6 +169,18 @@ public class PowerNode extends PowerBlock{
             tile.configure(other.pos());
             return false;
         }
+
+        if(tile == other){
+            if (other.entity.power.links.size == 0){
+                getPotentialLinks(tile, link -> tile.configure(link.pos()));
+            } else {
+                while (entity.power.links.size > 0){
+                    tile.configure(entity.power.links.get(0));
+                }
+            }
+            return false;
+        }
+
         return true;
     }
 
@@ -221,7 +235,13 @@ public class PowerNode extends PowerBlock{
         Draw.color(Pal.placing);
         Drawf.circles(x * tilesize + offset(), y * tilesize + offset(), laserRange * tilesize);
 
-        getPotentialLinks(tile, other -> Drawf.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f + 2f, Pal.place));
+        getPotentialLinks(tile, other -> {
+            Drawf.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f + 2f, Pal.place);
+
+            insulators(tile.x, tile.y, other.x, other.y, cause -> {
+                Drawf.square(cause.drawx(), cause.drawy(), cause.block().size * tilesize / 2f + 2f, Pal.plastanium);
+            });
+        });
 
         Draw.reset();
     }
@@ -299,4 +319,27 @@ public class PowerNode extends PowerBlock{
         Draw.color();
     }
 
+    public static boolean insulated(Tile tile, Tile other){
+        return insulated(tile.x, tile.y, other.x, other.y);
+    }
+
+    public static boolean insulated(int x, int y, int x2, int y2){
+        final Boolean[] bool = {false};
+        insulators(x, y, x2, y2, cause -> {
+            bool[0] = true;
+        });
+        return bool[0];
+    }
+
+    public static void insulators(int x, int y, int x2, int y2, Consumer<Tile> iterator){
+        world.raycastEach(x, y, x2, y2, (wx, wy) -> {
+
+            Tile tile = world.ltile(wx, wy);
+            if(tile != null && tile.block() != null && tile.block().insulated){
+                iterator.accept(tile);
+            }
+
+            return false;
+        });
+    }
 }

core/src/io/anuke/mindustry/world/blocks/production/Drill.java

@@ -194,7 +194,9 @@ public class Drill extends Block{
         });
 
         stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond);
-        stats.add(BlockStat.boostEffect, liquidBoostIntensity, StatUnit.timesSpeed);
+        if(liquidBoostIntensity > 0){
+            stats.add(BlockStat.boostEffect, liquidBoostIntensity * liquidBoostIntensity, StatUnit.timesSpeed);
+        }
     }
 
     void countOre(Tile tile){

core/src/io/anuke/mindustry/world/blocks/units/MechPad.java

@@ -114,7 +114,7 @@ public class MechPad extends Block{
         MechFactoryEntity entity = tile.entity();
 
         if(entity.player != null){
-            RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? Mechs.starter : mech));
+            RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? mech : Mechs.starter));
         }
     }
 

desktop/src/io/anuke/mindustry/desktop/steam/SNet.java

@@ -9,6 +9,7 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.*;
+import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
@@ -245,6 +246,13 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             return;
         }
 
+        if(net.active()){
+            net.disconnect();
+            net.closeServer();
+            logic.reset();
+            state.set(State.menu);
+        }
+
         currentLobby = steamIDLobby;
         currentServer = smat.getLobbyOwner(steamIDLobby);
 

desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java

@@ -162,6 +162,10 @@ public class SWorkshop implements SteamUGCCallback{
                 ugc.setItemVisibility(h, PublishedFileVisibility.Private);
             }
             ugc.submitItemUpdate(h, changelog == null ? "<Created>" : changelog);
+
+            if(p instanceof Map){
+                SAchievement.publishMap.complete();
+            }
         }, () -> p.addSteamID(sid));
     }
 

server/src/io/anuke/mindustry/server/ServerControl.java

@@ -670,28 +670,25 @@ public class ServerControl implements ApplicationListener{
             if(state.is(State.playing)){
                 err("Already hosting. Type 'stop' to stop hosting first.");
                 return;
-            }else if(!Strings.canParseInt(arg[0])){
-                err("Invalid save slot '{0}'.", arg[0]);
-                return;
             }
 
-            int slot = Strings.parseInt(arg[0]);
+            FileHandle file = saveDirectory.child(arg[0] + "." + saveExtension);
 
-            if(!SaveIO.isSaveValid(slot)){
+            if(!SaveIO.isSaveValid(file)){
                 err("No (valid) save data found for slot.");
                 return;
             }
 
             Core.app.post(() -> {
                 try{
-                    SaveIO.loadFromSlot(slot);
+                    SaveIO.load(file);
                     state.rules.zone = null;
-                }catch(Throwable t){
-                    err("Failed to load save. Outdated or corrupt file.");
-                }
                     info("Save loaded.");
                     host();
                     state.set(State.playing);
+                }catch(Throwable t){
+                    err("Failed to load save. Outdated or corrupt file.");
+                }
             });
         });
 
@@ -699,18 +696,25 @@ public class ServerControl implements ApplicationListener{
             if(!state.is(State.playing)){
                 err("Not hosting. Host a game first.");
                 return;
-            }else if(!Strings.canParseInt(arg[0])){
-                err("Invalid save slot '{0}'.", arg[0]);
-                return;
             }
 
+            FileHandle file = saveDirectory.child(arg[0] + "." + saveExtension);
+
             Core.app.post(() -> {
-                int slot = Strings.parseInt(arg[0]);
+                SaveIO.save(file);
-                SaveIO.saveToSlot(slot);
+                info("Saved to {0}.", file);
-                info("Saved to slot {0}.", slot);
             });
         });
 
+        handler.register("saves", "List all saves in the save directory.", arg -> {
+            info("Save files: ");
+            for(FileHandle file : saveDirectory.list()){
+                if(file.extension().equals(saveExtension)){
+                    info("| &ly{0}", file.nameWithoutExtension());
+                }
+            }
+        });
+
         handler.register("gameover", "Force a game over.", arg -> {
             if(state.is(State.menu)){
                 info("Not playing a map.");

tests/src/test/java/ApplicationTests.java

@@ -198,7 +198,7 @@ public class ApplicationTests{
     void save(){
         world.loadMap(testMap);
         assertTrue(state.teams.get(defaultTeam).cores.size > 0);
-        SaveIO.saveToSlot(0);
+        SaveIO.save(saveDirectory.child("0.msav"));
     }
 
     @Test
@@ -206,9 +206,9 @@ public class ApplicationTests{
         world.loadMap(testMap);
         Map map = world.getMap();
 
-        SaveIO.saveToSlot(0);
+        SaveIO.save(saveDirectory.child("0.msav"));
         resetWorld();
-        SaveIO.loadFromSlot(0);
+        SaveIO.load(saveDirectory.child("0.msav"));
 
         assertEquals(world.width(), map.width);
         assertEquals(world.height(), map.height);