Fix: Resolve merge conflicts; migrate equip skin box price check to appropriate custom_check_item variant

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-12-29 20:55:46 -05:00

parent 26c4dabc0a a1fef9f3b3

commit 87a4137859

22 changed files with 571 additions and 27 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_CAgreen.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_CAgreen.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_CAgreen.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_CAgreen.gif Normal file

Binary file not shown.

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