0O0o0oOoO00 76b6435ee6 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-02-28 12:16:28 +08:00

..

awaken

Opt: Awaken Favourite Ships Only (#4957)

2025-07-16 12:24:08 +08:00

base

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

2025-12-01 23:24:19 +08:00

campaign

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

2026-02-28 12:16:28 +08:00

coalition

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

2026-02-06 21:57:03 +08:00

combat

fix: AUTOMATION_ON needs offset in combat

2026-02-20 11:29:39 +08:00

combat_ui

Upd: Battle UI Ancient

2026-02-09 23:31:47 +08:00

commission

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

2025-11-08 16:44:56 +08:00

config

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

2026-02-28 12:16:28 +08:00

daemon

…

daily

…

device

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

2026-02-06 21:57:03 +08:00

dorm

Fix: Remove DORM_RED_DOT check, as dorm card has a slow appear animation

2025-10-17 04:49:56 +08:00

equipment

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

2025-10-01 19:43:59 +08:00

event

…

event_hospital

Opt: Reuse screenshots in combat_status

2025-10-24 00:21:41 +08:00

eventstory

Fix: Handle SP event story

2025-10-24 01:19:16 +08:00

exercise

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

2026-02-14 13:50:42 +08:00

freebies

Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)

2025-12-12 19:24:41 +08:00

gacha

add: migrate dashboard update logic

2025-09-14 19:25:40 +08:00

game_setting

…

gg_handler

add: migrate power limit and exercise delay

2025-09-14 17:57:06 +08:00

guild

fix: patch GUILD_DISPATCH_FLEET_UNFILLED.png

2025-10-18 16:50:14 +08:00

handler

Fix: no poor sleep in fleet_preparation_sidebar_ensure

2026-02-18 09:10:55 +08:00

hard

Fix bugs (#4569)

2025-02-07 01:09:24 +08:00

log_res

add: migrate dashboard ui

2025-09-14 18:45:47 +08:00

luahook

fix: incorrect arch map of x86_64

2026-02-07 11:56:30 +08:00

map

fix: handle no flagships after retirement.

2026-01-28 22:35:54 +08:00

map_detection

Fix: should add LEFT edge of first column of grids in Homography.to_perspective() (#5443)

2026-01-16 17:05:41 +08:00

meowfficer

Fix: _meow_skip_popup_after_locking exits at MEOWFFICER_TRAIN_START

2025-05-22 00:30:26 +08:00

meta_reward

Merge pull request #4890 from dragonheart107/assets

2025-06-18 18:26:29 +08:00

minigame

Fix: [EN] UI switch to page_game_room

2026-02-19 01:58:20 +08:00

notify

Fix: [ALAS] Hide traceback of notify

2025-05-12 23:08:27 +08:00

ocr

Revert "Upd: [JP] digit ocr '1' mistaken as 'L'"

2025-08-31 01:30:01 +08:00

os

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

2026-02-28 12:16:28 +08:00

os_ash

add: migrate power limit and exercise delay

2025-09-14 17:57:06 +08:00

os_combat

Opt: Reuse screenshots in combat_status

2025-10-24 00:21:41 +08:00

os_handler

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

2026-02-06 21:57:03 +08:00

os_shop

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

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

private_quarters

feat: pq add aegir (#5423)

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

raid

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

2026-02-28 12:16:28 +08:00

research

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

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

retire

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

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

reward

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

2025-10-24 17:13:48 +08:00

shipyard

Fix: OCR_COIN from page_main in shipyard_reward (#5176)

2025-10-01 02:42:59 +08:00

shop

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

2025-11-08 16:44:56 +08:00

shop_event

Add: event shop

2025-10-29 16:17:37 +08:00

sos

…

statistics

Upd: Update new UI 20250814 for server JP, update CN assets

2025-08-21 23:59:59 +08:00

storage

Fix: infinite loop in _handle_use_box_amount when box count insufficient (#5516)

2026-02-19 02:19:08 +08:00

submodule

add: add hook operation tool

2025-10-27 17:20:55 +08:00

tactical

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

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

template

Add: Chapter B

2025-12-20 19:10:39 +08:00

ui

Revert "fix: Temporary New year Academy check"

2026-02-26 16:52:05 +08:00

ui_white

Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)

2025-12-12 19:24:41 +08:00

war_archives

Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST

2026-02-09 23:40:21 +08:00

webui

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

2026-02-28 12:16:28 +08:00

counter.py

add: base framework of game restart and instance restart

2025-09-02 00:48:40 +08:00

exception.py

add: migrate detect others' login

2025-09-16 23:13:11 +08:00

instance_watcher.py

fix: do not create bin/status dir when try to remove status file although this dir has already existed

2025-11-02 01:07:23 +08:00

logger.py

…

logger.pyi

…

scheduler_watcher.py

fix: circular reference of AzurLaneConfig

2025-09-13 21:58:42 +08:00

server_checker.py

fix: import path of scheduler watcher

2025-10-16 23:13:56 +08:00