0O0o0oOoO00 e38ec5aa81 Merge remote-tracking branch 'LmeSzinc/master' into dev ...

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

2026-04-18 15:54:19 +08:00

..

awaken

Upd: [JP][TW] Awaken assets

2025-01-19 03:19:28 +08:00

campaign

Refactor: Abstract chapter switches from 20240725 to 20241219

2024-12-20 22:24:47 +08:00

coalition

Upd: [TW] Coalition assets

2026-01-31 03:25:17 +08:00

combat

Upd: asset COMBAT_AUTO

2026-03-12 18:46:50 +08:00

combat_ui

Upd: [TW] QUIT_Cyber and QUIT_New in different font weight (fixed #4798)

2025-05-18 16:16:05 +08:00

commission

…

daily

Add: Emergency module development daily

2023-03-17 00:34:02 +08:00

dorm

Add: Quick collection of coins and loves in the Dorm. (#3837)

2024-07-03 22:27:22 +08:00

equipment

Fix: handle both blue (folded) and orange (expanded) EQUIPMENT_OPEN

2025-09-26 23:23:46 +08:00

event

…

event_hospital

Upd: [TW] hospital assets (#4819)

2025-05-23 20:57:31 +08:00

exercise

Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM

2026-01-23 02:09:08 +08:00

freebies

Upd: [TW] BATTLE_PASS assets

2025-10-20 22:20:58 +08:00

gacha

Fix: Error caused by empty build queue (#2816)

2023-06-30 15:32:41 +08:00

guild

Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)

2025-02-12 01:53:08 +08:00

handler

Add: W16 preparations

2026-01-18 21:27:25 +08:00

hard

…

map

Upd: crop fleet clear assets to avoid collision with info_bar

2025-12-19 03:54:21 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

minigame

Fix: enter minigame ended at minigame menu (#4758)

2025-05-19 01:48:29 +08:00

os

Fix: [TW] MAP_NAME, it should as long as CN

2023-01-03 02:33:45 +08:00

os_ash

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

os_combat

…

os_handler

Fix: slow retrial for MISSION_OVERVIEW_ACCEPT(_SINGLE) (#5487)

2026-02-04 18:26:41 +08:00

os_shop

Feature: New OpsiShop. (#3086)

2024-06-17 11:24:40 +08:00

private_quarters

feat: pq add aegir (#5423)

2026-01-16 17:08:24 +08:00

raid

Upd: [EN][JP][TW] Raid CHANGWU assets

2026-02-14 03:30:49 +08:00

research

Upd: Detect research series 7

2024-07-12 00:07:25 +08:00

retire

Merge pull request #5157 from tonyhom/bug_fix/tw/enhance-slot-image

2025-09-25 12:10:39 +08:00

reward

Upd: [TW] assets for _reward_wait_mission_list

2025-07-10 02:41:31 +08:00

shipyard

Revert "Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6"

2024-07-19 12:27:34 +08:00

shop

Upd: [TW] shop assets

2025-10-19 17:05:55 +08:00

sos

…

statistics

…

storage

Upd:[tw] research E (#5382)

2025-12-12 19:22:49 +08:00

tactical

Fix: Trying to handle books empty (#3753)

2024-06-11 23:38:43 +08:00

template

Add: Chapter SP

2026-04-18 02:54:46 +08:00

ui

Merge remote-tracking branch 'LmeSzinc/master' into refactor

2025-12-21 18:46:41 +08:00

ui_white

Upd: [TW] POPUP_CONFIRM_WHITE assets

2025-10-20 23:03:02 +08:00

war_archives

Opt: search archives entrance (#4284)

2024-10-16 12:50:23 +08:00