From 575eb8c5251b5351e9b4bff71fcd76a11bdef5d2 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 23 Apr 2019 12:35:09 -0400
Subject: update release notes

---
 docs/release-notes.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index c02b2dd2..56ed2c8f 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,10 +1,10 @@
 # Release notes
 ## 2.11.2
-Released 22 April 2019 for Stardew Valley 1.3.36.
+Released 23 April 2019 for Stardew Valley 1.3.36.
 
 * For players:
-  * Fixed error when a custom map references certain vanilla tilesheets on MacOS.
-  * Fixed compatibility with Arch Linux.
+  * Fixed error when a custom map references certain vanilla tilesheets on Linux/Mac.
+  * Fixed compatibility with some Linux distros.
 
 ## 2.11.1
 Released 17 March 2019 for Stardew Valley 1.3.36.
-- 
cgit 


From 26cac2c12a2b9ae7d486c000406deb2958f5fe30 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 8 Mar 2019 21:49:35 -0500
Subject: prevent invalid items from breaking menus on hover

---
 docs/release-notes.md                 |  6 ++++++
 src/SMAPI/Patches/ObjectErrorPatch.cs | 32 +++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 56ed2c8f..0b0bfbbc 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,4 +1,10 @@
 # Release notes
+## 3.0 (upcoming release)
+These changes have not been released yet.
+
+* For players:
+  * SMAPI now prevents invalid items from breaking menus on hover.
+
 ## 2.11.2
 Released 23 April 2019 for Stardew Valley 1.3.36.
 
diff --git a/src/SMAPI/Patches/ObjectErrorPatch.cs b/src/SMAPI/Patches/ObjectErrorPatch.cs
index 0481259d..d72201c3 100644
--- a/src/SMAPI/Patches/ObjectErrorPatch.cs
+++ b/src/SMAPI/Patches/ObjectErrorPatch.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using Harmony;
 using StardewModdingAPI.Framework.Patching;
 using StardewValley;
+using StardewValley.Menus;
 using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Patches
@@ -24,10 +24,17 @@ namespace StardewModdingAPI.Patches
         /// <param name="harmony">The Harmony instance.</param>
         public void Apply(HarmonyInstance harmony)
         {
-            MethodInfo method = AccessTools.Method(typeof(SObject), nameof(SObject.getDescription));
-            MethodInfo prefix = AccessTools.Method(this.GetType(), nameof(ObjectErrorPatch.Prefix));
+            // object.getDescription
+            harmony.Patch(
+                original: AccessTools.Method(typeof(SObject), nameof(SObject.getDescription)),
+                prefix: new HarmonyMethod(AccessTools.Method(this.GetType(), nameof(ObjectErrorPatch.Object_GetDescription_Prefix)))
+            );
 
-            harmony.Patch(method, new HarmonyMethod(prefix), null);
+            // IClickableMenu.drawToolTip
+            harmony.Patch(
+                original: AccessTools.Method(typeof(IClickableMenu), nameof(IClickableMenu.drawToolTip)),
+                prefix: new HarmonyMethod(AccessTools.Method(this.GetType(), nameof(ObjectErrorPatch.IClickableMenu_DrawTooltip_Prefix)))
+            );
         }
 
 
@@ -40,7 +47,7 @@ namespace StardewModdingAPI.Patches
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
-        private static bool Prefix(SObject __instance, ref string __result)
+        private static bool Object_GetDescription_Prefix(SObject __instance, ref string __result)
         {
             // invalid bigcraftables crash instead of showing '???' like invalid non-bigcraftables
             if (!__instance.IsRecipe && __instance.bigCraftable.Value && !Game1.bigCraftablesInformation.ContainsKey(__instance.ParentSheetIndex))
@@ -51,5 +58,20 @@ namespace StardewModdingAPI.Patches
 
             return true;
         }
+
+        /// <summary>The method to call instead of <see cref="IClickableMenu.drawToolTip"/>.</summary>
+        /// <param name="__instance">The instance being patched.</param>
+        /// <param name="hoveredItem">The item for which to draw a tooltip.</param>
+        /// <returns>Returns whether to execute the original method.</returns>
+        /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
+        [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
+        private static bool IClickableMenu_DrawTooltip_Prefix(IClickableMenu __instance, Item hoveredItem)
+        {
+            // invalid edible item cause crash when drawing tooltips
+            if (hoveredItem is SObject obj && obj.Edibility != -300 && !Game1.objectInformation.ContainsKey(obj.ParentSheetIndex))
+                return false;
+
+            return true;
+        }
     }
 }
