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

Upd: [EN][JP] Coalition FASHION assets

2026-01-23 16:24:56 +08:00

combat

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

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

combat_ui

Fix: Re-compress assets/jp/combat_ui/QUIT.png to fixup git hashing

2025-04-21 12:35:05 +08:00

commission

upd: [JP] asset COMMISSION_START (#4353)

2024-12-09 12:44:54 +08:00

daily

Upd: [JP] asset OCR_REMAIN

2024-10-20 21:58:34 +08:00

device

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

dorm

upd: [JP] dorm assets

2024-10-16 12:48:21 +08:00

equipment

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

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

event

…

event_hospital

Upd: [JP] Hospital assets

2025-03-28 03:56:16 +08:00

eventstory

Upd: REWARD_GOT JP + EN asset (#5037)

2025-08-16 03:27:13 +08:00

exercise

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

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

freebies

Del: Remove old mail module

2025-10-17 04:37:45 +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

Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303)

2025-11-13 17:50:50 +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: [JP] Meowfficer assets (#3291)

2023-11-19 18:55:51 +08:00

meta_reward

Upd: [JP] SYNC_ENTER

2025-03-16 11:40:46 +08:00

minigame

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

2025-05-19 01:48:29 +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

Upd: [JP] ash_collect_status (#4554)

2025-02-03 22:53:24 +08:00

os_combat

…

os_handler

Upd: [JP] Opsi assets (#4492)

2025-01-06 18:31:52 +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

Add: [EN][JP] Assets in raid_20250416

2025-01-17 13:25:59 +08:00

research

Jp font 20241011 (#4272)

2024-10-12 14:29:01 +08:00

retire

tmp: [JP] asset DOCK_CHECK

2025-05-29 22:29:54 +08:00

reward

Upd: [EN][JP] MISSION_EMPTY MISSION_UNFINISH

2025-05-20 23:55:12 +08:00

shipyard

Upd: Series selecting page in shipyard

2024-07-12 00:31:34 +08:00

shop

Upd: [JP] shop navigation assets

2025-10-11 01:12:31 +08:00

sos

Fix: [EN] Confirm button in SOS signal search list

2022-12-07 01:38:57 +08:00

statistics

…

storage

Upd: [JP] BOX assets (#4814)

2025-05-21 23:44:58 +08:00

tactical

Upd: [JP] asset REWARD_2.BUTTON (#5465)

2026-01-23 02:47:59 +08:00

template

Upd: [JP] TEMPLATE_COMBAT_LOADING (#5393)

2025-12-20 19:20:47 +08:00

ui

Merge branch 'master_lme' into dev

2025-10-17 00:30:43 +08:00

ui_white

Upd: [JP] asset POPUP_CONFIRM_WHITE_BATTLEPASS (#5365)

2025-12-09 12:19:50 +08:00

war_archives

Opt: search archives entrance (#4284)

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