LA-DI-DA 2846c3cf42 Merge branch 'lme-alas/master' into wait ...

# Conflicts:
#	assets/gui/css/alas.css
#	module/config/config_updater.py

2023-06-20 22:42:40 +08:00

..

base

Chore: Remove the use of np.int

2023-05-30 10:28:51 +08:00

campaign

Merge branch 'lme-alas/master' into wait

2023-06-20 22:42:40 +08:00

coalition

Merge branch 'LmeSzinc:master' into master

2023-04-07 15:45:40 +08:00

combat

Merge branch 'LmeSzinc:master' into master

2023-05-26 09:51:35 +08:00

commission

Fix: daily_event typo (fixed #2525)

2023-04-27 22:12:44 +08:00

config

Merge branch 'lme-alas/master' into wait

2023-06-20 22:42:40 +08:00

daemon

Fix: Restart game in AzurLaneUncensored

2023-04-04 02:44:56 +08:00

daily

Fix: Update daily indexes

2023-06-15 22:45:37 +08:00

device

Merge branch 'lme-alas/master' into wait

2023-06-11 22:45:14 +08:00

dorm

Fix: Handle slowly loaded food in dorm (#2707)

2023-06-08 16:45:14 +08:00

equipment

Fix:Equipment change when in cloud

2023-05-03 23:42:36 +08:00

event

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

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

exercise

Upd: EXP_INFO_* and the exercise one

2023-05-25 21:45:19 +08:00

freebies

Add: Option to delay buying weekly supply pack

2023-02-19 00:45:35 +08:00

gacha

Merge branch 'LmeSzinc:master' into master

2023-05-30 12:30:46 +08:00

game_setting

…

guild

Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF

2023-06-10 01:39:23 +08:00

handler

Fix: [CN] Handle bilibili user agreement

2023-05-16 00:51:58 +08:00

hard

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

2023-02-18 01:19:04 +08:00

log_res

Fix: value log error

2023-02-14 08:12:54 +08:00

map

Chore: Remove the use of np.int

2023-05-30 10:28:51 +08:00

map_detection

Fix: Use the same edge_th in detect_edges() and generate()

2023-02-21 21:43:35 +08:00

meowfficer

Fix: MEOWFFICER_FEED_CANCEL click fails (#2428)

2023-03-31 00:20:20 +08:00

meta_reward

Fix: Temporarily disable dossier reward receive. (#2638)

2023-05-27 21:35:24 +08:00

ocr

Opt: Add Ocr.SHOW_REVISE_WARNING

2023-06-08 23:27:58 +08:00

os

Opt: print loading only once in interrupting_auto_search (#2764)

2023-06-15 22:08:49 +08:00

os_ash

Fix: Reverse meta assist help clicks (#2496)

2023-06-08 23:22:26 +08:00

os_combat

Fix: Too many clicks on SUBMARINE_READY in OpSi battles

2023-02-04 17:26:42 +08:00

os_handler

Merge branch 'lme-alas/master' into wait

2023-06-11 22:45:14 +08:00

raid

Merge branch 'LmeSzinc:master' into master

2023-03-24 10:49:02 +08:00

research

Fix: Appear animation of research project list (#2373)

2023-03-19 00:19:23 +08:00

retire

Fix: Retire confirm end at EQUIP_CONFIRM cause game is slow to process

2023-06-14 12:25:34 +08:00

reward

…

shipyard

Fix: Delay shipyard record to just before purchase confirm

2023-02-22 00:18:14 +08:00

shop

Merge branch 'lme-alas/master' into wait

2023-06-20 22:42:40 +08:00

sos

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

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

statistics

Fix: Handle thumb.db file when loading shop templates

2023-02-01 00:32:54 +08:00

storage

Fix: Digit ocr in storage since amount is no longer limited

2023-06-08 15:32:39 +08:00

submodule

Opt: No raw command textarea in FpyBenchmark

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

tactical

Merge branch 'lme-alas/master' into wait

2023-06-20 22:42:40 +08:00

template

Add: Siren templates

2023-05-27 18:56:49 +08:00

ui

Upd: [EN] ACADEMY_CHECK

2023-06-10 02:41:03 +08:00

war_archives

add war_archives: Northern Overture & Aurora Noctis, (#2576)

2023-05-13 19:51:59 +08:00

webui

Merge branch 'lme-alas/master' into wait

2023-06-20 22:42:40 +08:00

exception.py

…

logger.py

…

logger.pyi

Opt: Remove log output to stdout when using electron

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

notify.py

添加了类型判断，Onepush中某些中间件并不会返回Response而是返回NoneType(比如Discord)

2023-01-06 00:44:10 +08:00

server_checker.py

…