1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 13:39:25 +08:00

Merge remote-tracking branch 'refs/remotes/Lme/master' into dev

# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
This commit is contained in:
Zuosizhu
2024-07-26 08:04:44 +08:00
113 changed files with 1397 additions and 162 deletions

View File

@@ -450,7 +450,8 @@
"DroidCast": "DroidCast",
"DroidCast_raw": "DroidCast_raw",
"scrcpy": "scrcpy",
"nemu_ipc": "nemu_ipc"
"nemu_ipc": "nemu_ipc",
"ldopengl": "ldopengl"
},
"ControlMethod": {
"name": "Control Method",
@@ -782,6 +783,7 @@
"event_20240229_cn": "Snowrealm Peregrination",
"event_20240425_cn": "Heart-Linking Harmony",
"event_20240521_cn": "Light of the Martyrium",
"event_20240725_cn": "Interlude of Illusions",
"raid_20200624": "Air Raid Drills with Essex Rerun",
"raid_20210708": "Cross Wave rerun",
"raid_20220127": "Mystery Investigation",