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

 Conflicts:

	core/src/mindustry/core/NetServer.java

core/src/mindustry/entities/comp/PlayerComp.java

@@ -313,6 +313,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return  "[#" + color.toString().toUpperCase() + "]" + name;
     }
 
+    String plainName(){
+        return Strings.stripColors(name);
+    }
+
     void sendMessage(String text){
         if(isLocal()){
             if(ui != null){