LA_DI_DA dc51c4c56d Merge branch 'refs/heads/0O0o0oOoO00/master' into dev ...

# Conflicts:
#	config/template.json
#	module/campaign/run.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/dashboard.yaml
#	module/config/argument/gui.yaml
#	module/config/argument/menu.json
#	module/config/argument/override.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/config_manual.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/research_farming/farming.py

2024-08-17 22:33:23 +08:00

..

method

Merge branch 'refs/heads/dev'

2024-08-17 22:02:06 +08:00

pkg_resources

Fix: site-packages detection on manual package builds

2024-04-19 01:52:51 +08:00

platform

Fix: [ALAS] use ldconsole.exe

2024-07-24 23:17:56 +08:00

app_control.py

Add: [ALAS] Add interval on dump_hierarchy()

2024-07-17 12:58:39 +08:00

assets.py

Add: others' login check for jp

2023-12-15 23:19:57 +08:00

connection_attr.py

Fix: [ALAS] Launch parameters on waydroid (#4000)

2024-08-11 00:45:00 +08:00

connection.py

Fix: Check app keep alive on mumu >= 4.0

2024-08-17 00:29:55 +08:00

control.py

Add: Click method nemu_ipc

2024-04-08 03:14:33 +08:00

device.py

Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev

2024-07-26 12:25:03 +08:00

emulator.py

Merge branch 'master_lme'

2024-04-10 12:22:40 +08:00

env.py

Chore: [ALAS] Abstract platform condition

2024-07-12 01:05:58 +08:00

screenshot.py

Merge branch 'refs/heads/master_lme'

2024-07-26 10:28:26 +08:00