xhqss a09ecb2ee1 Merge branch 'master_lme' into dev ...

# Conflicts:
#	module/config/argument/args.json

2025-12-20 23:31:25 +08:00

..

auto_login

Merge the remaining functions in MoreAlas

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

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 branch 'master_lme' into dev

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

cloud_phone

fix: call Restart after phone restarted

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

coalition

Merge branch 'master_lme' into dev

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

combat

Merge branch 'master_lme' into dev

2025-12-20 23:31:25 +08:00

combat_ui

Add:[CN] assets combat ui ShadowPuppetry (#5377)

2025-12-09 12:24:33 +08:00

commission

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

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

config

Merge branch 'master_lme' into dev

2025-12-20 23:31:25 +08:00

daemon

Add: cheat support for daemon

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

daily

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

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

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

Opt: Raise error if user is using EventABCD before stages unlocked

2023-03-10 23:30:28 +08:00

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 branch 'master_lme' into dev

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

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

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 branch 'master_lme' into dev

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

hard

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

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

log_res

Merge branch 'master_lme' into dev

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

luahook

add: luahook api retry

2025-10-04 18:46:47 +08:00

map

Merge branch 'master_lme' into dev

2025-12-20 23:31:25 +08:00

map_detection

Fix: Fixup submarine spawn point on init scan (#5117)

2025-09-22 04:29:46 +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

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 branch 'master_lme' into dev

2025-12-19 15:13:21 +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 branch 'Lme/master' into dev

2025-08-25 23:46:48 +08:00

os_shop

Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END

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

private_quarters

Upd: [TW]private_quarters update new_jersey (#5329)

2025-11-21 03:04:07 +08:00

raid

Merge branch 'master_lme' into dev

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

research

Merge branch 'master_lme' into dev

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

research_farming

Merge branch 'master_lme' into dev

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

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

Add: Commission Event Shop

2025-02-23 10:55:41 +08:00

sos

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

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

Add: Tools to do event story

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

tactical

Merge branch 'master_of_lme' into dev

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

template

Add: Chapter B

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

ui

Merge branch 'master_lme' into dev

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

ui_white

Merge branch 'master_lme' into dev

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

war_archives

Fix: [EN] TEMPLATE_RONDO_AT_RAINBOWS_END

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

webui

fix: prevent infinite instance restart loop

2025-07-18 13:33:22 +08:00

exception.py

Merge branch 'feature/more' into dev

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

logger.py

Sync: [SRC] Sync alas changes

2023-09-10 15:04:32 +08:00

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