Zuosizhu 147c0a5214 Merge branch 'master_lme' ...

# Conflicts:
#	config/template.json
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.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-01 14:26:11 +08:00

..

assets.py

Merge branch 'LmeSzinc:master' into master

2023-02-28 01:42:07 +08:00

dock.py

Upd: Dock filter grids

2023-02-16 22:06:56 +08:00

enhancement.py

Add: Re-add RetireAmount

2023-02-19 21:04:29 +08:00

retirement.py

Refactor: Simplify GemsFarming settings

2023-03-01 00:12:15 +08:00

scanner.py

Feature: Change flagship and vanguard in Event hard mode when GemsFarming

2023-02-24 18:37:14 +08:00

setting.py

Upd: Add EN to server_support_quick_retire_setting_fallback

2023-03-01 00:12:19 +08:00