ZuoSiZhu 39c18d8103 Merge remote-tracking branch 'lme/master' into dev ...

# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py

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

..

awaken

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

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

base

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

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

campaign

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

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

coalition

Merge branch 'master_lme'

2024-12-20 23:51:48 +08:00

combat

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

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

combat_ui

Upd: Battle UI Pharaoh

2025-02-28 00:22:02 +08:00

commission

Revert "Upd: [JP] commission suffix ocr pre_process (#4403)"

2025-01-16 00:52:20 +08:00

config

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

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

daemon

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

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

daily

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

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

device

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

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

dorm

Fix: Subpress get_ship in dorm (#4488)

2025-01-04 22:44:56 +08:00

equipment

fix: diamond inheritance of FleetEquipment, EquipmentChange, Equipment, Dock

2025-02-14 18:38:30 +08:00

event

…

eventstory

Fix: get_event_story_state should not have interval

2025-01-02 00:49:13 +08:00

exercise

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

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

freebies

Upd: [TW] Battle pass assets

2025-01-16 18:30:19 +08:00

gacha

…

game_setting

…

gg_handler

Fix: No multiply when using multiplier+type-changer

2025-02-28 10:53:28 +08:00

guild

Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549)

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

handler

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

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

hard

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

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

log_res

…

map

Merge branch 'master_lme'

2025-01-19 15:59:20 +08:00

map_detection

Chore: Rename "threshold" in template matching to "similarity"

2024-12-09 15:37:25 +08:00

meowfficer

Upd: [EN] MEOWFFICER_BUY_ENTER

2025-01-04 21:21:35 +08:00

meta_reward

Upd: [JP] Assets for Meta sync

2025-02-23 01:29:16 +08:00

minigame

upd: [JP] COIN_HOLDER in minigame

2024-10-30 12:18:09 +08:00

notify

…

ocr

Fix: Add azur_lane_jp model to ModelProxyFactory

2025-01-17 22:57:43 +08:00

os

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

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

os_ash

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

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

os_combat

Merge branch 'master_lme'

2025-01-16 08:52:42 +08:00

os_handler

Merge branch 'master_lme'

2025-01-16 08:52:42 +08:00

os_shop

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

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

raid

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

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

research

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

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

research_farming

…

retire

fix: incorrect func redirection of Dock.dock_sort_method_dsc_set

2025-02-16 16:30:36 +08:00

reward

Fix: Expand search area of MISSION_WEEKLY_RED_DOT

2025-01-01 21:39:54 +08:00

shipyard

…

shop

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

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

sos

…

statistics

Fix: No drop image caching if no drop image save

2024-12-09 23:37:07 +08:00

storage

Refactor: Standardize the use of match_template_color()

2024-12-09 16:09:34 +08:00

submodule

Add: fake module PIL for webui (#4374)

2024-11-19 12:37:59 +08:00

tactical

Merge branch 'master_lme'

2025-01-16 08:52:42 +08:00

template

Add: Chapter B

2025-02-27 23:03:27 +08:00

ui

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

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

ui_white

Merge branch 'master_lme'

2025-01-19 15:59:20 +08:00

war_archives

Fix: Missing "/" in OcrDataKey (#4563)

2025-02-06 23:09:34 +08:00

webui

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

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

exception.py

…

logger.py

…

logger.pyi

…

server_checker.py

…