From 2c197aae7c9a1c04a8e892d0dcf18081276333bf Mon Sep 17 00:00:00 2001
From: xem8k5 <69492624+xem8k5@users.noreply.github.com>
Date: Sat, 11 Jun 2022 20:17:10 +0800
Subject: [PATCH 1/2] Update bundle_zh_CN.properties again (#7001)

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
---
 core/assets/bundles/bundle_zh_CN.properties | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 59c859a023..9444ce9a40 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -965,7 +965,7 @@ setting.borderlesswindow.name = 无边框窗口
 setting.borderlesswindow.name.windows = 无边框全屏
 setting.borderlesswindow.description = 可能需要重启
 setting.fps.name = 显示帧数和网络延迟
-setting.console.name = Enable Console
+setting.console.name = 启用控制台
 setting.smoothcamera.name = 平滑镜头
 setting.vsync.name = 垂直同步
 setting.pixelate.name = 像素画面
@@ -1160,8 +1160,8 @@ item.scrap.name = 废料
 item.fissile-matter.name = 裂变物质
 item.beryllium.name = 铍
 item.tungsten.name = 钨
-item.oxide.name = 氧化铍
-item.carbide.name = 碳化钨
+item.oxide.name = 氧化物
+item.carbide.name = 碳化物
 item.dormant-cyst.name = 休眠囊肿
 
 liquid.water.name = 水
@@ -1938,11 +1938,11 @@ block.electrolyzer.name = 电解器
 block.atmospheric-concentrator.name = 氮气浓缩器
 block.oxidation-chamber.name = 氧化机
 block.electric-heater.name = 电能加热器
-block.slag-heater.name = Slag Heater
+block.slag-heater.name = 矿渣加热器
 block.phase-heater.name = 相位物加热器
 block.heat-redirector.name = 热重定向器
 block.slag-incinerator.name = 矿渣焚化炉
-block.carbide-crucible.name = 碳化钨坩埚
+block.carbide-crucible.name = 碳化物坩埚
 block.slag-centrifuge.name = 矿渣离心机
 block.surge-crucible.name = 合金坩埚
 block.cyanogen-synthesizer.name = 氰气合成器
@@ -1953,10 +1953,10 @@ block.beryllium-wall-large.name = 大型铍墙
 block.tungsten-wall.name = 钨墙
 block.tungsten-wall-large.name = 大型钨墙
 block.blast-door.name = 防爆自动门
-block.carbide-wall.name = 碳化钨墙
-block.carbide-wall-large.name = 大型碳化钨墙
-block.reinforced-surge-wall.name = Reinforced Surge Wall
-block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
+block.carbide-wall.name = 碳化物墙
+block.carbide-wall-large.name = 大型碳化物墙
+block.reinforced-surge-wall.name = 加固合金墙
+block.reinforced-surge-wall-large.name = 加固大型合金墙
 block.radar.name = 雷达
 block.build-tower.name = 建造塔
 block.regen-projector.name = 再生投影器
@@ -1997,10 +1997,10 @@ block.breach.name = 撕裂
 block.sublimate.name = 升华
 block.titan.name = 泰坦
 block.disperse.name = 驱离
-block.fabricator.name = 制造厂
-block.tank-refabricator.name = Tank Refabricator
-block.mech-refabricator.name = Mech Refabricator
-block.ship-refabricator.name = Ship Refabricator
+block.fabricator.name = 单位制造厂
+block.tank-refabricator.name = 坦克重构厂
+block.mech-refabricator.name = 机甲重构厂
+block.ship-refabricator.name = 飞船重构厂
 block.tank-assembler.name = 坦克装配厂
 block.ship-assembler.name = 飞船装配厂
 block.mech-assembler.name = 机甲装配厂
@@ -2042,4 +2042,4 @@ unit.obviate.name = 影逝
 sector.two.name = 二号
 sector.three.name = 三号
 sector.four.name = 四号
-sector.five.name = 五号(测试性不稳定)
+sector.five.name = 五号(已被移除)

From d18b787ebbace9d33fd6f6fa419c326dd0532504 Mon Sep 17 00:00:00 2001
From: Valeriy <maxsmokeskaaj@gmail.com>
Date: Sat, 11 Jun 2022 22:17:29 +1000
Subject: [PATCH 2/2] Cum back to v6 (#7003)

---
 servers_v6.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v6.json b/servers_v6.json
index 8b224a443a..f8a2640b16 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -19,6 +19,10 @@
     "name": "Tendhost",
     "address": ["tendhost.ddns.net", "smokeofanarchy.ru:7576"]
   },
+  {
+    "name": "SMokeOfAnarchy",
+    "address": ["strider.smokeofanarchy.ru:6566"]
+  },
   {
     "name": "Atanner Gaming",
     "address": ["mindustry.atannergaming.com:6567", "mindustry.atannergaming.com:6700", "mindustry.atannergaming.com:9000"]