Zuosizhu d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor ...

# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py

2026-01-24 14:18:46 +08:00

..

assets.py

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

campaign_base.py

opt: request extend task deadline before entering battle loop

2025-08-08 17:09:13 +08:00

campaign_event.py

Merge remote-tracking branch 'Lme/master' into unrefactor

2026-01-24 14:18:46 +08:00

campaign_ocr.py

Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504)

2025-01-10 02:27:51 +08:00

campaign_status.py

Fix: Merge error causing Ocr failure

2024-10-27 13:25:40 +08:00

campaign_ui.py

Fix: Shorten ASIDE_SWITCH_20241219 unknown_timer

2025-09-13 20:39:11 +08:00

gems_farming.py

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +08:00

os_run.py

Merge remote-tracking branch 'Lme/master' into unrefactor

2026-01-24 14:18:46 +08:00

run.py

Merge branch 'master_lme' into dev

2025-10-24 11:10:21 +08:00