LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 10:39:26 +08:00
Code Activity
Files
2a7232bea8f32983a7e2eb8ae2961f54e8dcdec5
Alas/module
History
LA-DI-DA 84b2dde422 Merge branch 'wait' into smallkai 
# Conflicts:
#	README.md
#	alas.py
#	assets/cn/gg_handler/BUTTON_GG_ENTER_POS.png
#	assets/cn/gg_handler/BUTTON_GG_TAB_SEARCH_POS.png
#	assets/gui/css/alas.css
#	config/template.json
#	module/campaign/assets.py
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/task.yaml
#	module/config/config_updater.py
#	module/config/i18n/ja-JP.json
#	module/log_res/log_res.py
2023-07-17 18:45:43 +08:00
..
base
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
campaign
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
coalition
Merge branch 'LmeSzinc:master' into 20230309
2023-04-07 15:46:07 +08:00
combat
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
commission
Fix: daily_event typo (fixed #2525)
2023-04-27 22:12:44 +08:00
config
Merge branch 'wait' into smallkai
2023-07-17 18:45:43 +08:00
daemon
Merge branch 'LmeSzinc:master' into 20230309
2023-06-30 19:51:52 +08:00
daily
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
device
Merge branch 'wait' into smallkai
2023-07-17 18:45:43 +08:00
dorm
Fix: Handle slowly loaded food in dorm (#2707)
2023-06-08 16:45:14 +08:00
equipment
Merge branch 'wait' into smallkai
2023-07-17 18:45:43 +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
…
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-07-15 20:26:12 +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-07-15 20:26:12 +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-07-01 20:57:27 +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: Wrong return in get_research_series_jp() (#2876)
2023-07-14 11:20:38 +08:00
retire
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
shipyard
Fix: Navigating to Odin in shipyard (#2611)
2023-07-02 16:56:05 +08:00
shop
Merge branch 'master_lme'
2023-07-15 20:26:12 +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
Fix: Digit ocr in storage since amount is no longer limited
2023-06-08 15:32:39 +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
Upd: [EN] various assets for server; war_archive, os_ash, template, and handler
2023-06-30 18:00:33 -04:00
ui
Merge branch 'master_lme'
2023-07-15 20:26:12 +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 'master_lme' into master_Dashboard
2023-06-22 01:09:21 +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
…
server_checker.py
…