Merge branch 'develop' into stable

1 files changed, 6 insertions, 7 deletions

diff --git a/src/StardewModdingAPI/Framework/DeprecationManager.cs b/src/StardewModdingAPI/Framework/DeprecationManager.cs
index 6b95960b..153d8829 100644
--- a/src/StardewModdingAPI/Framework/DeprecationManager.cs
+++ b/src/StardewModdingAPI/Framework/DeprecationManager.cs
@@ -52,13 +52,12 @@ namespace StardewModdingAPI.Framework
             if (!this.MarkWarned(source ?? "<unknown>", nounPhrase, version))
                 return;
 
+            // show SMAPI 2.0 meta-warning
+            if(this.MarkWarned("SMAPI", "SMAPI 2.0 meta-warning", "2.0"))
+                this.Monitor.Log("Some mods may stop working in SMAPI 2.0 (but they'll work fine for now). Try updating mods with 'deprecated code' warnings; if that doesn't remove the warnings, let the mod authors know about this message or see http://community.playstarbound.com/threads/135000 for details.", LogLevel.Warn);
+
             // build message
-            string message = source != null
-                ? $"{source} used {nounPhrase}, which is deprecated since SMAPI {version}."
-                : $"An unknown mod used {nounPhrase}, which is deprecated since SMAPI {version}.";
-            message += severity != DeprecationLevel.PendingRemoval
-                ? " This will break in a future version of SMAPI."
-                : " It will be removed soon, so the mod will break if it's not updated.";
+            string message = $"{source ?? "An unknown mod"} uses deprecated code ({nounPhrase}).";
             if (source == null)
                 message += $"{Environment.NewLine}{Environment.StackTrace}";
 
@@ -70,7 +69,7 @@ namespace StardewModdingAPI.Framework
                     break;
 
                 case DeprecationLevel.Info:
-                    this.Monitor.Log(message, LogLevel.Warn);
+                    this.Monitor.Log(message, LogLevel.Debug);
                     break;
 
                 case DeprecationLevel.PendingRemoval: