LA_DI_DA b0f8ca1143 Merge upstream ...

# Conflicts:
#	README.md
#	module/config/argument/args.json
#	module/config/i18n/zh-CN.json
#	module/equipment/equipment.py

2024-05-16 19:58:51 +08:00

..

base

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

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

campaign

Merge upstream

2024-05-16 19:58:51 +08:00

coalition

Merge branch 'LmeSzinc:master' into master

2023-10-20 00:31:27 +08:00

combat

Merge upstream

2024-05-16 19:58:51 +08:00

commission

Fix: [TW] OCR error on commission name

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

config

Merge upstream

2024-05-16 19:58:51 +08:00

daemon

Opt: No android versions selecting in benchmark

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

daily

Upd: Flagship changing (#3556)

2024-04-19 01:40:40 +08:00

device

Merge upstream

2024-05-16 19:58:51 +08:00

dorm

Fix: Chain call minitouch in dorm

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

equipment

Merge upstream

2024-05-16 19:58:51 +08:00

event

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

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

exercise

Fix: Handle another PAUSE and remove direct use of PAUSE

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

freebies

Upd: Assets for entering supply pack

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

gacha

Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9)

2024-04-13 11:54:45 +08:00

game_setting

Add: Game settings extraction (#1685)

2022-10-01 16:08:45 +08:00

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

Upd: Flagship changing (#3556)

2024-04-19 01:40:40 +08:00

log_res

Fix: value log error

2023-02-14 08:12:54 +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

Merge upstream

2024-05-16 19:58:51 +08:00

raid

Merge pull request #10 from LmeSzinc/master

2024-03-29 07:38:02 +08:00

research

Upd:[TW]research assets (#3721)

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

retire

Fix: rename equipment functions (#3665)

2024-04-22 23:11:45 +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

Merge upstream

2024-05-16 19:58:51 +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

Merge branch 'zuosizhu-alas/master'

2024-04-17 18:28:24 +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

Merge upstream

2024-05-16 19:58:51 +08:00

exception.py

Monthly boss code optimization

2022-12-13 21:37:28 +08:00

logger.py

…

logger.pyi

Opt: Remove log output to stdout when using electron

2023-02-08 16:37:11 +08:00

server_checker.py

Fix: Ignore global proxy in server checker

2023-01-01 14:54:33 +08:00