Zuosizhu 1e31cb6de5 Merge branch 'master_lme' into AlasGGdev ...

# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py

2024-06-28 16:01:16 +08:00

..

method

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

pkg_resources

Fix: site-packages detection on manual package builds

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

platform

Opt: Add start/stop LDPlayer,NoxPlayer,BlueStack4,MEmuPlayer support. (#3867)

2024-06-26 12:41:38 +08:00

app_control.py

Add: nemu_ipc screenshot and control proxy

2024-03-28 21:41:53 +08:00

connection_attr.py

Fix: More fool-proof serial input redirection

2024-06-07 16:12:35 +08:00

connection.py

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

control.py

Add: Click method nemu_ipc

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

device.py

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

emulator.py

Merge branch 'master_lme'

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

screenshot.py

Merge branch '20230309' into smallkai

2024-05-23 08:25:21 +08:00