Merge remote-tracking branch 'origin/master'

core/src/mindustry/ui/Fonts.java

@@ -156,10 +156,29 @@ public class Fonts{
         });
 
         for(Team team : Team.baseTeams){
-            if(Core.atlas.has("team-" + team.name)){
+            team.emoji = stringIcons.get(team.name, "");
-                team.emoji = stringIcons.get(team.name, "");
+        }
+    }
+    
+    public static void loadContentIconsHeadless(){
+        try(Scanner scan = new Scanner(Core.files.internal("icons/icons.properties").read(512))){
+            while(scan.hasNextLine()){
+                String line = scan.nextLine();
+                String[] split = line.split("=");
+                String[] nametex = split[1].split("\\|");
+                String character = split[0];
+                int ch = Integer.parseInt(character);
+
+                unicodeIcons.put(nametex[0], ch);
+                stringIcons.put(nametex[0], ((char)ch) + "");
             }
         }
+
+        stringIcons.put("alphachan", stringIcons.get("alphaaaa"));
+
+        for(Team team : Team.baseTeams){
+            team.emoji = stringIcons.get(team.name, "");
+        }
     }
 
     /** Called from a static context for use in the loading screen.*/

server/build.gradle

@@ -39,11 +39,13 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
     exclude("music/**")
     exclude("sounds/**")
     exclude("fonts/**")
-    exclude("icons/**")
     exclude("bundles/**")
     exclude("cubemaps/**")
     exclude("cursors/**")
     exclude("shaders/**")
+    exclude("icons/icon.icns")
+    exclude("icons/icon.ico")
+    exclude("icons/icon_64.png")
 
     manifest{
         attributes 'Main-Class': project.mainClassName

server/src/mindustry/server/ServerLauncher.java

@@ -11,6 +11,7 @@ import mindustry.mod.*;
 import mindustry.mod.Mods.*;
 import mindustry.net.Net;
 import mindustry.net.*;
+import mindustry.ui.*;
 
 import java.time.*;
 
@@ -45,11 +46,15 @@ public class ServerLauncher implements ApplicationListener{
 
         Vars.loadSettings();
         Vars.init();
+        
         UI.loadColors();
+        Fonts.loadContentIconsHeadless();
+        
         content.createBaseContent();
         mods.loadScripts();
         content.createModContent();
         content.init();
+        
         if(mods.hasContentErrors()){
             err("Error occurred loading mod content:");
             for(LoadedMod mod : mods.list()){

servers_v7.json

@@ -175,7 +175,7 @@
   {
     "name": "Realm of Serene Lime",
     "address": ["43.248.185.167:8517","n2.akiracloud.net:10686"]
-  }
+  },
   {
     "name": "CreateDustry",
     "address": ["116.202.83.83:25689"]