1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 08:09:29 +08:00

Merge branch 'LmeSzinc:master' into 20230309

This commit is contained in:
Zuosizhu
2024-04-15 23:25:52 +08:00
committed by GitHub
28 changed files with 513 additions and 216 deletions

View File

@@ -128,8 +128,7 @@
"uiautomator2",
"minitouch",
"Hermit",
"MaaTouch",
"nemu_ipc"
"MaaTouch"
]
},
"ScreenshotDedithering": {
@@ -1720,8 +1719,8 @@
],
"display": "hide",
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -2053,8 +2052,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -2501,8 +2500,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -3360,8 +3359,8 @@
"raid_20240328"
],
"option_bold": [
"raid_20230629",
"raid_20240328"
"raid_20240328",
"raid_20230629"
],
"cn": "raid_20240328",
"en": "raid_20240328",
@@ -4343,8 +4342,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -4808,8 +4807,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -5273,8 +5272,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -5738,8 +5737,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -6193,8 +6192,8 @@
"event_20240229_cn"
],
"option_bold": [
"event_20211111_cn",
"event_20220224_cn"
"event_20220224_cn",
"event_20211111_cn"
],
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
@@ -6601,8 +6600,8 @@
"raid_20240328"
],
"option_bold": [
"raid_20230629",
"raid_20240328"
"raid_20240328",
"raid_20230629"
],
"cn": "raid_20240328",
"en": "raid_20240328",