Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-10-23 16:56:53 +08:00

parent cc23519a5d 814cd0c2c7

commit 2960bf068f

62 changed files with 1088 additions and 379 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/template/TEMPLATE_SIREN_SheffieldIdol.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 645 B

BIN

assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png Normal file

Binary file not shown.

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

BIN

assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png Normal file

Binary file not shown.

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