0O0o0oOoO00 c154e76f4e Merge remote-tracking branch 'LmeSzinc/master' into refactor ...

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

2025-09-13 14:46:47 +08:00

..

awaken

Opt: Awaken Favourite Ships Only (#4957)

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

base

Fix: [ALAS] close pillow Image object

2025-06-09 13:06:52 +08:00

campaign

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

2025-09-13 14:46:47 +08:00

coalition

Fix: NEONCITY UI back and home

2025-06-28 19:36:07 +08:00

combat

Upd: [TW] ALCHEMIST_MATERIAL_CONFIRM

2025-08-10 18:01:55 +08:00

combat_ui

Upd: Battle UI Star

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

commission

fix: do not run commission, reward and reward logic error

2025-09-12 23:29:44 +08:00

config

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

2025-09-13 14:46:47 +08:00

daemon

Fix: [ALAS] Remove DroidCast testing on BlueStacks Air

2025-02-04 01:14:52 +08:00

daily

upd: [JP] OCR_REMAIN in daily (#4533)

2025-01-27 17:57:07 +08:00

device

Fix: [ALAS] BlueStacks Air serial auto increase from 127.0.0.1:5555 + 10*n

2025-09-08 23:37:45 +08:00

dorm

Pref: dorm_feed_quit should reuse screenshot

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

equipment

Fix: Skip NPC character when entering first ship in dock (#4725, #3678)

2025-04-11 01:46:06 +08:00

event

…

event_hospital

Chore: [ALAS] Reuse Switch.get() in Switch.appear()

2025-06-26 23:31:55 +08:00

eventstory

Upd: REWARD_GOT JP + EN asset (#5037)

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

exercise

add: add scheduler watcher support

2025-09-12 22:35:00 +08:00

freebies

Tmp: [TW] Disable shop before it confirm working

2025-08-29 21:53:46 +08:00

gacha

Fix: Gacha should not reuse coin ocr in shop

2025-08-26 00:48:01 +08:00

game_setting

…

guild

Fix: assets for EN and JP

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

handler

Fix: AUTO_SEARCH_OFF4 should in cn folder

2025-09-13 03:21:35 +08:00

hard

Fix bugs (#4569)

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

luahook

add: update every time and restart every time setting for hook

2025-09-13 00:08:48 +08:00

map

Fix: handle flare animation upon MAP_MODE_SWITCH_HARD

2025-09-13 02:19:14 +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

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

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

os

add: add scheduler watcher support

2025-09-12 22:35:00 +08:00

os_ash

Fix: MetaReward undefined category defaults to beacon (#5063)

2025-08-29 21:41:54 +08:00

os_combat

Opt: disable handle_get_items in OSCombat.combat_status (#5019)

2025-09-02 01:05:17 +08:00

os_handler

Fix: OS_CHECK may get detected while handling stories

2025-08-23 23:04:56 +08:00

os_shop

Opt: a better limit when items need to be handled amount (#4802)

2025-05-19 03:51:25 +08:00

private_quarters

fix: pq stuck when unknown ui

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

raid

Chore: Abstract OilExhausted as global internal exception

2025-03-28 02:10:52 +08:00

research

fix: do not run commission, reward and reward logic error

2025-09-12 23:29:44 +08:00

retire

Opt: clear interval of DOCK_SELECTED for faster ship changing (#5048)

2025-08-21 19:00:29 +08:00

reward

fix: do not run commission, reward and reward logic error

2025-09-12 23:29:44 +08:00

shipyard

Fix: Shipyard should not reuse coin ocr in shop

2025-08-26 18:31:15 -04:00

shop

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

2025-09-13 14:46:47 +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: 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

Opt: reduce downtime on select new ship for tactical lesson

2025-08-26 19:42:21 -04:00

template

Add: Chapter SP

2025-09-13 02:57:37 +08:00

ui

Fix: [EN] shop task; grid now uniform with other servers (#5081)

2025-08-29 21:36:37 +08:00

ui_white

…

war_archives

Add: war_archives_20220428_cn

2025-07-24 21:31:08 +08:00

webui

add: add instance watcher support

2025-09-13 14:41:52 +08:00

counter.py

add: base framework of game restart and instance restart

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

exception.py

Chore: Abstract OilExhausted as global internal exception

2025-03-28 02:10:52 +08:00

instance_watcher.py

add: add instance watcher support

2025-09-13 14:41:52 +08:00

logger.py

…

logger.pyi

…

scheduler_watcher.py

add: add scheduler watcher support

2025-09-12 22:35:00 +08:00

server_checker.py

…