diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-07-10 22:10:27 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-07-10 22:10:27 -0400 |
| commit | 674ad0d90f8780130a5fcefb3869acfe2315df2a (patch) | |
| tree | eb79fa170a0b74a34061ea1d6838ae5589131c85 /src/StardewModdingAPI/Framework/Models | |
| parent | 1edd98aef027faa768f56cf0b3591e64e20ba096 (diff) | |
| parent | 834aee92f222fa739d7daa6c71f48b7e0df47ffe (diff) | |
| download | SMAPI-674ad0d90f8780130a5fcefb3869acfe2315df2a.tar.gz SMAPI-674ad0d90f8780130a5fcefb3869acfe2315df2a.tar.bz2 SMAPI-674ad0d90f8780130a5fcefb3869acfe2315df2a.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/StardewModdingAPI/Framework/Models')
| -rw-r--r-- | src/StardewModdingAPI/Framework/Models/Manifest.cs | 2 | ||||
| -rw-r--r-- | src/StardewModdingAPI/Framework/Models/ManifestDependency.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/StardewModdingAPI/Framework/Models/Manifest.cs b/src/StardewModdingAPI/Framework/Models/Manifest.cs index 08b88025..1b5c2646 100644 --- a/src/StardewModdingAPI/Framework/Models/Manifest.cs +++ b/src/StardewModdingAPI/Framework/Models/Manifest.cs @@ -38,7 +38,7 @@ namespace StardewModdingAPI.Framework.Models /// <summary>The unique mod ID.</summary> public string UniqueID { get; set; } -#if !SMAPI_2_0 +#if SMAPI_1_x /// <summary>Whether the mod uses per-save config files.</summary> [Obsolete("Use " + nameof(Mod) + "." + nameof(Mod.Helper) + "." + nameof(IModHelper.ReadConfig) + " instead")] public bool PerSaveConfigs { get; set; } diff --git a/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs b/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs index 25d92a29..67f906e3 100644 --- a/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs +++ b/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs @@ -12,7 +12,7 @@ /// <summary>The minimum required version (if any).</summary> public ISemanticVersion MinimumVersion { get; set; } -#if SMAPI_2_0 +#if !SMAPI_1_x /// <summary>Whether the dependency must be installed to use the mod.</summary> public bool IsRequired { get; set; } #endif @@ -25,7 +25,7 @@ /// <param name="minimumVersion">The minimum required version (if any).</param> /// <param name="required">Whether the dependency must be installed to use the mod.</param> public ManifestDependency(string uniqueID, string minimumVersion -#if SMAPI_2_0 +#if !SMAPI_1_x , bool required = true #endif ) @@ -34,7 +34,7 @@ this.MinimumVersion = !string.IsNullOrWhiteSpace(minimumVersion) ? new SemanticVersion(minimumVersion) : null; -#if SMAPI_2_0 +#if !SMAPI_1_x this.IsRequired = required; #endif } |