LmeSzinc 38f55a3a26 Merge branch 'master' into app ...

# Conflicts:
#	module/config/config.py
#	module/reward/reward.py

2021-09-30 21:26:25 +08:00

..

base

Opt: Remove ensure main after task finishes

2021-09-20 17:30:29 +08:00

campaign

Merge branch 'master' into app

2021-09-28 22:41:41 +08:00

combat

Refactor: Ash beacon assist

2021-09-25 00:38:53 +08:00

commission

Fix: Shortest commission filter

2021-09-28 22:35:13 +08:00

config

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00

daemon

Add: Auto fleet repair in os semi auto

2021-09-27 15:01:53 +08:00

daily

Refactor: Rest of the farming tasks

2021-09-28 00:47:49 +08:00

deploy

Refactor: Upgrade uiautomator2 to 2.16.7

2021-09-29 18:06:32 +08:00

device

Refactor: Upgrade uiautomator2 to 2.16.7

2021-09-29 18:06:32 +08:00

dorm

Refactor: Separate dorm to standalone module

2021-09-21 00:51:29 +08:00

equipment

Merge branch 'master' into app

2021-09-26 01:16:15 +08:00

event

Fix: Daily event SP is influenced by ENABLE_FLEET_REVERSE_IN_HARD in settings

2021-04-25 16:57:01 +08:00

exercise

Fix: OS explore scheduling

2021-09-26 18:47:00 +08:00

gacha

Opt: Retrying on clicking gacha confirm

2021-09-30 21:21:35 +08:00

guild

Refactor: Config generating

2021-09-26 00:04:11 +08:00

handler

Fix: Daily app restart

2021-09-25 00:51:51 +08:00

hard

Refactor: Hard module

2021-09-23 02:35:05 +08:00

map

Refactor: Emotion module

2021-09-24 20:24:46 +08:00

map_detection

Merge branch 'master' into app

2021-09-17 23:53:15 +08:00

meowfficer

Fix: Stop if encountered unexpected errors

2021-09-22 11:36:10 +08:00

ocr

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

os

Fix: OS explore scheduling

2021-09-26 18:47:00 +08:00

os_ash

Fix: Missing offset in ash combat status

2021-09-30 01:34:26 +08:00

os_combat

Refactor: OS module

2021-09-26 17:40:38 +08:00

os_handler

Refactor: OS module

2021-09-26 17:40:38 +08:00

raid

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

research

Refactor: Rename auto search configs

2021-09-15 23:50:30 +08:00

retire

Merge branch 'master' into app

2021-09-22 11:38:48 +08:00

reward

Merge pull request #632 from nEEtdo0d/gacha_reward_final

2021-09-30 20:20:45 +08:00

shipyard

Merge branch 'master' into app

2021-09-27 15:02:41 +08:00

shop

Fix: Line breaks in filters in shop module

2021-09-24 20:33:07 +08:00

sos

Refactor: SOS module

2021-09-24 21:51:44 +08:00

statistics

Refactor: Rename retire configs

2021-09-15 23:33:06 +08:00

tactical

Opt: Wait tactical books loading

2021-09-25 00:55:19 +08:00

template

Fix: [JP] SOS module assets

2021-09-04 17:37:05 +08:00

ui

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00

war_archives

Add: [EN, JP] War Archives daily option

2021-09-18 13:16:54 -04:00

exception.py

Refactor: More accurate exceptions and add friendly advices

2021-09-16 12:09:00 +08:00

logger.py

Rename configs in device, and research

2021-09-14 14:43:14 +08:00

update.py

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

2020-08-18 20:48:14 -03:00