1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:59:24 +08:00

Merge remote-tracking branch 'LmeSzinc/master' into dev

# Conflicts:
#	config/template.json
#	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/config/i18n/zh-CN.json
#	module/ui/ui.py
This commit is contained in:
0O0o0oOoO00
2025-06-28 23:01:31 +08:00
74 changed files with 583 additions and 446 deletions

View File

@@ -337,7 +337,7 @@ class GeneratedConfig:
MaritimeEscort_Enable = True
# Group `Coalition`
Coalition_Mode = 'tc1' # tc1, tc2, tc3, sp, ex
Coalition_Mode = 'hard' # easy, normal, hard, sp, ex
Coalition_Fleet = 'single' # single, multi
# Group `Commission`