LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 23:29:27 +08:00
Code Activity
Files
75a3fc9e255ec714e43425344b4099b0e1c28262
Alas/module
History
LA-DI-DA 75a3fc9e25 Merge branch 'zuosizhu-alas/20230309' into dev 
# Conflicts:
#	module/config/argument/task.yaml
#	module/device/device.py
2023-09-23 22:41:37 +08:00
..
base
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
campaign
Bug fix
2023-09-16 21:03:38 +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
Merge branch 'zuosizhu-alas/20230309' into dev
2023-09-23 22:41:37 +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 'zuosizhu-alas/20230309' into dev
2023-09-23 22:41:37 +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
Opt: Raise error if user is using EventABCD before stages unlocked
2023-03-10 23:30:28 +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
Opt: Restart emulator in some cases
2023-09-16 16:29:12 +08:00
guild
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
handler
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +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
Add: handle retirement when map preparation after clicking MAP_PREPARATION
2023-09-16 12:28: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
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
meta_reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +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 'master_lme'
2023-09-02 17:47:24 +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
retire
Add: account's owner login detection
2023-09-22 12:24:08 +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
Add: TEMPLATE_SIREN_Zuiho
2023-09-15 02:37:23 +08:00
ui
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-09-11 21:48:50 +08:00
war_archives
add war_archive: Inverted orthant (#3089)
2023-09-08 01:14:18 +08:00
webui
Merge branch 'master_lme'
2023-09-20 18:52:47 +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
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
…