0O0o0oOoO00 75267083c9 Merge branch 'feature/more' into dev ...

# Conflicts:
#	alas.py
#	module/exception.py

2025-05-18 22:03:42 +08:00

..

auto_login

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

awaken

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +08:00

base

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

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

campaign

Merge branch 'feature/more' into dev

2025-05-18 22:03:42 +08:00

cloud_phone

fix: call Restart after phone restarted

2025-05-18 21:38:31 +08:00

coalition

Brute-force porting of LME updates to the event_20250417 branch

2025-04-18 00:07:46 +08:00

combat

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

2025-04-03 11:57:44 +08:00

combat_ui

Upd: [TW] QUIT_New

2025-03-29 01:09:54 +08:00

commission

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

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

config

Merge branch 'feature/more' into dev

2025-05-18 22:03:42 +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 the remaining functions in MoreAlas

2025-04-24 23:30:50 +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

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

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

event_hospital

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

2025-04-03 11:57:44 +08:00

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-04-03 11:57:44 +08:00

freebies

Opt: allow entering page_mail from page_main (#4752)

2025-05-17 10:07:51 +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

add: global speedup

2025-05-10 13:45:15 +08:00

guild

Revert commit ca0f483 for en only (#4629)

2025-03-02 15:42:08 +08:00

handler

fix: no check in_main before exit _handle_app_login after handle page_main popups

2025-04-01 01:46:25 +08:00

hard

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

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

log_res

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +08:00

luahook

fix: handle battle verify for global speedup of hook

2025-05-12 15:41:02 +08:00

map

Merge branch 'master_lme' into dev

2025-03-28 08:34:41 +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

Fix: Wait the circle loading animation in meta reward page

2025-03-20 19:17:47 +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 azur_lane_jp model to ModelProxyFactory

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

os

Fix: Meowfficer farming cd

2025-03-28 05:16:38 +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

fix: STRATEGIC_SEARCH_DEVICE_STOP will mis-clicked and switch opsi global map

2025-05-11 19:34:32 +08:00

os_shop

Fix: Yellow coins preserve in OS Shop

2025-03-04 20:26:31 +08:00

raid

Merge the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

research

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

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

research_farming

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +08:00

retire

Merge branch 'master_lme' into dev

2025-03-28 00:23:16 +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 the remaining functions in MoreAlas

2025-04-24 23:30:50 +08:00

shop_event

Add: Commission Event Shop

2025-02-23 10:55:41 +08:00

sos

Pref: Reuse image array to improve memory performance

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

statistics

Refactor: deep methods reworked for better performance

2025-03-17 01:39:06 +08:00

storage

Refactor: Standardize the use of match_template_color()

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

submodule

Add: Tools to do event story

2025-03-10 23:02:16 +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

Opt: allow entering page_mail from page_main (#4752)

2025-05-17 10:07:51 +08:00

ui_white

Merge branch 'master_lme'

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

war_archives

Add: War Archives 20220324 (#4698)

2025-03-29 01:11:26 +08:00

webui

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

2025-04-03 11:57:44 +08:00

exception.py

Merge branch 'feature/more' into dev

2025-05-18 22:03:42 +08:00

logger.py

Sync: [SRC] Sync alas changes

2023-09-10 15:04:32 +08:00

logger.pyi

…

server_checker.py

…