Merge remote-tracking branch 'origin/master'

SERVERLIST.md

@@ -8,7 +8,7 @@ You may want to add your server to this list. The steps for getting this done ar
 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
 You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. 
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
-2. **Set an approppriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Approppriate" means that:
+2. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
   - Your name or description must reflect the type of server you're hosting. 
   Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
   - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.

core/assets/bundles/bundle_zh_CN.properties

@@ -105,6 +105,7 @@ mods.none = [LIGHT_GRAY]没有找到模组！
 mods.guide = 模组教程
 mods.report = 报告 Bug
 mods.openfolder = 打开模组文件夹
+mod.display = [gray]模组：[orange] {0}
 mod.enabled = [lightgray]已启用
 mod.disabled = [scarlet]已禁用
 mod.disable = 禁用
@@ -171,6 +172,11 @@ hosts.discovering.any = 正在搜索服务器
 server.refreshing = 正在刷新服务器
 hosts.none = [lightgray]未发现局域网游戏！
 host.invalid = [scarlet]无法连接服务器。
+
+servers.local = 本地服务器
+servers.remote = 远程服务器
+servers.global = 全球服务器
+
 trace = 跟踪玩家
 trace.playername = 玩家名称：[accent]{0}
 trace.ip = IP 地址：[accent]{0}
@@ -252,6 +258,7 @@ copylink = 复制链接
 back = 返回
 data.export = 导出数据
 data.import = 导入数据
+data.openfolder = 打开数据文件夹
 data.exported = 数据已导出。
 data.invalid = 非有效游戏数据。
 data.import.confirm = 导入外部游戏数据将覆盖本地[scarlet]全部[]的游戏数据。\n[accent]此操作无法撤销！[]\n\n数据导入后将自动退出游戏。
@@ -532,6 +539,8 @@ error.crashtitle = 发生了一个错误
 blocks.input = 输入
 blocks.output = 输出
 blocks.booster = 增强物品/液体
+blocks.tiles = 所需地型
+blocks.affinities = 相关
 block.unknown = [lightgray]???
 blocks.powercapacity = 能量容量
 blocks.powershot = 能量/发射
@@ -666,6 +675,7 @@ setting.mutesound.name = 无音效
 setting.crashreport.name = 发送匿名的崩溃报告
 setting.savecreate.name = 自动创建存档
 setting.publichost.name = 游戏公开可见
+setting.playerlimit.name = 玩家限制
 setting.chatopacity.name = 聊天界面不透明度
 setting.lasersopacity.name = 能量激光不透明度
 setting.bridgeopacity.name = 桥梁不透明度

core/assets/contributors

@@ -85,3 +85,4 @@ Draco
 Quezler
 Alicila
 Daniel Dusek
+DeltaNedas

servers.json

@@ -2,6 +2,9 @@
   {
     "address": "mindustry.us.to"
   },
+  {
+    "address": "mindustry.indielm.com:1101"
+  },
   {
     "address": "mindustry.ecansol.com:6597"
   },