-- 
cgit 


From 64331ffe8c8cb0fc19878bbf5349299c483f8d9d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Mar 2019 22:20:18 -0400
Subject: default Monitor.Log to trace

---
 docs/release-notes.md                     | 3 +++
 src/SMAPI.Mods.SaveBackup/ModEntry.cs     | 6 +++---
 src/SMAPI/Framework/DeprecationManager.cs | 2 +-
 src/SMAPI/Framework/Monitor.cs            | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 0b0bfbbc..1df3aa53 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,9 @@ These changes have not been released yet.
 * For players:
   * SMAPI now prevents invalid items from breaking menus on hover.
 
+* For modders:
+  * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
+
 ## 2.11.2
 Released 23 April 2019 for Stardew Valley 1.3.36.
 
diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
index d10131b3..30dbfbe6 100644
--- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs
+++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
@@ -46,7 +46,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
             }
             catch (Exception ex)
             {
-                this.Monitor.Log($"Error backing up saves: {ex}");
+                this.Monitor.Log($"Error backing up saves: {ex}", LogLevel.Error);
             }
         }
 
@@ -87,7 +87,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
                             catch (Exception ex) when (ex is TypeLoadException || ex.InnerException is TypeLoadException)
                             {
                                 // create uncompressed backup if compression fails
-                                this.Monitor.Log("Couldn't zip the save backup, creating uncompressed backup instead.");
+                                this.Monitor.Log("Couldn't zip the save backup, creating uncompressed backup instead.", LogLevel.Debug);
                                 this.Monitor.Log(ex.ToString(), LogLevel.Trace);
                                 this.RecursiveCopy(new DirectoryInfo(Constants.SavesPath), fallbackDir, copyRoot: false);
                             }
@@ -137,7 +137,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
                     }
                     catch (Exception ex)
                     {
-                        this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}");
+                        this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}", LogLevel.Error);
                     }
                 }
             }
diff --git a/src/SMAPI/Framework/DeprecationManager.cs b/src/SMAPI/Framework/DeprecationManager.cs
index 3153bbb4..984bb487 100644
--- a/src/SMAPI/Framework/DeprecationManager.cs
+++ b/src/SMAPI/Framework/DeprecationManager.cs
@@ -132,7 +132,7 @@ namespace StardewModdingAPI.Framework
                     else
                     {
                         this.Monitor.Log(message, level);
-                        this.Monitor.Log(warning.StackTrace);
+                        this.Monitor.Log(warning.StackTrace, LogLevel.Debug);
                     }
                 }
             }
diff --git a/src/SMAPI/Framework/Monitor.cs b/src/SMAPI/Framework/Monitor.cs
index 47ebc2d7..617bfd85 100644
--- a/src/SMAPI/Framework/Monitor.cs
+++ b/src/SMAPI/Framework/Monitor.cs
@@ -78,7 +78,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Log a message for the player or developer.</summary>
         /// <param name="message">The message to log.</param>
         /// <param name="level">The log severity level.</param>
-        public void Log(string message, LogLevel level = LogLevel.Debug)
+        public void Log(string message, LogLevel level = LogLevel.Trace)
         {
             this.LogImpl(this.Source, message, (ConsoleLogLevel)level);
         }
-- 
cgit 


From 29d11a72c27c659b95e8d5eaa8b41463c2371638 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 18 Mar 2019 00:41:07 -0400
Subject: fix release note

---
 docs/release-notes.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 1df3aa53..5ba19e43 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -24,8 +24,10 @@ Released 17 March 2019 for Stardew Valley 1.3.36.
   * Updated mod compatibility list.
   * Fixed `world_clear` console command removing chests edited to have a debris name.
 
-* For the web UI:
+* For modders:
   * Added support for suppressing false-positive warnings in rare cases.
+
+* For the web UI:
   * The log parser now collapses redundant sections by default.
   * Fixed log parser column resize bug.
 
-- 
cgit 


From 20912724a0dc61562ea00e12e9bbc472c93e6aa4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 27 Mar 2019 21:13:46 -0400
Subject: fix errors during early startup not shown before exit

---
 docs/release-notes.md |  1 +
 src/SMAPI/Program.cs  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 5ba19e43..b22909f7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,7 @@ These changes have not been released yet.
 
 * For players:
   * SMAPI now prevents invalid items from breaking menus on hover.
