Merge branch 'bug_fix' into dev

# Conflicts:
#	module/config/config_generated.py

module/config/i18n/ja-JP.json

@@ -305,6 +305,7 @@
       "com.bilibili.blhx.uc": "CN com.bilibili.blhx.uc",
       "com.bilibili.blhx.mzw": "CN com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "CN com.yiwu.blhx.yx15",
+      "com.bilibili.blhx.m4399": "CN com.bilibili.blhx.m4399",
       "com.hkmanjuu.azurlane.gp.mc": "TW com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {
@@ -552,6 +553,7 @@
       "name": "Campaign.Event.name",
       "help": "Campaign.Event.help",
       "campaign_main": "campaign_main",
+      "event_20211028_cn": "神穹を衝く聖歌（復刻）",
       "event_20220728_cn": "鋼鷲の冒険譚",
       "event_20200917_cn": "刹那觀る胡蝶の夢（復刻）",
       "event_20201029_cn": "激唱のユニバース",
@@ -578,7 +580,6 @@
       "event_20211125_cn": "弧光は交わる世界にて",
       "event_20211111_cn": "燈火のシニエ",
       "event_20211028_tw": "復刻光與影的鳶尾之華",
-      "event_20211028_cn": "神穹を衝く聖歌（復刻）",
       "event_20210916_cn": "駆けよ 碧海の吹き風",
       "event_20210722_cn": "海に響くアイドルの歌",
       "event_20210819_cn": "闇靄払う銀翼（復刻）",