Zuosizhu d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor ...

# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py

2026-01-24 14:18:46 +08:00

..

awaken

Upd: [JP][TW] Awaken assets

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

campaign

Merge branch 'master_lme'

2024-12-20 23:51:48 +08:00

coalition

Add: [TW] assets for coalition_20251127 (#5354)

2025-12-01 00:29:57 +08:00

combat

Merge remote-tracking branch 'Lme/master' into unrefactor

2026-01-24 14:18:46 +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

…

dorm

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

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

equipment

Merge remote-tracking branch 'Lme/master' into dev

2025-10-12 11:28:13 +08:00

event

…

event_hospital

Upd: [TW] hospital assets (#4819)

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

exercise

Merge remote-tracking branch 'Lme/master' into unrefactor

2026-01-24 14:18:46 +08:00

freebies

Upd: [TW] BATTLE_PASS assets

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

gacha

…

guild

Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)

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

handler

Fix: AUTO_SEARCH for minor icon shift (#5126)

2025-09-13 01:09:58 +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

…

os_ash

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

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

os_combat

…

os_handler

Fix: current ap blocked by info bar (#4100)

2024-08-20 02:25:44 +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

[TW] Event: Spring Fashion Festa (#4539)

2025-01-27 17:56:45 +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

Merge Lme/Master into dev

2024-07-22 16:45:29 +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

Upd: [TW] TEMPLATE_COMBAT_LOADING

2026-01-04 02:29:43 +08:00

ui

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +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