Merge branch 'master' into treasures

ParadoxGameConverters · Jan 28, 2025 · e251464 · e251464
2 parents 5890daa + 8fe499e
commit e251464
Show file tree

Hide file tree

Showing 5 changed files with 654 additions and 88 deletions.
diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AwesomeAssertions" Version="8.0.0-rc.3" />
+    <PackageReference Include="AwesomeAssertions" Version="8.0.0" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/ImperatorToCK3/CK3/Characters/CharactersLoader.cs b/ImperatorToCK3/CK3/Characters/CharactersLoader.cs
@@ -26,7 +26,7 @@ public void LoadCK3Characters(ModFilesystem ck3ModFS, Date bookmarkDate) {
 			loadedCharacters.Add(character);
 		});
 		parser.IgnoreAndLogUnregisteredItems();
-		parser.ParseGameFolder("history/characters", ck3ModFS, "txt", recursive: true);
+		parser.ParseGameFolder("history/characters", ck3ModFS, "txt", recursive: true, logFilePaths: true);
 
 		// Make all animation_test_ characters die on 2.1.1.
 		foreach (var character in loadedCharacters) {
+6 −5		Fronter.NET/App.axaml.cs
+1 −1		Fronter.NET/Fronter.csproj
+9 −10		Fronter.NET/ViewModels/MainWindowViewModel.cs
+4 −4		Fronter.NET/ViewModels/PathPickerViewModel.cs