LmeSzinc 4f4f296e44 Merge branch 'master' into dev ...

# Conflicts:
#	module/os/assets.py

2021-04-16 17:51:18 +08:00

..

campaign

…

combat

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

daemon

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

daily

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

equipment

…

exercise

Fix: [JP] assets fix after font changed

2021-04-16 02:47:31 +09:00

guild

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

handler

Fix: [JP] assets fix after font changed

2021-04-16 02:47:31 +09:00

hard

…

map

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

os

Merge branch 'master' into dev

2021-04-16 17:51:18 +08:00

os_ash

Fix: [JP] assets fix after font changed

2021-04-16 02:47:31 +09:00

os_combat

…

os_handler

Fix: Missing PORT_MISSION_RED_DOT asset

2021-04-14 18:29:32 +08:00

raid

…

research

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

retire

Fix: [JP] assets fix after font changed

2021-04-16 02:47:31 +09:00

reward

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

sos

…

statistics

…

template

Fix: Use normal asset instead of template

2021-04-09 10:46:42 -04:00

ui

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

war_archives

Fix: [EN] Support for Ink-Stained Steel Sakura, update module reference to local

2021-04-08 23:24:07 -04:00