LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 22:19:30 +08:00
Code Activity
7,741 Commits 12 Branches 0 Tags
4e69b65533c8800fbf49924a64f55ce9fdf79f8a
Commit Graph

542 Commits

Author SHA1 Message Date
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
Zuosizhu
8d2c52c94a Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-12-22 18:02:19 +08:00
LmeSzinc
1f3260d8a7 Add: Event entrance of Light-Chasing Sea of Stars (event_20231221_cn) 2023-12-21 23:33:32 +08:00
RilyLC
ed2a244891 Upd:[TW]Event:Parallel Superimposition (#3361) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-12-21 21:51:48 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme' 
# Conflicts:
#	module/device/device.py
 2023-12-16 00:39:48 +08:00
RilyLC
1da39e500e Upd:[TW]Event:The Ninja Scrolls: Azur Flash (#3323) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-30 16:13:57 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
LmeSzinc
530128ea49 Add: Event entrance of The Ninja Scrolls: Azur Flash (event_20231123_cn) 2023-11-24 00:43:34 +08:00
RilyLC
f7461e3ad1 Upd:[TW]Event:Northern Overture Rerun (#3306) 2023-11-23 22:41:47 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
Jiahao Yuan
114ffbdc9b Upd: campaign (#3274) 2023-11-10 11:28:11 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
LmeSzinc
74e631f431 Add: Event entrance of Tempesta and the Fountain of Youth (event_20231026_cn) 2023-10-28 21:01:26 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
appleapple802
d7c748f420 Upd: [TW] Raid event Fight On, Royal Maids! 2023-10-21 15:39:44 +08:00
Zuosizhu
12e8a83005 Opt: Allow to set opsifleet in opsistronghold 2023-10-20 09:06:27 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
4f110c047b Opt: Sort events in args.json and i18n 2023-10-14 22:58:57 +08:00
Ian Lee
e8b96eb55b Upd:[TW] Event:Inverted Orthant Rerun (#3192) 2023-10-14 20:33:32 +08:00
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