Merge branch 'develop' into stable

3 files changed, 34 insertions, 18 deletions

diff --git a/src/SMAPI.Web/Views/Index/Index.cshtml b/src/SMAPI.Web/Views/Index/Index.cshtml
index ef092cc8..24b42e09 100644
--- a/src/SMAPI.Web/Views/Index/Index.cshtml
+++ b/src/SMAPI.Web/Views/Index/Index.cshtml
@@ -99,16 +99,15 @@ else
 
 <p>
     Special thanks to
-    AbroadKew,
     acerbicon,
     <a href="https://www.nexusmods.com/stardewvalley/users/31393530">ChefRude</a>,
-    cheesysteak,
+    <a href="https://github.com/dittusch">dittusch</a>,
     hawkfalcon,
+    <a href="https://twitter.com/iKeychain">iKeychain</a>,
     jwdred,
     <a href="https://www.nexusmods.com/users/12252523">Karmylla</a>,
     Pucklynn,
     Robby LaFarge,
-    Tarryn K.,
     and a few anonymous users for their ongoing support; you're awesome! 🏅
 </p>
 
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 21adf35b..babd0bd3 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -17,16 +17,17 @@
     {
         <meta name="robots" content="noindex" />
     }
-    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20190221" />
+    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20190314" />
     <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=20190221"></script>
+    <script src="~/Content/js/log-parser.js?r=20190310"></script>
     <script>
         $(function() {
             smapi.logParser({
                 logStarted: new Date(@Json.Serialize(Model.ParsedLog?.Timestamp)),
                 showPopup: @Json.Serialize(Model.ParsedLog == null),
                 showMods: @Json.Serialize(Model.ParsedLog?.Mods?.Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, slug => true), noFormatting),
+                showSections: @Json.Serialize(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, section => false), noFormatting),
                 showLevels: @Json.Serialize(defaultFilters, noFormatting),
                 enableFilters: @Json.Serialize(!Model.ShowRaw)
             }, '@Model.SectionUrl');
