xhqss 2ddc7fff1c Merge branch 'master_lme' ...

# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py

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

..

awaken

Upd: [EN] Allow running task Awaken

2025-01-05 03:18:24 +08:00

base

Merge branch 'master_lme'

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

campaign

Merge branch 'master_lme'

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

coalition

Merge branch 'master_lme'

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

combat

Merge branch 'master_lme'

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

combat_ui

Upd: [EN] QUIT_Christmas

2024-12-27 21:28:06 +08:00

commission

Fix: jp commission suffix pre_process (#4435)

2024-12-16 00:06:17 +08:00

config

Merge branch 'master_lme'

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

daemon

Merge branch 'refs/heads/LmeSzinc/master' into dev

2024-08-17 21:48:52 +08:00

daily

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

device

Merge branch 'master_lme'

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

dorm

Fix: Subpress get_ship in dorm (#4488)

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

equipment

Merge branch 'master_lme'

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

event

…

eventstory

Fix: get_event_story_state should not have interval

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

exercise

Merge branch 'master_lme'

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

freebies

Refactor: Standardize the use of match_template_color()

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

gacha

Merge branch 'refs/heads/lme-alas/master' into dev

2024-06-22 20:31:35 +08:00

game_setting

Reverts test code in commit ea68f68d

2024-06-28 03:23:28 +08:00

gg_handler

Fix: skip change ship in most situation

2024-07-26 01:26:58 +08:00

guild

Add: [JP] asset GUILD_MISSION_NEW (#4493)

2025-01-06 18:31:26 +08:00

handler

Merge branch 'master_lme'

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

hard

Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors

2024-07-20 15:30:44 +08:00

log_res

Fix: Cvl to bc/bb with common bb problem about Nevada

2024-07-20 15:31:37 +08:00

map

Merge branch 'master_lme'

2024-12-20 23:51:48 +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

Refactor: Standardize the use of match_template_color()

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

minigame

upd: [JP] COIN_HOLDER in minigame

2024-10-30 12:18:09 +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

Merge branch 'master_lme'

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

os_ash

Merge branch 'master_lme'

2024-12-20 23:51:48 +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 branch 'master_lme'

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

raid

Merge branch 'master_lme'

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

research

Merge branch 'master_lme'

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

research_farming

Ref: use exception to switch when check ship's exp

2024-07-18 18:18:47 +08:00

retire

Merge branch 'master_lme'

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

reward

Fix: Expand search area of MISSION_WEEKLY_RED_DOT

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

shipyard

Merge Lme/Master into dev

2024-07-22 16:45:29 +08:00

shop

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

sos

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

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

Upd: Enemy templates in event 20221222 to select weaker enemy

2025-01-10 13:10:11 +08:00

ui

Merge branch 'master_lme'

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

ui_white

Merge branch 'master_lme'

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

war_archives

Upd: war archives entrance

2024-10-20 21:58:34 +08:00

webui

Merge branch 'master_lme'

2024-11-21 23:45:00 +08:00

exception.py

Fix: set gemsfarming's ship filter to default after this task is set to campaign_main

2024-05-25 19:43:00 +08:00

logger.py

…

logger.pyi

…

server_checker.py

…