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

..

auto_login

…

awaken

Merge branch 'master_lme' into brocore_dev

2025-07-25 11:46:23 +08:00

base

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +08:00

campaign

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

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

cloud_phone

fix: call Restart after phone restarted

2025-05-18 21:38:31 +08:00

coalition

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

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

combat

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

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

combat_ui

Upd: Battle UI MaidCafe

2026-01-01 23:36:25 +08:00

commission

Fix: [EN] Wrong ocr result PYEIN PROTECTION (#5270)

2025-10-27 15:56:08 +08:00

config

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

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

daemon

Add: cheat support for daemon

2025-05-21 03:30:02 +08:00

daily

…

device

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +08:00

dorm

Adj: Check furniture everyday. Fuck Lme

2025-12-04 18:26:56 +08:00

equipment

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

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

event

…

event_hospital

Merge branch 'master_lme' into dev

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

eventstory

Fix: Handle SP event story

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

exercise

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

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

freebies

Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)

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

gacha

Fix: Shop and Gacha

2025-09-01 19:46:40 +08:00

game_setting

…

gg_handler

Fix: GGHandler won't restart game if Hook enabled

2025-07-06 00:51:46 +08:00

guild

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

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

handler

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

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

hard

…

log_res

…

luahook

Merge new Hooks and full config from refactor

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

map

Merge branch 'master_lme' into dev

2025-12-20 23:31:25 +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: enter minigame ended at minigame menu (#4758)

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

notify

…

ocr

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

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

os

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

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

os_ash

Merge branch 'master_of_lme' into dev

2025-09-01 16:07:45 +08:00

os_combat

Merge branch 'master_lme' into dev

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

os_handler

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

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

os_shop

Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END

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

private_quarters

feat: pq add aegir (#5423)

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

raid

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

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

research

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +08:00

research_farming

…

retire

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

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

reward

Refactor: Claim mission rewards

2025-10-22 01:09:45 +08:00

shipyard

Fix: shipyard no ocr_coin

2025-10-12 16:29:24 +08:00

shop

Merge branch 'master_lme' into dev

2025-11-07 18:11:22 +08:00

shop_event

…

sos

…

statistics

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

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

storage

Upd:[tw] research E (#5382)

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

submodule

…

tactical

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

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

template

Add: Chapter B

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

ui

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

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

ui_white

Merge branch 'master_lme' into dev

2025-12-19 15:13:21 +08:00

war_archives

Add: war_archives_20221222_cn

2025-12-29 19:04:08 +08:00

webui

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

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

exception.py

Merge branch 'feature/more' into dev

2025-05-18 22:03:42 +08:00

logger.py

…

logger.pyi

…

server_checker.py

fix: conflict between exit when server is under maintenance and instance restart

2025-07-17 17:14:36 +08:00