+  * Fixed errors during early startup not shown before exit.
 
 * For modders:
   * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 2eec371c..3a34872a 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -30,10 +30,18 @@ namespace StardewModdingAPI
         /// <param name="args">The command-line arguments.</param>
         public static void Main(string[] args)
         {
-            AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve;
-            Program.AssertGamePresent();
-            Program.AssertGameVersion();
-            Program.Start(args);
+            try
+            {
+                AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve;
+                Program.AssertGamePresent();
+                Program.AssertGameVersion();
+                Program.Start(args);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"SMAPI failed to initialise: {ex}");
+                Program.PressAnyKeyToExit(true);
+            }
         }
 
 
-- 
cgit 


From 36efdcfce2c76df2dd5313f6a42ddb76467cf610 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 14 Apr 2019 22:04:32 -0400
Subject: update release notes (#636)

---
 docs/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index b22909f7..6c9636c7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,7 @@ These changes have not been released yet.
 
 * For players:
   * SMAPI now prevents invalid items from breaking menus on hover.
+  * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!).
   * Fixed errors during early startup not shown before exit.
 
 * For modders:
-- 
cgit 


From e3a2c56a6d8c827240a2bd4ead86c7b412e826ab Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 9 May 2019 23:03:45 -0400
Subject: fix 'location list changed' verbose log not correctly listing changes

---
 docs/release-notes.md        | 1 +
 src/SMAPI/Framework/SGame.cs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 6c9636c7..fb6be0c0 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -9,6 +9,7 @@ These changes have not been released yet.
 
 * For modders:
   * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
+  * Fixed 'location list changed' verbose log not correctly listing changes.
 
 ## 2.11.2
 Released 23 April 2019 for Stardew Valley 1.3.36.
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 9818314a..704eb6bc 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -705,8 +705,8 @@ namespace StardewModdingAPI.Framework
 
                             if (this.Monitor.IsVerbose)
                             {
-                                string addedText = this.Watchers.LocationsWatcher.Added.Any() ? string.Join(", ", added.Select(p => p.Name)) : "none";
-                                string removedText = this.Watchers.LocationsWatcher.Removed.Any() ? string.Join(", ", removed.Select(p => p.Name)) : "none";
+                                string addedText = added.Any() ? string.Join(", ", added.Select(p => p.Name)) : "none";
+                                string removedText = removed.Any() ? string.Join(", ", removed.Select(p => p.Name)) : "none";
                                 this.Monitor.Log($"Context: location list changed (added {addedText}; removed {removedText}).", LogLevel.Trace);
                             }
 
-- 
cgit 


From 77f85a701a1487539e1c54a4a7d7f92d58f99cc9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 15 May 2019 20:51:28 -0400
Subject: update mod list filters to always display clicked mod link

---
 docs/release-notes.md                      | 3 +++
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 4 ++--
 src/SMAPI.Web/wwwroot/Content/js/mods.js   | 9 +++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index fb6be0c0..99e05016 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -7,6 +7,9 @@ These changes have not been released yet.
   * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!).
   * Fixed errors during early startup not shown before exit.
 
+* For the web UI:
+  * When filtering the mod list, clicking a mod link now automatically adds it to the visible mods.
+
 * For modders:
   * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
   * Fixed 'location list changed' verbose log not correctly listing changes.
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index babd0bd3..dff37d7d 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -17,10 +17,10 @@
     {
         <meta name="robots" content="noindex" />
     }
-    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20190314" />
+    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20190515" />
     <script src="https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.min.js" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js" crossorigin="anonymous"></script>
