From 82ffa91b494b01cad34d1e9f8c8d7c15caed3665 Mon Sep 17 00:00:00 2001 From: xem8k5 <69492624+xem8k5@users.noreply.github.com> Date: Tue, 28 Jun 2022 00:53:01 +0800 Subject: [PATCH 1/3] Update bundle_zh_CN.properties aaaaaagain (#7072) * Update bundle_zh_CN.properties * Update bundle_zh_CN.properties * Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index d5df89f446..8f98d9b0c0 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -385,10 +385,10 @@ editor.mapinfo = 地图信息 editor.author = 作者： editor.description = 描述： editor.nodescription = 地图需要至少4个字符的描述才能发布。 -editor.waves = 波次： -editor.rules = 规则： -editor.generation = 地形生成器： -editor.objectives = Objectives +editor.waves = 波次 +editor.rules = 规则 +editor.generation = 地形生成器 +editor.objectives = 任务 editor.ingame = 游戏内编辑 editor.playtest = 试玩 editor.publish.workshop = 上传到创意工坊 @@ -401,8 +401,8 @@ editor.filters.type = 地图类型： editor.filters.search = 在特定关键词中进行搜索： editor.filters.author = 作者 editor.filters.description = 描述 -editor.shiftx = Shift X -editor.shifty = Shift Y +editor.shiftx = 平移 X 轴坐标 +editor.shifty = 平移 Y 轴坐标 workshop = 创意工坊 waves.title = 波次 waves.remove = 移除 @@ -2026,8 +2026,9 @@ block.breach.name = 撕裂 block.sublimate.name = 升华 block.titan.name = 泰坦 block.disperse.name = 驱离 -block.afflict.name = 折磨 -block.lustre.name = Lustre +block.afflict.name = 苦痛 +block.afflict.name = 苦难 +block.lustre.name = 光辉 block.fabricator.name = 单位制造厂 block.tank-refabricator.name = 坦克重构厂 block.mech-refabricator.name = 机甲重构厂 From 4f0e634b4234a9d1c80513a6b5de5e5f5b5cfed7 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 27 Jun 2022 16:54:13 +0000 Subject: [PATCH 2/3] Automatic bundle update --- core/assets/bundles/bundle_zh_CN.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 8f98d9b0c0..fc3c605834 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -2026,7 +2026,6 @@ block.breach.name = 撕裂 block.sublimate.name = 升华 block.titan.name = 泰坦 block.disperse.name = 驱离 -block.afflict.name = 苦痛 block.afflict.name = 苦难 block.lustre.name = 光辉 block.fabricator.name = 单位制造厂 From c584eb92fc10576cc5c7fa93fc56ffb45f2b24d9 Mon Sep 17 00:00:00 2001 From: BeDanGames <92419640+BeDanGames@users.noreply.github.com> Date: Tue, 28 Jun 2022 01:08:28 +0700 Subject: [PATCH 3/3] Update servers_v7.json (#7084) --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index a9f79e7fa3..016e91f460 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -96,7 +96,7 @@ "address": ["mindustry.vicp.io:6800", "mindustry.vicp.io:7000", "mindustry.vicp.io:6567"] }, { - "name": "SurvivalHard", - "address": ["212.20.42.61:6567"] + "name": "Harders", + "address": ["212.20.42.61:6567", "212.20.42.61:6568", "212.20.42.61:6569"] } ]