From 53f4bf7b78ebe08c6f3454b04b83452b9c8290f2 Mon Sep 17 00:00:00 2001
From: xem8k5 <69492624+xem8k5@users.noreply.github.com>
Date: Thu, 23 Jun 2022 02:19:07 +0800
Subject: [PATCH 1/3] Update bundle_zh_CN.properties by lastcommanded and so on
 (#7036)

* Update bundle_zh_CN.properties

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

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 9c9c643155..d4033ac536 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -750,7 +750,7 @@ error.title = [scarlet]发生了一个错误
 error.crashtitle = 发生了一个错误
 unit.nobuild = [scarlet]无法进行建造
 lastaccessed = [lightgray]上次操作：{0}
-lastcommanded = [lightgray]Last Commanded: {0}
+lastcommanded = [lightgray]上次命令： {0}
 block.unknown = [lightgray]？？
 
 stat.showinmap = <进入地图后显示>
@@ -795,7 +795,7 @@ stat.drillspeed = 基础钻探速度
 stat.boosteffect = 强化效果
 stat.maxunits = 最大单位数量
 stat.health = 生命值
-stat.armor = 护甲
+stat.armor = 装甲
 stat.buildtime = 建造时间
 stat.maxconsecutive = 连续放置限制
 stat.buildcost = 建造花费
@@ -832,6 +832,7 @@ stat.buildspeedmultiplier = 建造速度倍率
 stat.reactive = 反应
 stat.immunities = 免疫
 stat.healing = 治疗
+stat.moduletier = 模块等级
 
 ability.forcefield = 力墙场
 ability.repairfield = 修复场
@@ -883,7 +884,7 @@ bullet.lightning = [stat]{0}[lightgray]x闪电~[stat]{1}[lightgray]伤害
 bullet.buildingdamage = [stat]{0}%[lightgray]对建筑伤害
 bullet.knockback = [stat]{0}[lightgray]击退
 bullet.pierce = [stat]{0}[lightgray]x穿透
-bullet.infinitepierce = [stat]无限穿透
+bullet.infinitepierce = [stat]贯穿
 bullet.healpercent = [stat]{0}[lightgray]%修复
 bullet.healamount = [stat]{0}[lightgray] 直接修复
 bullet.multiplier = [stat]{0}[lightgray]x装填倍数
@@ -954,7 +955,7 @@ setting.difficulty.name = 难度：
 setting.screenshake.name = 屏幕抖动
 setting.bloomintensity.name = 光彩强度
 setting.bloomblur.name = 光彩模糊
-setting.effects.name = 显示特效
+setting.effects.name = 建筑特效
 setting.destroyedblocks.name = 显示已摧毁的建筑
 setting.blockstatus.name = 显示建筑状态
 setting.conveyorpathfinding.name = 传送带自动寻路
@@ -996,7 +997,7 @@ public.confirm.really = 如果您想与好友一起游戏，可以使用[green]
 public.beta = 请注意，测试版的游戏不能公开可见。 
 uiscale.reset = UI缩放比例已更改。 \n点击“确定”来接受缩放比例的更改。 \n[accent]{0}[]秒后[scarlet]将自动退出并还原设置。 
 uiscale.cancel = 取消并退出
-setting.bloom.name = 特效
+setting.bloom.name = 光彩特效
 keybind.title = 重新绑定按键
 keybinds.mobile = [scarlet]除了基本的移动以外，大多数按键绑定在移动设备上无效。 
 category.general.name = 常规
@@ -1780,6 +1781,21 @@ lcategory.unit.description = Give units commands.
 lcategory.world = World
 lcategory.world.description = Control how the world behaves.
 
+lcategory.unknown = 未知
+lcategory.unknown.description = 未分类的指令
+lcategory.io = 输入 & 输出
+lcategory.io.description = 修改内存块和处理器内存的内容
+lcategory.block = 控制方块
+lcategory.block.description = 交互控制方块
+lcategory.operation = 操作
+lcategory.operation.description = 操作该逻辑
+lcategory.control = 控制顺序
+lcategory.control.description = 管理执行顺序
+lcategory.unit = 控制单位
+lcategory.unit.description = 指挥单位
+lcategory.world = 世界
+lcategory.world.description = 控制世界的各类设置
+
 graphicstype.clear = 用指定的颜色填充整个显示屏
 graphicstype.color = 设置后续画图操作所使用的颜色
 graphicstype.col = 整合后的色彩信息。\n以[accent]%[]开头的十六进制代码形式。\n例如：[accent]%ff0000[]代表红色。
@@ -2014,7 +2030,7 @@ block.breach.name = 撕裂
 block.sublimate.name = 升华
 block.titan.name = 泰坦
 block.disperse.name = 驱离
-block.afflict.name = Afflict
+block.afflict.name = 折磨
 block.fabricator.name = 单位制造厂
 block.tank-refabricator.name = 坦克重构厂
 block.mech-refabricator.name = 机甲重构厂

From 54c4859e92012c480f0f4c2cffe00afe7a5f97c6 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az83-824.uavyq1izdhte5b0ne1us2eqzhb.jx.internal.cloudapp.net>
Date: Wed, 22 Jun 2022 18:20:29 +0000
Subject: [PATCH 2/3] Automatic bundle update

---
 core/assets/bundles/bundle_zh_CN.properties | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index d4033ac536..398355c597 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -787,7 +787,7 @@ stat.repairtime = 建筑完全修复时间
 stat.repairspeed = 修理速度
 stat.weapons = 武器
 stat.bullet = 子弹
-stat.moduletier = Module Tier
+stat.moduletier = 模块等级
 stat.speedincrease = 提速
 stat.range = 范围
 stat.drilltier = 可钻探矿物
@@ -832,7 +832,6 @@ stat.buildspeedmultiplier = 建造速度倍率
 stat.reactive = 反应
 stat.immunities = 免疫
 stat.healing = 治疗
-stat.moduletier = 模块等级
 
 ability.forcefield = 力墙场
 ability.repairfield = 修复场
@@ -1766,20 +1765,6 @@ laccess.dead = 单位或建筑是否已被摧毁或者已失效
 laccess.controlled = 若单位的控制方是处理器，返回[accent]@ctrlProcessor[]\n若单位/建筑由玩家控制，返回[accent]@ctrlPlayer[]\n若单位在编队中，返回[accent]@ctrlFormation[]\n其他情况，返回0
 laccess.progress = 进度，0到1之间的数值。 \n返回工厂生产、 炮塔装填，或者建筑建造的进度
 lacess.speed = 单位的最高速度（格/秒）
-lcategory.unknown = Unknown
-lcategory.unknown.description = Uncategorized instructions.
-lcategory.io = Input & Output
-lcategory.io.description = Modify contents of memory blocks and processor buffers.
-lcategory.block = Block Control
-lcategory.block.description = Interact with blocks.
-lcategory.operation = Operations
-lcategory.operation.description = Logical operations.
-lcategory.control = Flow Control
-lcategory.control.description = Manage execution order.
-lcategory.unit = Unit Control
-lcategory.unit.description = Give units commands.
-lcategory.world = World
-lcategory.world.description = Control how the world behaves.
 
 lcategory.unknown = 未知
 lcategory.unknown.description = 未分类的指令

From e74be686f10b65f64186330d075cf64960a2cd3a Mon Sep 17 00:00:00 2001
From: RTOmega <62565267+RebornTrack970@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:21:04 +0300
Subject: [PATCH 3/3] OmegaHub ip change (#7060)

* OmegaHub ip change

* Update servers_v7.json

* Update servers_be.json
---
 servers_be.json | 2 +-
 servers_v6.json | 2 +-
 servers_v7.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/servers_be.json b/servers_be.json
index 4c3157707e..6539b8bb67 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -19,6 +19,6 @@
     "address": "mindustry.vicp.io:7000" 
   },
   {
-    "address": "node2.crewcraft.cc:25569"
+    "address": "n1.yeet.ml:6574"
   }
 ]
diff --git a/servers_v6.json b/servers_v6.json
index 08be859ac6..1d77db02fd 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["node2.crewcraft.cc:6573", "node2.crewcraft.cc:6572","node2.crewcraft.cc:6571" , "node2.crewcraft.cc:6568" ,"node2.crewcraft.cc:6567"]
+    "address": ["n1.yeet.ml", "n1.yeet.ml:6568","n1.yeet.ml:6569" , "n1.yeet.ml:6570" ,"n1.yeet.ml:6571"]
   },
   {
     "name": "RCM",
diff --git a/servers_v7.json b/servers_v7.json
index b437442abc..a9f79e7fa3 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "Omega Hub",
-    "address": ["node2.crewcraft.cc:6575", "node2.crewcraft.cc:6569"]
+    "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573"]
   },
   {
     "name": "MeowLand",