From 30054dffbc8d46adfa0468131d2cc6956de71114 Mon Sep 17 00:00:00 2001 From: indielm <44037362+indielm@users.noreply.github.com> Date: Wed, 12 Feb 2020 14:11:08 -0500 Subject: [PATCH 1/5] Update servers.json --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 892bda7168..e99d2eb84e 100644 --- a/servers.json +++ b/servers.json @@ -2,6 +2,9 @@ { "address": "mindustry.us.to" }, + { + "address": "mindustry.indielm.com:1101" + }, { "address": "mindustry.ecansol.com:6597" }, From 948d184c40b99b7901f6b41922d8d4276367f431 Mon Sep 17 00:00:00 2001 From: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Date: Wed, 12 Feb 2020 19:28:54 +0000 Subject: [PATCH 2/5] :) --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index afe1bc3b45..76ffbb2736 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -85,3 +85,4 @@ Draco Quezler Alicila Daniel Dusek +DeltaNedas From 93de060ad5be4b896739ac32205f27726df2a892 Mon Sep 17 00:00:00 2001 From: laohuaji233 <48855802+laohuaji233@users.noreply.github.com> Date: Thu, 13 Feb 2020 14:56:46 +0800 Subject: [PATCH 3/5] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index db38a26842..bb89ba513c 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/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 = 桥梁不透明度 From 5dd86c0cbd8de63048f5bbd02866741bb9a97347 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 13 Feb 2020 08:54:44 +0100 Subject: [PATCH 4/5] Remove unappropriate spelling of appropriate --- SERVERLIST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SERVERLIST.md b/SERVERLIST.md index 58e717fb01..662d42b894 100644 --- a/SERVERLIST.md +++ b/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 `. "Approppriate" means that: +2. **Set an approppriate MOTD, name and description.** This is set with `config `. "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. From 1ac22bec6153cbd47ba7632dbeca832307d04a70 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 13 Feb 2020 08:57:10 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Oh=20look,=20another=20penny!=20?= =?UTF-8?q?=F0=9F=92=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SERVERLIST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SERVERLIST.md b/SERVERLIST.md index 662d42b894..e4d2b6a284 100644 --- a/SERVERLIST.md +++ b/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 `. "Appropriate" means that: +2. **Set an appropriate MOTD, name and description.** This is set with `config `. "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.