Zuosizhu fbcb8f5292 Merge branch 'LmeSzinc:master' into 20230309

2023-06-18 03:01:08 +08:00

..

base

Merge branch 'LmeSzinc:master' into 20230309

2023-06-02 03:55:50 +08:00

campaign

Merge branch 'LmeSzinc:master' into 20230309

2023-06-14 22:05:37 +08:00

coalition

Merge branch 'LmeSzinc:master' into 20230309

2023-04-07 15:46:07 +08:00

combat

Merge branch 'LmeSzinc:master' into 20230309

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

commission

Fix: daily_event typo (fixed #2525)

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

config

Merge branch 'LmeSzinc:master' into 20230309

2023-06-14 22:05:37 +08:00

daemon

Merge branch 'LmeSzinc:master' into 20230309

2023-04-07 15:46:07 +08:00

daily

Fix: Update daily indexes

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

device

Merge branch 'LmeSzinc:master' into 20230309

2023-06-10 02:53:17 +08:00

dorm

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

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

equipment

Merge branch 'LmeSzinc:master' into 20230309

2023-04-07 15:46:07 +08:00

event

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

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

exercise

Merge branch 'master_lme'

2023-05-26 00:26:23 +08:00

freebies

Add: Option to delay buying weekly supply pack

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

gacha

Merge remote-tracking branch 'origin/20230309'

2023-06-15 00:29:19 +08:00

game_setting

…

gg_handler

Fix: use config.server instead of choose another time in GG Handler

2023-04-08 17:15:31 +08:00

guild

Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF

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

handler

Merge branch 'LmeSzinc:master' into 20230309

2023-05-16 22:08:54 +08:00

hard

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

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

log_res

commit stashed for GG

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

map

Merge branch 'LmeSzinc:master' into 20230309

2023-06-02 03:55:50 +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

Merge branch 'LmeSzinc:master' into 20230309

2023-06-18 03:01:08 +08:00

os_ash

Merge branch 'LmeSzinc:master' into 20230309

2023-06-10 02:53:17 +08:00

os_combat

Feature: Allow to use fleet mode in opsi

2023-02-12 02:02:01 +08:00

os_handler

Merge branch 'LmeSzinc:master' into 20230309

2023-06-10 02:53:17 +08:00

raid

Merge branch 'master_lme'

2023-03-24 16:33:37 +08:00

research

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

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

retire

Merge branch 'LmeSzinc:master' into 20230309

2023-06-14 22:05:37 +08:00

reward

…

shipyard

Feature: Change flagship and vanguard in Event hard mode when GemsFarming

2023-02-24 18:37:14 +08:00

shop

Merge branch 'LmeSzinc:master' into 20230309

2023-06-18 03:01:08 +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

Fix: tactical selecting ship not reset filter (#2758)

2023-06-12 18:38:55 +08:00

template

Add: Siren templates

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

ui

Merge branch 'LmeSzinc:master' into 20230309

2023-06-10 02:53:17 +08:00

war_archives

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

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

webui

Merge branch 'LmeSzinc:master' into 20230309

2023-06-14 22:05:37 +08:00

exception.py

Add: Stop Alas or GemsFarming when auto search settings could not be set

2023-02-28 20:29:30 +08:00

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

…