Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_zh_TW.properties

@@ -45,6 +45,8 @@ mod.featured.dialog.title = 模組瀏覽器 (尚未完成)
 mods.browser.selected = 已選模組
 mods.browser.add = 安裝
 mods.github.open = 查看
+mods.browser.sortdate = 以最近篩選
+mods.browser.sortstars = 以星數篩選
 
 schematic = 藍圖
 schematic.add = 儲存藍圖……
@@ -693,6 +695,7 @@ stat.lightningchance = 燃燒機率
 stat.lightningdamage = 燃燒傷害
 stat.flammability = 易燃性
 stat.radioactivity = 輻射性
+stat.charge = 蓄電力
 stat.heatcapacity = 熱容量
 stat.viscosity = 黏度
 stat.temperature = 溫度

core/src/mindustry/game/EventType.java

@@ -68,6 +68,8 @@ public class EventType{
     public static class ContentInitEvent{}
     /** Called when the client game is first loaded. */
     public static class ClientLoadEvent{}
+    /** Called *after* all the modded files have been added into Vars.tree */
+    public static class FileTreeInitEvent{}
     /** Called when a game begins and the world is loaded. */
     public static class WorldLoadEvent{}
 

core/src/mindustry/mod/Mods.java

@@ -347,6 +347,7 @@ public class Mods implements Loadable{
                 }
             }
         }
+        Events.fire(new FileTreeInitEvent());
 
         //add new keys to each bundle
         I18NBundle bundle = Core.bundle;

servers_v6.json

@@ -13,7 +13,7 @@
   },
   {
     "name": "C.A.M.S.",
-    "address": ["routerchain.ddns.net", "pandorum.su:8000"]
+    "address": ["routerchain.ddns.net", "pandorum.su:8000", "nikochio.ddns.net"]
   },
   {
     "name": "BE6.RUN",
@@ -63,10 +63,6 @@
     "name": "Korea",
     "address": ["mindustry.kr"]
   },
-  {
-    "name": "NikoCHIO",
-    "address": ["nikochio.ddns.net"]
-  },
   {
     "name": "HexPvP",
     "address": ["hexpvp.ddns.net"]