LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 07:39:24 +08:00
Code Activity
Files
6550a56b2b0cfcc9fd94df0346705e322df36077
Alas/module
History
Zuosizhu 6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
2023-08-19 09:23:28 +08:00
..
base
Merge branch 'LmeSzinc:master' into 20230309
2023-08-04 00:20:16 +08:00
campaign
Merge branch 'master_lme'
2023-08-19 09:23:28 +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-07-29 22:04:54 +08:00
commission
Fix: daily_event typo (fixed #2525)
2023-04-27 22:12:44 +08:00
config
Merge branch 'master_lme'
2023-08-19 09:23:28 +08:00
daemon
Merge branch 'LmeSzinc:master' into 20230309
2023-08-08 20:40:20 +08:00
daily
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
device
Merge branch 'LmeSzinc:master' into 20230309
2023-08-08 20:40:20 +08:00
dorm
Fix: dorm_feed_enter() and dorm_feed_quit() on slow devices (#2922)
2023-08-02 00:57:27 +08:00
equipment
Merge branch 'LmeSzinc:master' into 20230309
2023-08-04 00:20:16 +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-07-15 20:26:12 +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
Add: Game settings extraction (#1685)
2022-10-01 16:08:45 +08:00
gg_handler
Fix: use config.server instead of choose another time in GG Handler
2023-04-08 17:15:31 +08:00
guild
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
handler
Merge branch 'master_lme'
2023-08-19 09:23:28 +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-08-19 09:23: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 20230309
2023-06-30 19:51:52 +08:00
os_ash
Merge branch 'LmeSzinc:master' into 20230309
2023-08-13 00:02:41 +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-07-15 20:26:12 +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
Merge branch 'master_lme'
2023-08-19 09:23:28 +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
Merge branch 'LmeSzinc:master' into 20230309
2023-08-13 00:02:41 +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
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
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
template
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
ui
Merge branch 'LmeSzinc:master' into 20230309
2023-07-21 00:07:23 +08:00
war_archives
Upd: [EN] various assets for server; war_archive, os_ash, template, and handler
2023-06-30 18:00:33 -04:00
webui
Merge branch 'LmeSzinc:master' into 20230309
2023-08-08 20:40:20 +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
Opt: typing for logger
2022-08-22 13:42:05 +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
Fix: Ignore global proxy in server checker
2023-01-01 14:54:33 +08:00