Merge branch 'master' into bug_fix

Browse Source

...

This commit is contained in:

LmeSzinc

2022-10-15 23:59:21 +08:00

parent 7c2238ba1f 3c1d013a69

commit a37055832c

24 changed files with 853 additions and 12 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