Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/TechTree.java

@@ -31,6 +31,7 @@ public class TechTree implements ContentList{
                     node(router, () -> {
                         node(launchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
                             node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
+                                
                             });
                         });
 
@@ -200,6 +201,7 @@ public class TechTree implements ContentList{
                     });
 
                     node(illuminator, () -> {
+                        
                     });
                 });
 
@@ -422,6 +424,7 @@ public class TechTree implements ContentList{
                     node(multiplicativeReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
                         node(exponentialReconstructor, () -> {
                             node(tetrativeReconstructor, () -> {
+                                
                             });
                         });
                     });

server/src/mindustry/server/ServerControl.java

@@ -691,7 +691,7 @@ public class ServerControl implements ApplicationListener{
 
             for(Player player : Groups.player){
                 if(netServer.admins.isIDBanned(player.uuid())){
-                    Call.sendMessage("[scarlet] " + player.name + " has been banned.");
+                    Call.sendMessage("[scarlet]" + player.name + " has been banned.");
                     player.con.kick(KickReason.banned);
                 }
             }
@@ -728,7 +728,7 @@ public class ServerControl implements ApplicationListener{
 
         handler.register("unban", "<ip/ID>", "Completely unban a person by IP or ID.", arg -> {
             if(netServer.admins.unbanPlayerIP(arg[0]) || netServer.admins.unbanPlayerID(arg[0])){
-                info("Unbanned player.", arg[0]);
+                info("Unbanned player: @", arg[0]);
             }else{
                 err("That IP/ID is not banned!");
             }