-    <script src="~/Content/js/log-parser.js?r=20190310"></script>
+    <script src="~/Content/js/log-parser.js?r=20190515"></script>
     <script>
         $(function() {
             smapi.logParser({
diff --git a/src/SMAPI.Web/wwwroot/Content/js/mods.js b/src/SMAPI.Web/wwwroot/Content/js/mods.js
index 874fbf25..1c9562bb 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/mods.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/mods.js
@@ -87,8 +87,6 @@ smapi.modList = function (mods, enableBeta) {
     else
         delete data.filters.betaStatus;
 
-    window.boop = data.filters;
-
     // init mods
     for (var i = 0; i < data.mods.length; i++) {
         var mod = mods[i];
@@ -188,6 +186,10 @@ smapi.modList = function (mods, enableBeta) {
             matchesFilters: function(mod, searchWords) {
                 var filters = data.filters;
 
+                // check hash
+                if (location.hash === "#" + mod.Slug)
+                    return true;
+
                 // check source
                 if (!filters.source.value.open.value && mod.SourceUrl)
                     return false;
@@ -281,4 +283,7 @@ smapi.modList = function (mods, enableBeta) {
         }
     });
     app.applyFilters();
+    window.addEventListener("hashchange", function () {
+        app.applyFilters();
+    });
 };
-- 
cgit 


From 7d755da3e2c20f8e157b88c9721d0a19fe52006e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 14 Jun 2019 01:38:50 -0400
Subject: fix log parser failing for logs with dot-delimited time formats

---
 docs/release-notes.md                           | 1 +
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 99e05016..f2e407f1 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -9,6 +9,7 @@ These changes have not been released yet.
 
 * For the web UI:
   * When filtering the mod list, clicking a mod link now automatically adds it to the visible mods.
+  * Fixed log parser failing in some cases due to time format localisation.
 
 * For modders:
   * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 3f33c0c1..595e6b49 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -15,7 +15,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Fields
         *********/
         /// <summary>A regex pattern matching the start of a SMAPI message.</summary>
-        private readonly Regex MessageHeaderPattern = new Regex(@"^\[(?<time>\d\d:\d\d:\d\d) (?<level>[a-z]+) +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex MessageHeaderPattern = new Regex(@"^\[(?<time>\d\d[:\.]\d\d[:\.]\d\d) (?<level>[a-z]+) +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's initial platform info message.</summary>
         private readonly Regex InfoLinePattern = new Regex(@"^SMAPI (?<apiVersion>.+) with Stardew Valley (?<gameVersion>.+) on (?<os>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-- 
cgit 


From b02c5459e19b2ac37b13a9d011dd20ea9a5fe922 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 11 Jul 2019 21:00:48 -0400
Subject: add Android instructions to log parser

---
 docs/release-notes.md                      |  1 +
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 10 ++++++++++
 2 files changed, 11 insertions(+)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index f2e407f1..87b142bc 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -9,6 +9,7 @@ These changes have not been released yet.
 
 * For the web UI:
   * When filtering the mod list, clicking a mod link now automatically adds it to the visible mods.
+  * Added log parser instructions for Android.
   * Fixed log parser failing in some cases due to time format localisation.
 
 * For modders:
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index dff37d7d..1b40cfa9 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -67,10 +67,20 @@ else if (Model.ParsedLog?.IsValid == true)
     <h2>Where do I find my SMAPI log?</h2>
     <div>What system do you use?</div>
     <ul id="os-list">
+        <li><input type="radio" name="os" value="android" id="os-android" /> <label for="os-android">Android</label></li>
         <li><input type="radio" name="os" value="linux" id="os-linux" /> <label for="os-linux">Linux</label></li>
         <li><input type="radio" name="os" value="mac" id="os-mac" /> <label for="os-mac">Mac</label></li>
         <li><input type="radio" name="os" value="windows" id="os-windows" /> <label for="os-windows">Windows</label></li>
     </ul>
+    <div data-os="android">
+        On Android:
+        <ol>
+            <li>Open a file app (like My Files or MT Manager).</li>
+            <li>Find the <code>StardewValley</code> folder on your internal storage.</li>
+            <li>Open the <code>ErrorLogs</code> subfolder.</li>
+            <li>The log file is <code>SMAPI-crash.txt</code> if it exists, otherwise <code>SMAPI-latest.txt</code>.</li>
+        </ol>
+    </div>
     <div data-os="linux">
         On Linux:
         <ol>
-- 
cgit 


From 6285c7954843557eec06cbae406c8ae436512803 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 12 Jul 2019 20:01:38 -0400
Subject:  prevent mods from crashing the game with invalid dialogue in more
 cases

---
 docs/release-notes.md                   |  1 +
 src/SMAPI/Patches/DialogueErrorPatch.cs | 41 +++++++++++++++++++++++++++++++--
 src/SMAPI/Patches/EventErrorPatch.cs    |  4 ++--
 src/SMAPI/Patches/LoadContextPatch.cs   |  8 +++----
 src/SMAPI/Patches/ObjectErrorPatch.cs   |  8 +++----
 5 files changed, 50 insertions(+), 12 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 87b142bc..3addb2d0 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@ These changes have not been released yet.
 * For players:
   * SMAPI now prevents invalid items from breaking menus on hover.
   * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!).
+  * SMAPI now prevents more invalid dialogues from crashing the game.
   * Fixed errors during early startup not shown before exit.
 
 * For the web UI:
diff --git a/src/SMAPI/Patches/DialogueErrorPatch.cs b/src/SMAPI/Patches/DialogueErrorPatch.cs
index 7d57464c..f1c25c05 100644
--- a/src/SMAPI/Patches/DialogueErrorPatch.cs
+++ b/src/SMAPI/Patches/DialogueErrorPatch.cs
@@ -21,6 +21,9 @@ namespace StardewModdingAPI.Patches
         /// <summary>Simplifies access to private code.</summary>
         private static Reflector Reflection;
 
+        /// <summary>Whether the <see cref="NPC.CurrentDialogue"/> getter is currently being intercepted.</summary>
+        private static bool IsInterceptingCurrentDialogue;
+
 
         /*********
         ** Accessors
@@ -48,7 +51,11 @@ namespace StardewModdingAPI.Patches
         {
             harmony.Patch(
                 original: AccessTools.Constructor(typeof(Dialogue), new[] { typeof(string), typeof(NPC) }),
-                prefix: new HarmonyMethod(this.GetType(), nameof(DialogueErrorPatch.Prefix))
+                prefix: new HarmonyMethod(this.GetType(), nameof(DialogueErrorPatch.Before_Dialogue_Constructor))
+            );
+            harmony.Patch(
+                original: AccessTools.Property(typeof(NPC), nameof(NPC.CurrentDialogue)).GetMethod,
+                prefix: new HarmonyMethod(this.GetType(), nameof(DialogueErrorPatch.Before_NPC_CurrentDialogue))
             );
         }
 
@@ -63,7 +70,7 @@ namespace StardewModdingAPI.Patches
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
-        private static bool Prefix(Dialogue __instance, string masterDialogue, NPC speaker)
+        private static bool Before_Dialogue_Constructor(Dialogue __instance, string masterDialogue, NPC speaker)
         {
             // get private members
             bool nameArraysTranslated = DialogueErrorPatch.Reflection.GetField<bool>(typeof(Dialogue), "nameArraysTranslated").GetValue();
@@ -96,5 +103,35 @@ namespace StardewModdingAPI.Patches
 
             return false;
         }
+
+        /// <summary>The method to call instead of <see cref="NPC.CurrentDialogue"/>.</summary>
+        /// <param name="__instance">The instance being patched.</param>
+        /// <param name="__result">The return value of the original method.</param>
+        /// <param name="__originalMethod">The method being wrapped.</param>
+        /// <returns>Returns whether to execute the original method.</returns>
+        /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
+        [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
+        private static bool Before_NPC_CurrentDialogue(NPC __instance, ref Stack<Dialogue> __result, MethodInfo __originalMethod)
+        {
+            if (DialogueErrorPatch.IsInterceptingCurrentDialogue)
+                return true;
+
+            try
+            {
+                DialogueErrorPatch.IsInterceptingCurrentDialogue = true;
+                __result = (Stack<Dialogue>)__originalMethod.Invoke(__instance, new object[0]);
+                return false;
+            }
+            catch (TargetInvocationException ex)
+            {
+                DialogueErrorPatch.MonitorForGame.Log($"Failed loading current dialogue for NPC {__instance.Name}:\n{ex.InnerException ?? ex}", LogLevel.Error);
+                __result = new Stack<Dialogue>();
+                return false;
+            }
+            finally
+            {
+                DialogueErrorPatch.IsInterceptingCurrentDialogue = false;
+            }
+        }
     }
 }
diff --git a/src/SMAPI/Patches/EventErrorPatch.cs b/src/SMAPI/Patches/EventErrorPatch.cs
index b0074356..cd530616 100644
--- a/src/SMAPI/Patches/EventErrorPatch.cs
+++ b/src/SMAPI/Patches/EventErrorPatch.cs
@@ -42,7 +42,7 @@ namespace StardewModdingAPI.Patches
         {
             harmony.Patch(
                 original: AccessTools.Method(typeof(GameLocation), "checkEventPrecondition"),
-                prefix: new HarmonyMethod(this.GetType(), nameof(EventErrorPatch.Prefix))
+                prefix: new HarmonyMethod(this.GetType(), nameof(EventErrorPatch.Before_GameLocation_CheckEventPrecondition))
             );
         }
 
@@ -58,7 +58,7 @@ namespace StardewModdingAPI.Patches
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
-        private static bool Prefix(GameLocation __instance, ref int __result, string precondition, MethodInfo __originalMethod)
+        private static bool Before_GameLocation_CheckEventPrecondition(GameLocation __instance, ref int __result, string precondition, MethodInfo __originalMethod)
         {
             if (EventErrorPatch.IsIntercepted)
                 return true;
diff --git a/src/SMAPI/Patches/LoadContextPatch.cs b/src/SMAPI/Patches/LoadContextPatch.cs
index 43e09573..3f86c9a9 100644
--- a/src/SMAPI/Patches/LoadContextPatch.cs
+++ b/src/SMAPI/Patches/LoadContextPatch.cs
@@ -55,8 +55,8 @@ namespace StardewModdingAPI.Patches
         {
             harmony.Patch(
                 original: AccessTools.Method(typeof(Game1), nameof(Game1.loadForNewGame)),
-                prefix: new HarmonyMethod(this.GetType(), nameof(LoadContextPatch.Prefix)),
-                postfix: new HarmonyMethod(this.GetType(), nameof(LoadContextPatch.Postfix))
+                prefix: new HarmonyMethod(this.GetType(), nameof(LoadContextPatch.Before_Game1_LoadForNewGame)),
+                postfix: new HarmonyMethod(this.GetType(), nameof(LoadContextPatch.After_Game1_LoadForNewGame))
             );
         }
 
@@ -67,7 +67,7 @@ namespace StardewModdingAPI.Patches
         /// <summary>The method to call instead of <see cref="Game1.loadForNewGame"/>.</summary>
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
-        private static bool Prefix()
+        private static bool Before_Game1_LoadForNewGame()
         {
             LoadContextPatch.IsCreating = Game1.activeClickableMenu is TitleMenu menu && LoadContextPatch.Reflection.GetField<bool>(menu, "transitioningCharacterCreationMenu").GetValue();
             LoadContextPatch.TimesLocationsCleared = 0;
@@ -83,7 +83,7 @@ namespace StardewModdingAPI.Patches
 
         /// <summary>The method to call instead after <see cref="Game1.loadForNewGame"/>.</summary>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
-        private static void Postfix()
+        private static void After_Game1_LoadForNewGame()
         {
             if (LoadContextPatch.IsCreating)
             {
diff --git a/src/SMAPI/Patches/ObjectErrorPatch.cs b/src/SMAPI/Patches/ObjectErrorPatch.cs
index 0b17b101..5b918d39 100644
--- a/src/SMAPI/Patches/ObjectErrorPatch.cs
+++ b/src/SMAPI/Patches/ObjectErrorPatch.cs
@@ -27,13 +27,13 @@ namespace StardewModdingAPI.Patches
             // object.getDescription
             harmony.Patch(
                 original: AccessTools.Method(typeof(SObject), nameof(SObject.getDescription)),
-                prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.Object_GetDescription_Prefix))
+                prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.Before_Object_GetDescription))
             );
 
             // IClickableMenu.drawToolTip
             harmony.Patch(
                 original: AccessTools.Method(typeof(IClickableMenu), nameof(IClickableMenu.drawToolTip)),
-                prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.IClickableMenu_DrawTooltip_Prefix))
+                prefix: new HarmonyMethod(this.GetType(), nameof(ObjectErrorPatch.Before_IClickableMenu_DrawTooltip))
             );
         }
 
@@ -47,7 +47,7 @@ namespace StardewModdingAPI.Patches
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
-        private static bool Object_GetDescription_Prefix(SObject __instance, ref string __result)
+        private static bool Before_Object_GetDescription(SObject __instance, ref string __result)
         {
             // invalid bigcraftables crash instead of showing '???' like invalid non-bigcraftables
             if (!__instance.IsRecipe && __instance.bigCraftable.Value && !Game1.bigCraftablesInformation.ContainsKey(__instance.ParentSheetIndex))
@@ -65,7 +65,7 @@ namespace StardewModdingAPI.Patches
         /// <returns>Returns whether to execute the original method.</returns>
         /// <remarks>This method must be static for Harmony to work correctly. See the Harmony documentation before renaming arguments.</remarks>
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony.")]
-        private static bool IClickableMenu_DrawTooltip_Prefix(IClickableMenu __instance, Item hoveredItem)
+        private static bool Before_IClickableMenu_DrawTooltip(IClickableMenu __instance, Item hoveredItem)
         {
             // invalid edible item cause crash when drawing tooltips
             if (hoveredItem is SObject obj && obj.Edibility != -300 && !Game1.objectInformation.ContainsKey(obj.ParentSheetIndex))
-- 
cgit 


From e4d5b1d0dba0a7c2078327ef298d32bc8d45f25b Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 23 Aug 2019 16:18:51 -0400
Subject: fix 'unknown file extension' error not listing .json as a valid
 extension

---
 docs/release-notes.md                                    | 1 +
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/release-notes.md')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3addb2d0..2c3db5d1 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -7,6 +7,7 @@ These changes have not been released yet.
   * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!).
   * SMAPI now prevents more invalid dialogues from crashing the game.
   * Fixed errors during early startup not shown before exit.
+  * Fixed various error messages and inconsistent spelling.
 
 * For the web UI:
   * When filtering the mod list, clicking a mod link now automatically adds it to the visible mods.
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 6485b3d4..2c50ec04 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -136,7 +136,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                         throw GetContentError($"can't read unpacked map file directly from the underlying content manager. It must be loaded through the mod's {typeof(IModHelper)}.{nameof(IModHelper.Content)} helper.");
 
                     default:
-                        throw GetContentError($"unknown file extension '{file.Extension}'; must be one of '.png', '.tbin', or '.xnb'.");
+                        throw GetContentError($"unknown file extension '{file.Extension}'; must be one of '.json', '.png', '.tbin', or '.xnb'.");
                 }
             }
             catch (Exception ex) when (!(ex is SContentLoadException))
-- 
cgit 


From b7b8b001c5c2dc5d2c9fc1347532ca29368c2325 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 13 Sep 2019 18:20:27 -0400
Subject: update for release

---
 build/GlobalAssemblyInfo.cs                  | 4 ++--
 docs/release-notes.md                        | 8 ++++----
 src/SMAPI.Mods.ConsoleCommands/manifest.json | 4 ++--
 src/SMAPI.Mods.SaveBackup/manifest.json      | 4 ++--
 src/SMAPI/Constants.cs                       | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'docs/release-notes.md')

diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs
index ced7af52..a3ca3051 100644
--- a/build/GlobalAssemblyInfo.cs
+++ b/build/GlobalAssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("SMAPI")]
-[assembly: AssemblyVersion("2.11.2")]
-[assembly: AssemblyFileVersion("2.11.2")]
+[assembly: AssemblyVersion("2.11.3")]
+[assembly: AssemblyFileVersion("2.11.3")]
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 2c3db5d1..5a7d5ef2 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,11 +1,11 @@
 # Release notes
-## 3.0 (upcoming release)
-These changes have not been released yet.
+## 2.11.3
+Released 13 September 2019 for Stardew Valley 1.3.36.
 
 * For players:
   * SMAPI now prevents invalid items from breaking menus on hover.
   * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!).
-  * SMAPI now prevents more invalid dialogues from crashing the game.
+  * SMAPI now prevents more invalid dialogue from crashing the game.
   * Fixed errors during early startup not shown before exit.
   * Fixed various error messages and inconsistent spelling.
 
@@ -15,7 +15,7 @@ These changes have not been released yet.
   * Fixed log parser failing in some cases due to time format localisation.
 
 * For modders:
-  * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`.
+  * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`. The change will only take effect when you recompile the mod.
   * Fixed 'location list changed' verbose log not correctly listing changes.
 
 ## 2.11.2
diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
index f06a1296..74295410 100644
--- a/src/SMAPI.Mods.ConsoleCommands/manifest.json
+++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "2.11.2",
+    "Version": "2.11.3",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "2.11.2"
+    "MinimumApiVersion": "2.11.3"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
index be8a65d1..e147bd39 100644
--- a/src/SMAPI.Mods.SaveBackup/manifest.json
+++ b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "2.11.2",
+    "Version": "2.11.3",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "2.11.2"
+    "MinimumApiVersion": "2.11.3"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index cb3aa26e..9d686e2f 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -20,7 +20,7 @@ namespace StardewModdingAPI
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.2");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.3");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.36");
-- 
cgit