@@ -261,16 +262,32 @@ else if (Model.ParsedLog?.IsValid == true)
                 @foreach (var message in Model.ParsedLog.Messages)
                 {
                     string levelStr = message.Level.ToString().ToLower();
+                    string sectionStartClass = message.IsStartOfSection ? "section-start" : null;
+                    string sectionFilter = message.Section != null && !message.IsStartOfSection ? $"&& sectionsAllow('{message.Section}')" : null; // filter the message by section if applicable
 
-                    <tr class="@levelStr mod" v-show="filtersAllow('@Model.GetSlug(message.Mod)', '@levelStr')">
+                    <tr class="mod @levelStr @sectionStartClass"
+                        @if (message.IsStartOfSection)
+                        {
+                            <text>v-on:click="toggleSection('@message.Section')"</text>
+                        }
+                        v-show="filtersAllow('@Model.GetSlug(message.Mod)', '@levelStr') @sectionFilter">
                         <td v-pre>@message.Time</td>
                         <td v-pre>@message.Level.ToString().ToUpper()</td>
                         <td v-pre data-title="@message.Mod">@message.Mod</td>
-                        <td v-pre>@message.Text</td>
+                        <td>
+                            <span v-pre class="log-message-text">@message.Text</span>
+                            @if (message.IsStartOfSection)
+                            {
+                                <span class="section-toggle-message">
+                                    <template v-if="sectionsAllow('@message.Section')">This section is shown. Click here to hide it.</template>
+                                    <template v-else>This section is hidden. Click here to show it.</template>
+                                </span>
+                            }
+                        </td>
                     </tr>
                     if (message.Repeated > 0)
                     {
-                        <tr class="@levelStr mod mod-repeat" v-show="filtersAllow('@Model.GetSlug(message.Mod)', '@levelStr')">
+                        <tr class="@levelStr mod mod-repeat" v-show="filtersAllow('@Model.GetSlug(message.Mod)', '@levelStr') @sectionFilter">
                             <td colspan="3"></td>
                             <td v-pre><i>repeats [@message.Repeated] times.</i></td>
                         </tr>
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index a30a0048..5592078c 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -1,14 +1,14 @@
 @using Newtonsoft.Json
 @model StardewModdingAPI.Web.ViewModels.ModListModel
 @{
-    ViewData["Title"] = "SMAPI mod compatibility";
+    ViewData["Title"] = "Mod compatibility";
 }
 @section Head {
-    <link rel="stylesheet" href="~/Content/css/mods.css?r=20190125" />
+    <link rel="stylesheet" href="~/Content/css/mods.css?r=20190302" />
     <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="https://cdn.jsdelivr.net/npm/tablesorter@2.31.0/dist/js/jquery.tablesorter.combined.min.js" crossorigin="anonymous"></script>
-    <script src="~/Content/js/mods.js?r=20190125"></script>
+    <script src="~/Content/js/mods.js?r=20190302"></script>
     <script>
         $(function() {
             var data = @Json.Serialize(Model.Mods, new JsonSerializerSettings { Formatting = Formatting.None });
@@ -19,9 +19,9 @@
 }
 
 <div id="intro">
-    <p>This page lists all known SMAPI mods, whether they're compatible with the latest versions of Stardew Valley and SMAPI, and how to fix broken mods if possible. The list is updated every few days. (You can help <a href="https://stardewvalleywiki.com/Modding:SMAPI_compatibility">edit this list</a>!)</p>
+    <p>This page shows all known SMAPI mods and (incompatible) content packs, whether they work with the latest versions of Stardew Valley and SMAPI, and how to fix them if not. If a mod doesn't work after following the instructions below, check <a href="https://stardewvalleywiki.com/Modding:Player_Guide/Troubleshooting">the troubleshooting guide</a> or <a href="https://stardewvalleywiki.com/Modding:Player_Guide/Troubleshooting#Ask_for_help">ask for help</a>.</p>
 
-    <p>If a mod doesn't work after following the instructions below, check <a href="https://stardewvalleywiki.com/Modding:Player_Guide/Troubleshooting">the troubleshooting guide</a> or <a href="https://stardewvalleywiki.com/Modding:Player_Guide/Troubleshooting#Ask_for_help">ask for help</a>.</p>
+    <p>The list is updated every few days (you can help <a href="https://stardewvalleywiki.com/Modding:Mod_compatibility">update it</a>!). It doesn't include XNB mods (see <a href="https://stardewvalleywiki.com/Modding:Using_XNB_mods"><em>using XNB mods</em> on the wiki</a> instead) or compatible content packs.</p>
 
     @if (Model.BetaVersion != null)
     {
@@ -61,7 +61,7 @@
                 <th>compatibility</th>
                 <th v-show="showAdvanced">broke in</th>
                 <th v-show="showAdvanced">code</th>
-                <th v-show="showAdvanced"><a href="http://smapi.io/3.0">3.0</a></th>
+                <th><small><a href="http://smapi.io/3.0">3.0 ready</a></small></th>
                 <th>&nbsp;</th>
             </tr>
         </thead>
@@ -93,10 +93,10 @@
                     <span v-if="mod.SourceUrl"><a v-bind:href="mod.SourceUrl">source</a></span>
                     <span v-else class="mod-closed-source">no source</span>
                 </td>
-                <td v-show="showAdvanced">
-                    <small v-if="mod.LatestCompatibility.Status == 'ok' || mod.LatestCompatibility.Status == 'unofficial' || mod.Smapi3Status == 'ok' || mod.Smapi3Status == 'soon' || mod.Smapi3Url">
-                        <a v-if="mod.Smapi3Url" v-bind:href="mod.Smapi3Url">{{mod.Smapi3DisplayText}}</a>
-                        <template v-else>{{mod.Smapi3DisplayText}}</template>
+                <td class="smapi-3-col">
+                    <small v-if="mod.LatestCompatibility.Status == 'ok' || mod.LatestCompatibility.Status == 'unofficial' || mod.LatestCompatibility.Status == 'optional' || mod.Smapi3Status == 'ok' || mod.Smapi3Status == 'soon' || mod.Smapi3Url">
+                        <a v-if="mod.Smapi3Url" v-bind:href="mod.Smapi3Url" v-bind:title="mod.Smapi3Tooltip">{{mod.Smapi3DisplayText}}</a>
+                        <span v-else v-bind:title="mod.Smapi3Tooltip">{{mod.Smapi3DisplayText}}</span>
                     </small>
                 </td>
                 <td>