diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-08 18:17:09 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-08 18:17:09 -0400 |
| commit | 5433f9023ed174366c8bf450785aafbdb077d29d (patch) | |
| tree | 3a4fc71371d5a1194c2f819444aa7fc32f739830 /src/SMAPI/Framework/ContentPack.cs | |
| parent | 8a51279ce943ff74b45ec7af308ecf59d73ace9b (diff) | |
| parent | d53e033163cfc4a876d6a3341979315a3d937a4f (diff) | |
| download | SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.tar.gz SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.tar.bz2 SMAPI-5433f9023ed174366c8bf450785aafbdb077d29d.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ContentPack.cs')
| -rw-r--r-- | src/SMAPI/Framework/ContentPack.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/ContentPack.cs b/src/SMAPI/Framework/ContentPack.cs index 55c1a0b2..65abba5b 100644 --- a/src/SMAPI/Framework/ContentPack.cs +++ b/src/SMAPI/Framework/ContentPack.cs @@ -62,7 +62,7 @@ namespace StardewModdingAPI.Framework { this.AssertRelativePath(path, nameof(this.ReadJsonFile)); - path = Path.Combine(this.DirectoryPath, PathUtilities.NormalizePathSeparators(path)); + path = Path.Combine(this.DirectoryPath, PathUtilities.NormalizePath(path)); return this.JsonHelper.ReadJsonFileIfExists(path, out TModel model) ? model : null; @@ -73,7 +73,7 @@ namespace StardewModdingAPI.Framework { this.AssertRelativePath(path, nameof(this.WriteJsonFile)); - path = Path.Combine(this.DirectoryPath, PathUtilities.NormalizePathSeparators(path)); + path = Path.Combine(this.DirectoryPath, PathUtilities.NormalizePath(path)); this.JsonHelper.WriteJsonFile(path, data); } |