LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 14:09:29 +08:00
Code Activity
7,580 Commits 12 Branches 0 Tags
79e449a258d2cc20eb8e23e1c95b2d930c8454bb
Commit Graph

507 Commits

Author SHA1 Message Date
LA-DI-DA
1bdb8c842a Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2023-09-15 11:17:08 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +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
LA-DI-DA
6a33eda8f2 Fix: lack of event option 2023-09-12 11:57:59 +08:00
LA-DI-DA
36528d6403 Adj: enable to show all event 2023-09-12 11:51:34 +08:00
LA-DI-DA
1156a76e77 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-12 11:09:18 +08:00
LA-DI-DA
e9ae87d070 Fix: Accidentally deleted Event-3 2023-09-11 23:11:41 +08:00
LA-DI-DA
7a716a2e3c Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-11 21:48:50 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
somegituser
17b13f6c6c add war_archive: Inverted orthant (#3089) 
新增作战档案：负象限作战
 2023-09-08 01:14:18 +08:00
LA_DI_DA
8368cce3fb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
 2023-09-03 19:13:52 +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
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +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
LA_DI_DA
174ea3530b Add: more option for auto restart when alas get a error 2023-08-27 14:53:24 +08:00
Ian Lee
92b5cf85d2 Upd:[TW] Event:Frostfall (#3049) 2023-08-25 12:35:45 +08:00
LA-DI-DA
400550390b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-19 10:46:52 +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
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +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
LA-DI-DA
8974c229a3 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-08-04 18:22:15 +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
LA-DI-DA
303c0629ae Add buy game coin 2023-07-24 00:17:44 +08:00
LA-DI-DA
f9fd4b41e4 Rewrite small game and shit 2023-07-23 16:06:49 +08:00
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
46f85afe26 Add something special 2023-07-21 21:48:43 +08:00
LA-DI-DA
d6abebc108 Add something special 2023-07-21 21:14:10 +08:00
LA-DI-DA
877660eb1b Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-07-21 18:58:28 +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
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +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
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
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
梦念逍遥
e0be9888f2 Add: Event entrance of The Mirror Involution Rerun(event 20210527 cn) (#2790) 
* Add: Event entrance of The Mirror Involution Rerun(event 20210527 cn)
 2023-06-21 22:49:53 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00