LmeSzinc e847f76256 Merge branch 'master' into dev ...

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

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

..

campaign

Add: TaskBalancer (#1509)

2022-08-24 23:44:49 +08:00

combat

Upd: AUTOMATION_CONFIRM

2022-08-20 23:28:15 +08:00

commission

Upd: [JP] REWARD_* assets

2022-08-19 00:14:32 +08:00

daily

Fix JP Daily Run button

2021-10-30 18:46:13 -04:00

dorm

Refactor: Separate dorm to standalone module

2021-09-21 00:51:29 +08:00

equipment

Fix: Delete unused ui action; Rename button

2022-08-06 16:40:47 +08:00

event

Upd: [JP] ESCORT_* assets

2022-01-16 15:19:02 +08:00

exercise

Fix: [JP] assets fix after font changed

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

freebies

add jp support

2022-10-25 17:56:44 +08:00

gacha

Fix: Wrong OCR result for build ticket count

2022-08-06 19:39:57 +08:00

guild

Opt: Better detection of GUILD_REPORT_AVAILABLE

2021-12-05 15:42:27 +08:00

handler

Upd: AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT

2022-09-06 22:46:24 +08:00

hard

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

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

map

Fix: Move MAP_CAT_ATTACK_MIRROR to map buff icons

2022-03-01 23:19:03 +08:00

meowfficer

Upd: [JP] OCR_MEOWFFICER

2022-07-13 00:16:39 +08:00

meta_reward

Upd: [JP] assets for meta reward

2022-03-07 11:57:58 +08:00

os

Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)

2022-10-04 00:25:42 -04:00

os_ash

Merge pull request #1650 from ddmugicha/bug_fix

2022-09-16 12:02:06 +08:00

os_combat

Add: [JP] assets for guild and OS

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

os_handler

Fix: Use the old ORDER_CHECK as its button (#1290)

2022-07-05 21:53:57 +08:00

raid

Upd: [JP] ALBION raid assets

2022-10-28 03:00:31 +08:00

research

Fix: Cancel researches with unsatisfied requirements

2022-08-23 02:47:44 +08:00

retire

Add: Quick retire options fallback to avoid user mistakes

2022-09-10 18:11:07 +08:00

reward

Mov: reward mail support to separate module

2022-10-16 01:01:15 -04:00

shipyard

Upd: Copy SHIPYARD_SERIES_SELECT_CHECK to all servers

2022-07-18 01:11:40 +08:00

shop

Add: Scrolling medal shop list

2022-06-05 23:54:01 +08:00

sos

Fix: [JP] SOS module assets

2021-09-04 17:37:05 +08:00

statistics

Upd: [JP] CAMPAIGN_BONUS asset

2022-01-16 15:19:02 +08:00

storage

Upd: Copy static storage assets to all servers

2022-08-23 01:14:44 +08:00

tactical

Fix: [EN] Unable to detect META skill list

2022-09-25 02:39:45 +08:00

template

Add: Siren templates in chapter BD

2022-09-16 22:06:13 +08:00

ui

Upd: [JP] DORM_FEED_ENTER (#1707)

2022-10-06 17:06:31 +08:00

war_archives

Smaller templates to prevent weird stuck

2022-10-17 01:04:21 +08:00