1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 16:29:26 +08:00
Commit Graph

9 Commits

Author SHA1 Message Date
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge'
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
2024-04-27 13:00:39 +08:00
LmeSzinc
ccf51f6829 Chore: Re-arrange requirements list 2024-04-23 00:58:29 +08:00
Zuosizhu
9934be19fe Merge branch 'master_lme'
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
2023-12-29 14:46:10 +08:00
霞飛
c81f619579 fix: lock jellyfish version to 0.11.2 (#3384)
* fix: lock jellyfish version to 0.11.2

* chore: remove index url
2023-12-29 00:14:11 +08:00
LmeSzinc
343520cce7 Dep: Add uiautomator2cache 2023-04-19 22:24:04 +08:00
LmeSzinc
90e5d8f91c Dep: Add uiautomator2cache 2023-04-01 20:55:51 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +08:00
18870
079a3a8c61 Opt: Use logger in deploy 2022-06-25 20:24:34 +08:00
n0k0m3
214d0b42c1 Add explicit requirement file for docker deploy 2022-06-20 18:04:12 -04:00