Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java

core/src/mindustry/editor/MapInfoDialog.java

@@ -32,7 +32,7 @@ public class MapInfoDialog extends FloatingDialog{
         ObjectMap<String, String> tags = editor.getTags();
         
         cont.pane(t -> {
-            t.add("$editor.name").padRight(8).left();
+            t.add("$editor.mapname").padRight(8).left();
             t.defaults().padTop(15);
 
             TextField name = t.addField(tags.get("name", ""), text -> {