LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 12:59:25 +08:00
Code Activity

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -77,6 +77,9 @@ cmake-build-*/
# IntelliJ
out/
# Visual Studio
.vs
# mpeltonen/sbt-idea plugin
.idea_modules/