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

# Conflicts:
#	module/os/assets.py

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

..

campaign

[jp] update assets imgs

2021-01-06 10:14:48 +08:00

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

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

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

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

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

Add: [JP] assets for guild and OS

2021-02-10 18:38:20 +09:00

os_handler

Fix: Missing PORT_MISSION_RED_DOT asset

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

raid

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

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

Fix: Assets for sos signal and commission notice

2020-12-22 18:39:58 +08:00

statistics

Dev: Item statistics rework

2020-08-09 11:34:59 +08:00

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