Merge branch 'master' into dev

module/config/i18n/ja-JP.json

@@ -455,6 +455,8 @@
       "name": "Campaign.Event.name",
       "help": "Campaign.Event.help",
       "campaign_main": "campaign_main",
+      "event_20220224_cn": "鳴動せし星霜の淵",
+      "event_20210225_cn": "暁射す氷華の嵐",
       "event_20220210_cn": "凍絶の北海（復刻）",
       "raid_20220127": "秘密事件調査",
       "event_20201229_cn": "虚畳なりし限象",
@@ -483,7 +485,6 @@
       "event_20210415_tw": "復刻圍剿施佩伯爵",
       "event_20210325_cn": "開かれし紺碧の砂箱（復刻）",
       "event_20210225_tw": "北境序曲",
-      "event_20210225_cn": "暁射す氷華の嵐",
       "event_20210121_cn": "悲歎せし焔海の詩（復刻）",
       "event_20201126_cn": "バケーションレーン",
       "event_20200312_cn": "南洋に靡く硝煙（復刻）",
@@ -1780,12 +1781,11 @@
     "HazardLevel": {
       "name": "OpsiMeowfficerFarming.HazardLevel.name",
       "help": "OpsiMeowfficerFarming.HazardLevel.help",
-      "1": "1",
-      "2": "2",
       "3": "3",
       "4": "4",
       "5": "5",
-      "6": "6"
+      "6": "6",
+      "10": "10"
     },
     "TargetZone": {
       "name": "OpsiMeowfficerFarming.TargetZone.name",