Zuosizhu fb67ae3ab7 Merge branch 'master_lme' ...

# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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

2023-03-24 16:33:37 +08:00

..

assets.py

Fix: Dashboard not refreshing

2023-02-07 18:00:08 +08:00

campaign_base.py

Fix: CampaignEnd error when battle function exhausted

2022-12-28 18:09:55 +08:00

campaign_event.py

Merge branch 'master_lme'

2023-03-24 16:33:37 +08:00

campaign_ocr.py

Fix: Handle campaign name OCR result started with 0

2023-03-01 12:23:22 +08:00

campaign_status.py

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00

campaign_ui.py

Reuse disable_tasks in CampaignEvent

2023-01-13 23:16:18 +08:00

gems_farming.py

Merge branch 'master_lme'

2023-03-17 00:44:12 +08:00

os_run.py

Upd: [EN] Assets of OpSi monthly bosses (#2032)

2023-01-06 20:46:23 +08:00

run.py

Merge branch 'master_lme'

2023-03-04 03:11:41 +08:00