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

…

daily

…

dorm

Upd:[TW] Dorm asset change

2022-03-25 02:17:48 +08:00

equipment

Upd: [TW] EQUIPMENT_OPEN and EQUIPMENT_CLOSE

2022-10-25 12:42:12 +08:00

event

Add: Maritime escort

2022-01-15 22:17:34 +08:00

exercise

Fix: [TW] exercise assets

2022-09-03 15:24:13 +08:00

freebies

Mov: re-factor relevant modules and assets into freebies

2022-10-19 21:04:43 -04:00

gacha

Fix: Wrong OCR result for build ticket count

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

guild

Upd: [TW] EXP_INFO_CF (fixed #1310)

2022-07-09 21:49:36 +08:00

handler

Upd: [TW] SUBMARINE_MOVE_CANCEL and SUBMARINE_MOVE_CONFIRM (#1734)

2022-10-23 22:56:51 +08:00

hard

…

map

Fix: Move MAP_CAT_ATTACK_MIRROR to map buff icons

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

meowfficer

Merge pull request #1192 from LmeSzinc/dev

2022-06-07 19:30:55 +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

Fix OneHitMode and call AshBeaconTask time conflicts

2022-09-11 20:46:48 +08:00

os_combat

…

os_handler

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

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

raid

Upd: [EN] ALBION raid assets

2022-10-28 02:54:09 +08:00

research

Upd: [TW] RESEARCH_UNAVAILABLE (#1761)

2022-10-23 22:58: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

Fix: [TW] SHOP_MEDAL_SWIPE_END, SHOP_MERIT_SWIPE_END

2022-07-07 01:19:36 +08:00

sos

Fix: [TW] Sos module

2021-12-16 13:37:57 +08:00

statistics

…

storage

Upd: Copy static storage assets to all servers

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

tactical

Upd: [CN][TW] REWARD_* assets

2022-08-19 00:21:18 +08:00

template

Add: Siren templates in chapter BD

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

ui

Upd: [TW] EVENT_LIST_CHECK (fixed #1617)

2022-09-09 23:26:54 +08:00

war_archives

Merge branch 'dev'

2022-02-06 12:31:54 +08:00