Zuosizhu 53f44f3ff5 Merge branch 'master_lme' ...

# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json

2023-03-11 16:21:26 +08:00

..

argument

Merge branch 'master_lme'

2023-03-11 16:21:26 +08:00

i18n

Merge branch 'master_lme'

2023-03-11 16:21:26 +08:00

redirect_utils

Del: Remove Shanghai reverse proxy

2023-03-10 20:28:10 +08:00

atomicwrites.py

Dep: Remove atomicwrites dependency, copy-paste it into ALAS

2022-07-09 20:55:09 +08:00

code_generator.py

Add: CodeGenerator.Import

2023-02-23 12:35:13 +08:00

config_generated.py

Opt: Remove disable option from ChangeFlagship

2023-03-10 23:43:23 +08:00

config_manual.py

Revert "Merge branch 'mydev' into master"

2023-02-17 11:35:09 +08:00

config_updater.py

Merge branch 'master_lme'

2023-03-11 16:21:26 +08:00

config.py

Opt: Remove OpsiAshBeacon.AshAttack since it should always be True

2023-02-17 23:50:30 +08:00

server.py

Add: ServerChecker support for new CN server

2022-11-15 16:12:09 +08:00

utils.py

Merge branch 'LmeSzinc:master' into master

2023-02-22 10:10:52 +08:00

watcher.py

Opt: Watch user config changes while waiting for new tasks (resolve #1176)

2022-06-05 11:51:01 +08:00