LA-DI-DA 9b7dc96de7 Merge branch '0O0o0oOoO00-alas/smallkai' into dev ...

# Conflicts:
#	module/gg_handler/change_ship.py

2023-10-05 19:36:52 +08:00

..

base

Merge branch 'LmeSzinc:master' into 20230309

2023-09-22 08:15:14 +08:00

campaign

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

2023-10-05 19:36:52 +08:00

coalition

Merge branch 'master_lme'

2023-09-02 17:47:24 +08:00

combat

Fix(tmp): inappropriate lv32 trigger when using "GemsFarming" which set to hard mode map

2023-09-15 20:09:52 +08:00

commission

Fix: daily_event typo (fixed #2525)

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

config

Upd: description of changing ship type

2023-10-05 19:32:04 +08:00

daemon

Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature

2023-09-11 20:24:49 +08:00

daily

Fix: Error caused by loop of Daily Emergency Module Development (#3096)

2023-09-08 12:08:55 +08:00

device

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

2023-10-05 19:36:52 +08:00

dorm

Fix: Handle random ocr error from OCR_DORM_FILL

2023-08-24 12:38:43 +08:00

equipment

Merge branch 'zuosizhu-alas/20230309' into smallkai

2023-08-04 18:22:15 +08:00

event

Fix: lack of setting emotion for auto event

2023-10-03 22:08:52 +08:00

exercise

Del: useless small game

2023-08-18 20:34:54 +08:00

freebies

Upd: Assets for entering supply pack

2023-07-14 00:31:52 +08:00

gacha

Merge branch 'master_lme'

2023-07-15 20:26:12 +08:00

game_setting

…

gg_handler

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

2023-10-05 19:36:52 +08:00

guild

Refactor: [ALAS] Page class

2023-07-02 15:24:40 +08:00

handler

Merge branch 'LmeSzinc:master' into 20230309

2023-10-04 17:10:01 +08:00

hard

…

log_res

…

map

Add: handle retirement when map preparation after clicking MAP_PREPARATION

2023-09-16 12:28:28 +08:00

map_detection

…

meowfficer

Refactor: [ALAS] Page class

2023-07-02 15:24:40 +08:00

meta_reward

Del: unused DOSSIER_REWARD_NOTICE.png

2023-09-09 08:53:51 +08:00

minigame

Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING

2023-09-28 16:26:20 +08:00

ocr

Opt: Add Ocr.SHOW_REVISE_WARNING

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

os

Merge branch 'LmeSzinc:master' into merged_origin_feature

2023-09-16 07:53:41 +08:00

os_ash

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

2023-09-30 19:46:14 +08:00

os_combat

Merge branch 'master_lme'

2023-09-11 08:16:09 +08:00

os_handler

Merge branch 'LmeSzinc:master' into 20230309

2023-09-22 08:15:14 +08:00

raid

Merge branch 'master_lme'

2023-07-15 20:26:12 +08:00

research

Fix: get_research_series() (#2975)

2023-08-06 17:40:43 +08:00

research_farming

Add: research farming(half-finished)

2023-10-05 14:42:06 +08:00

retire

Add: change ship type for GemsFarming when set C or D map

2023-09-30 16:50:01 +08:00

reward

Refactor: [ALAS] Page class

2023-07-02 15:24:40 +08:00

shipyard

[TW]Fix ash beacons and shipyard (#2999)

2023-08-11 19:06:10 +08:00

shop

Add: enable option for every shop in shop once

2023-09-20 13:36:43 +08:00

sos

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

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

statistics

add: analysis resource collection (#3107)

2023-09-10 19:53:50 +08:00

storage

Add: Siren templates in chapter A

2023-08-18 22:29:25 +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-07-02 17:28:05 +08:00

template

Merge pull request #2996 from guoh064/meta_reward

2023-09-25 18:29:46 +08:00

ui

Merge branch 'zuosizhu-alas/20230309' into smallkai-dev

2023-09-30 16:50:09 +08:00

war_archives

add war_archive: Inverted orthant (#3089)

2023-09-08 01:14:18 +08:00

webui

Merge branch 'LmeSzinc:master' into 20230309

2023-10-04 17:10:01 +08:00

exception.py

Add: account's owner login detection

2023-09-22 12:24:08 +08:00

logger.py

Sync: [SRC] Sync alas changes

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

logger.pyi

…

notify.py

…

server_checker.py

…