LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 19:29:27 +08:00
Code Activity
7,599 Commits 12 Branches 0 Tags
4caa2e2aec2ffd1c37253fbcddf4c6bdbfca7120
Commit Graph

521 Commits

Author SHA1 Message Date
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
Tipsy Fisher
dcf5075926 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +08:00
Zuosizhu
5dd82fb419 Merge branch 'master_lme' into merged_origin_feature 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-09-15 08:16:37 +08:00
Tipsy Fisher
c2551f5c8e Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 01:07:00 +08:00
LmeSzinc
4d50f15f3b Add: Event entrance of Effulgence Before Eclipse (event_20230914_cn) 2023-09-15 00:13:16 +08:00
Ian Lee
5474628561 Upd:[TW] Event:Violet Tempest Blooming Lycoris (#3118) 2023-09-14 22:43:35 +08:00
Zuosizhu
8bcb3808f8 Fix: Accidentally deleted Event-3 2023-09-13 07:55:49 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
yypsybs
369c80d991 Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-11 10:29:52 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
08a6d4611c Fix: Event schedule 2023-09-09 19:49:09 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
somegituser
17b13f6c6c add war_archive: Inverted orthant (#3089) 
新增作战档案：负象限作战
 2023-09-08 01:14:18 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
Zuosizhu
f55daeaf45 Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes. 2023-08-27 22:14:28 +08:00
Ian Lee
92b5cf85d2 Upd:[TW] Event:Frostfall (#3049) 2023-08-25 12:35:45 +08:00
Tipsy Fisher
0e5bebd25f Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-19 15:47:51 +08:00
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
guoh064
1c8589c104 Merge remote-tracking branch 'LmeSzinc/dev' into event_20230817_cn 2023-08-18 06:33:13 +08:00
Ian Lee
7c088ed5b7 Upd:[TW] Event:Aurora Noctis Rerun (#3024) 2023-08-17 23:48:42 +08:00
guoh064
59b3a247bf Add: event entrance of The Fool's Scales (event_20230817_cn) 2023-08-17 13:27:08 +08:00
yypsybs
89e40134b4 Merge branch 'master' into dev-minigame-for-pr 2023-08-04 11:53:54 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
29248bf6bf Add: Event entrance of Anthem of Remembrance (event_20230803_cn) 2023-08-03 20:41:13 +08:00
Ian Lee
d5c8c992f7 Upd:[TW] Event:World-spanning Arclight Rerun (#2961) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:World-spanning Arclight Rerun
 2023-08-03 18:51:49 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
Ian Lee
c0dce237fd Upd:[TW] Event:Dreamwaker's Butterfly Rerun (#2938) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun

* Upd:[TW] Event:Dreamwaker's Butterfly Rerun
 2023-07-27 18:12:48 +08:00
Tipsy Fisher
6fca29e79c Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
4ef7d12973 Add: Event entrance of World-spanning Arclight Rerun (event_20230720_cn) 2023-07-20 23:10:00 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +08:00
LmeSzinc
88ce9fab44 Merge branch 'master' into feature 2023-07-16 17:47:14 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
Tipsy Fisher
a962b13343 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
Ian Lee
91e4100dc4 Upd: [TW] Event:Operation Convergence (#2871) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence

* Upd: [TW] Event:Operation Convergence
 2023-07-13 23:02:49 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
yypsybs
28cae91564 Opt: minigame 
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
 2023-07-11 18:00:03 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
LmeSzinc
46cc21fe6b Merge branch 'master' into feature 
# Conflicts:
#	module/daemon/uncensored.py
 2023-07-02 17:03:36 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LmeSzinc
6641d2f891 Fix: Provide simple uncensored instead 2023-06-30 15:37:09 +08:00
LmeSzinc
e96cd15bc9 Add: Event entrance of Reflections of the Oasis (raid_20230629) 2023-06-29 12:38:01 +08:00
Ian Lee
6f258a83b5 Upd: [TW] Event: Rondo at Rainbow's End (#2810) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾

* Upd: [TW] Event: Rondo at Rainbow's End
 2023-06-29 12:31:43 +08:00
Ian Nakiri
6d495e47a3 Upd: [TW] Event: Counterattack Within the Fjord Rerun (#2801) 
* Upd: [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update args.json

* Update zh-TW.json

* [TW] Event: Counterattack Within the Fjord Rerun

* Update Readme.md

* Update Readme.md

* 刪除資料夾
 2023-06-24 22:42:57 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00