Merge branch 'Fraze_Test' of http://49.51.180.244:3000/Soullies/Continentis into Fraze_Test

Browse Source

# Conflicts:
#	Assets/Mods/Basic/Localization/Localization_Basic_MageCards.csv

...

This commit is contained in:

FrazeRIP

2025-11-18 01:31:16 -06:00

parent aaf6ff72a2 8d6156d3d8

commit 13f2408fef

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available