LA_DI_DA 8a2d536260 Merge branch 'zuosizhu-alas/20230309' into smallkai ...

# Conflicts:
#	module/config/argument/args.json
#	module/ui/page.py

2024-03-29 21:14:59 +08:00

..

args.json

Merge branch 'zuosizhu-alas/20230309' into smallkai

2024-03-29 21:14:59 +08:00

argument.yaml

Upd: default ship data

2024-03-04 22:36:21 +08:00

dashboard.yaml

Opt: Sequence of dashboard

2023-02-27 22:25:21 +08:00

default.yaml

Add: change ship type for GemsFarming when set C or D map

2023-09-30 16:50:01 +08:00

gui.yaml

Add: confirm for clear all task

2024-02-19 17:38:06 +08:00

menu.json

Merge branch 'zuosizhu-alas/20230309' into smallkai-dev

2023-09-30 16:50:09 +08:00

override.yaml

Fix: force event daily, raids and coalitions to latest event

2024-03-01 20:32:58 +08:00

task.yaml

Add: ship filter for GemsFarming

2024-03-04 22:35:19 +08:00