Zuosizhu f06d2b33df Merge branch 'master_lme' into lme_master ...

# Conflicts:
#	module/equipment/equipment.py

2024-05-19 00:46:33 +08:00

..

base

Pref: Release rpc connection on idle so OCR can be load balanced

2024-05-09 02:57:45 +08:00

campaign

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

coalition

Upd: [CN] Fleet preparation

2023-10-19 22:02:24 +08:00

combat

Fix: Add PAUSE in stuck record since is_combat_executing() bypassed appear()

2024-05-09 21:40:37 +08:00

commission

Fix: [TW] OCR error on commission name

2024-05-03 16:49:11 +08:00

config

Upd:[TW]Event:Upon the Shimmering Blue Rerun

2024-05-09 18:58:41 +08:00

daemon

Opt: No android versions selecting in benchmark

2024-04-08 04:11:50 +08:00

daily

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

device

Chore: [ALAS] Default image name in image_save

2024-05-09 18:46:53 +08:00

dorm

Fix: Chain call minitouch in dorm

2024-04-15 19:20:52 +08:00

equipment

Merge branch 'master_lme' into lme_master

2024-05-19 00:46:33 +08:00

event

…

exercise

Merge branch 'master_lme' into lme_master

2024-05-19 00:46:33 +08:00

freebies

Upd: Assets for entering supply pack

2023-07-14 00:31:52 +08:00

gacha

Fix: Continue gacha even if UR exchange point is full (#3582)

2024-03-29 03:28:29 +08:00

game_setting

…

guild

Opt: Remove meaningless sleep from stone age

2024-04-20 02:50:12 +08:00

handler

Fix: W15 optimization (#3660)

2024-04-22 23:16:39 +08:00

hard

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

map

Fix: Predict swipe end

2024-04-30 17:42:56 +08:00

map_detection

Fix: relative_hsv_count was counting pixels in 3 channels

2024-05-02 16:47:11 +08:00

meowfficer

Upd:[TW]Update Meowfficer assets (#3341)

2023-12-08 18:02:31 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING

2023-09-28 16:26:20 +08:00

notify

Opt: [ALAS] Lazy import onepush

2024-04-28 17:12:03 +08:00

ocr

Fix: Add atomic OCR method on client side

2024-05-09 18:51:52 +08:00

os

Fix: Handle another PAUSE and remove direct use of PAUSE

2024-05-09 18:50:32 +08:00

os_ash

Merge pull request #2996 from guoh064/meta_reward

2023-09-25 18:29:46 +08:00

os_combat

Fix: Actively clear stuck records in combat

2023-10-14 21:03:58 +08:00

os_handler

Fix: Handle map events when entering storage

2024-04-23 00:13:31 +08:00

raid

Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL

2024-03-29 03:21:10 +08:00

research

Upd:[TW]research assets (#3721)

2024-05-03 14:49:42 +08:00

retire

Revert "Upd: Flagship changing (#3556)"

2024-04-27 12:58:56 +08:00

reward

Fix: _reward_mission_collect() calls should have minimum interval

2024-04-29 00:45:40 +08:00

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Fix: Retry getting stock limit

2024-05-06 00:59:16 +08:00

sos

Del: [CN][EN][JP] Disable SOS task

2023-06-08 16:49:57 +08:00

statistics

Fix: Limit text length when logging upload errors (#3242)

2023-11-01 01:48:42 +08:00

storage

Add: Siren templates in chapter A

2023-08-18 22:29:25 +08:00

submodule

Opt: No raw command textarea in FpyBenchmark

2023-05-09 14:40:24 +08:00

tactical

Fix: Handle MISSION_POPUP_ACK when receiving tactical class

2024-04-10 21:37:08 +08:00

template

Fix: Duplicated SheffieldIdol template

2024-04-26 04:01:06 +08:00

ui

Opt: Use MAIN_GOTO_FLEET instead of MAIN_GOTO_CAMPAIGN for faster switches with info_bar

2024-04-20 03:01:32 +08:00

war_archives

Add: War Archives The Way Home in the Night

2024-03-11 22:57:37 +08:00

webui

Fix: [ALAS] Deploy config wasn't redirected after Updater.delay()

2024-04-23 00:13:54 +08:00

exception.py

…

logger.py

…

logger.pyi

…

server_checker.py

…