Merge branch 'bug_fix' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2025-07-11 00:14:29 +08:00

parent 9e91543a14 da837c391e

commit 532e4c2eee

49 changed files with 1407 additions and 88 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/combat_ui/PAUSE_Star.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

assets/cn/research/TEMPLATE_S8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

assets/cn/war_archives/TEMPLATE_AQUILIFERS_BALLADE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

assets/research_blueprint/dmitri.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/research_blueprint/goudenleeuw.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/research_blueprint/kansas.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

assets/research_blueprint/mecklenburg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/research_blueprint/vittorio.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

assets/tw/reward/MISSION_EMPTY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB