Zuosizhu 4d1fd01511 Merge branch 'master_lme' ...

# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py

2023-05-15 17:22:33 +08:00

..

base

Merge branch 'master_lme'

2023-04-20 01:25:28 +08:00

campaign

Merge branch 'master_lme'

2023-05-15 17:22:33 +08:00

coalition

Merge branch 'LmeSzinc:master' into 20230309

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

combat

Merge branch 'master_lme'

2023-04-12 15:25:30 +08:00

commission

Fix: daily_event typo (fixed #2525)

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

config

Merge branch 'master_lme'

2023-05-15 17:22:33 +08:00

daemon

Merge branch 'LmeSzinc:master' into 20230309

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

daily

Fix: Update daily indexes

2023-04-13 18:46:06 +08:00

device

Merge branch 'LmeSzinc:master' into 20230309

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

dorm

Fix: Collect dorm loves and coins in non-U2 family control methods

2023-03-16 22:54:22 +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

Fix: Not delaying exercise time when strategy is aggressive

2023-04-14 00:20:31 +08:00

freebies

Add: Option to delay buying weekly supply pack

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

gacha

Merge branch 'master_lme'

2023-05-15 17:22:33 +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

Fix: Wrong attribute logged in _guild_logistics_collect()

2023-02-22 01:22:13 +08:00

handler

Merge branch 'master_lme'

2023-04-12 15:25:30 +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 'master_lme'

2023-04-20 01:25:28 +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: Wrong exit condition for meta_reward_exit

2023-05-09 20:46:01 +08:00

ocr

Opt: Move Class DatedDuration to exercise.py

2023-04-09 09:09:49 +08:00

os

Merge branch 'master_lme'

2023-05-15 17:22:33 +08:00

os_ash

Merge branch 'master_lme'

2023-05-15 17:22:33 +08:00

os_combat

Feature: Allow to use fleet mode in opsi

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

os_handler

Merge branch 'master_lme'

2023-04-20 01:25:28 +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 'master_lme'

2023-05-15 17:22:33 +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 master

2023-03-09 00:54:24 +08:00

sos

Fix: [TW] SOS chapter 10 is OCRed as 0

2023-03-01 00:37:45 +08:00

statistics

Fix: Handle thumb.db file when loading shop templates

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

storage

Fix: Confirm equipment dissemble but nothing is selected

2023-05-07 21:10:36 +08:00

submodule

…

tactical

Fix: Catch unexpected OCR result on empty skill slot

2023-04-12 12:55:36 +08:00

template

Add: TEMPLATE_META_DOCK_RED_DOT for other servers

2023-05-07 22:21:20 +08:00

ui

Merge branch 'LmeSzinc:master' into 20230309

2023-04-25 00:05:26 +08:00

war_archives

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

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

webui

Merge branch 'master_lme'

2023-05-15 17:22:33 +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

Fix: Ignore global proxy in server checker

2023-01-01 14:54:33 +08:00