Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/src/mindustry/content/Planets.java

	tools/src/mindustry/tools/Generators.java

core/src/mindustry/game/Saves.java

@@ -155,6 +155,7 @@ public class Saves{
         SaveSlot slot = new SaveSlot(getNextSlotFile());
         slot.importFile(file);
         slot.setName(file.nameWithoutExtension());
+
         saves.add(slot);
         slot.meta = SaveIO.getMeta(slot.file);
         current = slot;
@@ -330,6 +331,10 @@ public class Saves{
         public void importFile(Fi from) throws IOException{
             try{
                 from.copyTo(file);
+                if(previewFile().exists()){
+                    requestedPreview = false;
+                    previewFile().delete();
+                }
             }catch(Exception e){
                 throw new IOException(e);
             }

core/src/mindustry/game/Waves.java

@@ -285,7 +285,7 @@ public class Waves{
         if(naval){
             species = Structs.filter(UnitType[].class, species, v -> v[0].flying || v[0].naval);
         }else{
-            species = Structs.filter(UnitType[].class, species, v -> v[0].flying && !v[0].naval);
+            species = Structs.filter(UnitType[].class, species, v -> !v[0].naval);
         }
 
         UnitType[][] fspec = species;