0O0o0oOoO00 f96b13fea2 Merge branch 'Lme/master' into dev ...

# Conflicts:
#	assets/cn/campaign/EVENT_20221124_ENTRANCE.png
#	campaign/event_20221124_cn/campaign_base.py
#	module/campaign/assets.py
#	module/config/argument/override.yaml
#	module/config/config_updater.py
#	module/retire/assets.py
#	module/shop/shop_reward.py

2025-08-16 14:24:45 +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 remote-tracking branch 'LmeSzinc/master' into dev

2025-06-17 13:19:30 +08:00

campaign

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

cloud_phone

fix: call Restart after phone restarted

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

coalition

Adj: remove the minimum oil limit of coalition

2025-07-09 18:28:57 +08:00

combat

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

combat_ui

Upd: Battle UI Star

2025-07-04 23:41:29 +08:00

commission

Add: ui_goto_event for event 20221124 cn and event 20250724 cn

2025-07-29 17:31:37 +08:00

config

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +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 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

dorm

Pref: dorm_feed_quit should reuse screenshot

2025-05-19 02:53:10 +08:00

equipment

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

event

…

event_hospital

Adj: remove the minimum oil limit of event hospital

2025-07-09 17:56:44 +08:00

eventstory

Fix: Event story ended at REWARD_GOT

2025-08-16 01:12:28 +08:00

exercise

add: add scheduler watcher to tasks

2025-08-06 18:12:49 +08:00

freebies

Tmp: Disable supply pack for now

2025-08-15 11:58:07 +08:00

gacha

…

game_setting

…

gg_handler

Fix: GGHandler won't restart game if Hook enabled

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

guild

Fix: assets for EN and JP

2025-06-27 22:18:08 +02:00

handler

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +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: add request time limit to luahook api

2025-06-14 19:12:58 +08:00

map

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

map_detection

Opt: Show enemy_genre without name prefix

2025-08-15 23:27:11 +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

…

os

add: add scheduler watcher to tasks

2025-08-06 18:12:49 +08:00

os_ash

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

2025-06-28 23:09:47 +08:00

os_combat

…

os_handler

Fix: wait for intermittent manjuu loading

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

os_shop

Merge branch 'master_lme' into dev

2025-05-21 04:17:08 +08:00

private_quarters

fix: pq stuck when unknown ui

2025-08-15 11:23:25 +08:00

raid

Merge the remaining functions in MoreAlas

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

research

Merge branch 'master_lme' into brocore_dev

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

research_farming

Merge branch 'master_lme' into dev

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

retire

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

reward

Upd: [TW] assets for _reward_wait_mission_list

2025-07-10 02:41:31 +08:00

shipyard

…

shop

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

shop_event

Add: Commission Event Shop

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

sos

…

statistics

Refactor: deep methods reworked for better performance

2025-03-17 01:39:06 +08:00

storage

Fix: Handle slow get items popup after disassemble (#5015)

2025-08-15 19:32:27 +08:00

submodule

Add: Tools to do event story

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

tactical

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

2025-06-17 13:19:30 +08:00

template

Add: Chapter T

2025-08-15 23:25:53 +08:00

ui

Merge branch 'Lme/master' into dev

2025-08-16 14:24:45 +08:00

ui_white

…

war_archives

Add: war_archives_20220428_cn

2025-07-24 21:31:08 +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

…

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