LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 19:19:29 +08:00
Code Activity
Files
26327087c971d6ca6eb8250352b3d3002fa79813
Alas/module
History
LA-DI-DA 26327087c9 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/shop/shop_reward.py
2023-10-19 23:03:07 +08:00
..
base
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
campaign
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-19 23:03:07 +08:00
coalition
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
combat
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
commission
Fix: daily_event typo (fixed #2525)
2023-04-27 22:12:44 +08:00
config
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-19 23:03:07 +08:00
daemon
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
daily
Fix: Error caused by loop of Daily Emergency Module Development (#3096)
2023-09-08 12:08:55 +08:00
device
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-12 20:53:59 +08:00
dorm
Fix: Handle random ocr error from OCR_DORM_FILL
2023-08-24 12:38:43 +08:00
equipment
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-08-04 18:22:15 +08:00
event
Fix: lack of setting emotion for auto event
2023-10-03 22:08:52 +08:00
exercise
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
freebies
Upd: Assets for entering supply pack
2023-07-14 00:31:52 +08:00
gacha
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
game_setting
…
gg_handler
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-19 16:25:29 +08:00
guild
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
handler
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
hard
…
log_res
…
map
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
map_detection
…
meowfficer
Fix: Increase threshold at empty slot of meowfficer enhance (#3155)
2023-10-06 00:15:34 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING
2023-09-28 16:26:20 +08:00
ocr
Opt: Add Ocr.SHOW_REVISE_WARNING
2023-06-08 23:27:58 +08:00
os
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
os_ash
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-09-30 19:46:14 +08:00
os_combat
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
os_handler
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
raid
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
research
Fix: get_research_series() (#2975)
2023-08-06 17:40:43 +08:00
research_farming
Fix: wrong click when checking ship's experience
2023-10-11 15:03:09 +08:00
retire
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
shipyard
[TW]Fix ash beacons and shipyard (#2999)
2023-08-11 19:06:10 +08:00
shop
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2023-10-19 23:03:07 +08:00
sos
Del: [CN][EN][JP] Disable SOS task
2023-06-08 16:49:57 +08:00
statistics
add: analysis resource collection (#3107)
2023-09-10 19:53:50 +08:00
storage
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
submodule
Opt: No raw command textarea in FpyBenchmark
2023-05-09 14:40:24 +08:00
tactical
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
template
Merge pull request #2996 from guoh064/meta_reward
2023-09-25 18:29:46 +08:00
ui
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
war_archives
add war_archive: Inverted orthant (#3089)
2023-09-08 01:14:18 +08:00
webui
Merge branch 'LmeSzinc:master' into 20230309
2023-10-04 17:10:01 +08:00
exception.py
Add: account's owner login detection
2023-09-22 12:24:08 +08:00
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
…
notify.py
…
server_checker.py
…