1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 18:19:25 +08:00
Files
Alas/module/device
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
..
2023-02-02 01:47:48 +08:00
2023-02-02 01:47:48 +08:00