1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 12:49:25 +08:00

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

# 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
217 changed files with 538 additions and 642 deletions

View File

@@ -321,6 +321,7 @@ class GeneratedConfig:
MeowfficerTrain_RetainTalentedGold = True
MeowfficerTrain_RetainTalentedPurple = True
MeowfficerTrain_EnhanceIndex = 1
MeowfficerTrain_MaxFeedLevel = 5
# Group `GuildLogistics`
GuildLogistics_Enable = True