Merge remote-tracking branch 'origin/master'

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,8 @@ block.breach.name = 撕裂
 block.sublimate.name = 升华
 block.titan.name = 泰坦
 block.disperse.name = 驱离
-block.afflict.name = 折磨
-block.lustre.name = Lustre
+block.afflict.name = 苦难
+block.lustre.name = 光辉
 block.fabricator.name = 单位制造厂
 block.tank-refabricator.name = 坦克重构厂
 block.mech-refabricator.name = 机甲重构厂

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"]
   }
 ]