Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json

...

This commit is contained in:

LmeSzinc

2022-10-28 03:09:41 +08:00

parent 27fabf7b9f e7ca8ece0f

commit e847f76256

31 changed files with 151 additions and 110 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/tw/raid/ALBION_OCR_PT.png Normal file

Binary file not shown.

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