LmeSzinc 1482343a7b Merge branch 'master' into dev ...

# Conflicts:
#	module/os/assets.py

2021-04-13 19:54:31 +08:00

..

campaign

[jp] update assets imgs

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

combat

update jp asset "PAUSE"

2021-02-26 11:04:55 +08:00

daemon

Add: [JP] add jp assets, daemon module

2020-06-13 02:50:35 +09:00

daily

Add: Sync new feature among 3 servers

2020-07-20 21:06:33 +08:00

equipment

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

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

exercise

Fix: [JP] assets exercise/QUIT_RECONFIRM

2020-12-24 02:00:46 +09:00

guild

Upd: Default to 1 for normal behavior, join whenever available, other server assets

2021-04-02 21:00:54 -04:00

handler

Opt: Extend handle_2x_book_setting for prep and auto menu

2021-04-09 00:36:24 -04:00

hard

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

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

map

Mov: 2x book check and handle setting

2021-04-02 18:26:00 -04:00

os

Merge branch 'master' into dev

2021-04-13 19:54:31 +08:00

os_ash

Add: [JP] assets for guild and OS

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

os_combat

Add: [JP] assets for guild and OS

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

os_handler

Add: [JP] assets for guild and OS

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

raid

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

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

research

Opt: Remove duplicate methods

2020-09-17 18:26:16 +09:00

retire

update [jp]ENHANCE_CONFIRM buttom asset

2021-03-23 15:06:14 +08:00

reward

Del: Complete migration of guild, delete original reward module

2021-01-05 19:43:50 -05: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: [CN, TW, JP] OS_CHECK asset

2021-04-09 10:49:36 -04:00

war_archives

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

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