Merge branch 'develop' into stable

3 files changed, 44 insertions, 37 deletions

diff --git a/src/SMAPI.Web/Views/Index/Index.cshtml b/src/SMAPI.Web/Views/Index/Index.cshtml
index 24b42e09..249dc9d1 100644
--- a/src/SMAPI.Web/Views/Index/Index.cshtml
+++ b/src/SMAPI.Web/Views/Index/Index.cshtml
@@ -6,9 +6,9 @@
     ViewData["Title"] = "SMAPI";
 }
 @section Head {
-    <link rel="stylesheet" href="~/Content/css/index.css?r=20180615" />
+    <link rel="stylesheet" href="~/Content/css/index.css?r=20190620" />
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js" crossorigin="anonymous"></script>
-    <script src="~/Content/js/index.js?r=20180615"></script>
+    <script src="~/Content/js/index.js?r=20190620"></script>
 }
 
 <p id="blurb">
@@ -79,27 +79,32 @@ else
     <p>See the <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/release-notes.md#release-notes">release notes</a> and <a href="@SiteConfig.Value.ModListUrl">mod compatibility list</a> for more info.</p>
 }
 
-<h2 id="donate">Donate to support SMAPI ♥</h2>
+<h2 id="donate">Support SMAPI ♥</h2>
 <p>
     SMAPI is an open-source project by Pathoschild. It will always be free, but donations
     are much appreciated to help pay for development, server hosting, domain fees, coffee, etc.
 </p>
-<ul id="support-links">
-    <li><a href="https://www.paypal.me/pathoschild">Donate once</a></li>
+
+<ul id="donate-links">
+    <li>
+        <a href="https://www.patreon.com/pathoschild" class="donate-button">
+            <img src="Content/images/patreon.png" /> Become a patron
+        </a>
+    </li>
+    <li>
+        <a href="https://ko-fi.com/pathoschild" class="donate-button">
+            <img src="Content/images/ko-fi.png"/> Buy me a coffee
+        </a>
+    </li>
     <li>
-        <a href="https://www.patreon.com/pathoschild">Donate $1 per month (or more)</a><br />
-        <small>
-            You can cancel anytime. You'll have access to all private posts with behind-the-scenes
-            info, upcoming features, and early previews of SMAPI updates. You can optionally
-            provide early feedback on SMAPI features to influence development. Donate $5/month and
-            you'll be publicly credited (with optional link) below!
-        </small>
+        <a href="https://www.paypal.me/pathoschild" class="donate-button">
+            <img src="Content/images/paypal.png"/> Donate via PayPal
+        </a>
     </li>
 </ul>
 
 <p>
     Special thanks to
-    acerbicon,
     <a href="https://www.nexusmods.com/stardewvalley/users/31393530">ChefRude</a>,
     <a href="https://github.com/dittusch">dittusch</a>,
     hawkfalcon,
@@ -108,7 +113,7 @@ else
     <a href="https://www.nexusmods.com/users/12252523">Karmylla</a>,
     Pucklynn,
     Robby LaFarge,
-    and a few anonymous users for their ongoing support; you're awesome! 🏅
+    and a few anonymous users for their ongoing support on Patreon; you're awesome!
 </p>
 
 <h2 id="modcreators">For mod creators</h2>
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index babd0bd3..1b40cfa9 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({
@@ -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>
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index 5592078c..8293fbe2 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -18,18 +18,18 @@
     </script>
 }
 
-<div id="intro">
-    <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>
+<div id="app">
+    <div id="intro">
+        <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>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>
+        <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)
-    {
-        <p id="beta-blurb"><strong>Note:</strong> "SDV beta only" means Stardew Valley @Model.BetaVersion-beta; if you didn't opt in to the beta, you have the stable version and can ignore that line. If a mod doesn't have a "SDV beta only" line, the compatibility applies to both versions of the game.</p>
-    }
-</div>
+        @if (Model.BetaVersion != null)
+        {
+            <p id="beta-blurb" v-show="showAdvanced"><strong>Note:</strong> "SDV @Model.BetaVersion only" lines are for an unreleased version of the game, not the stable version most players have. If a mod doesn't have that line, the info applies to both versions of the game.</p>
+        }
+    </div>
 
-<div id="app">
     <div id="options">
         <div>
             <label for="search-box">Search: </label>
@@ -47,8 +47,7 @@
     </div>
     <div id="mod-count" v-show="showAdvanced">
         <div v-if="visibleStats.total > 0">
-            {{visibleStats.total}} mods shown ({{Math.round((visibleStats.compatible + visibleStats.workaround) / visibleStats.total * 100)}}% compatible or have a workaround, {{Math.round((visibleStats.soon + visibleStats.broken) / visibleStats.total * 100)}}% broken, {{Math.round(visibleStats.abandoned / visibleStats.total * 100)}}% obsolete).<br />
-            SMAPI 3.0 (upcoming): {{Math.round(visibleStats.smapi3_ok / visibleStats.total * 100)}}% ready, {{Math.round(visibleStats.smapi3_soon / visibleStats.total * 100)}}% soon, {{Math.round(visibleStats.smapi3_broken / visibleStats.total * 100)}}% broken, {{Math.round(visibleStats.smapi3_unknown / visibleStats.total * 100)}}% unknown.
+            {{visibleStats.total}} mods shown ({{Math.round((visibleStats.compatible + visibleStats.workaround) / visibleStats.total * 100)}}% compatible or have a workaround, {{Math.round((visibleStats.soon + visibleStats.broken) / visibleStats.total * 100)}}% broken, {{Math.round(visibleStats.abandoned / visibleStats.total * 100)}}% obsolete).
         </div>
         <span v-else>No matching mods found.</span>
     </div>
@@ -61,12 +60,11 @@
                 <th>compatibility</th>
                 <th v-show="showAdvanced">broke in</th>
                 <th v-show="showAdvanced">code</th>
-                <th><small><a href="http://smapi.io/3.0">3.0 ready</a></small></th>
                 <th>&nbsp;</th>
             </tr>
         </thead>
         <tbody>
-            <tr v-for="mod in mods" :key="mod.Name" v-bind:id="mod.Slug" :key="mod.Slug" v-bind:data-status="mod.LatestCompatibility.Status" v-show="mod.Visible">
+            <tr v-for="mod in mods" :key="mod.Name" v-bind:id="mod.Slug" :key="mod.Slug" v-bind:data-status="mod.Compatibility.Status" v-show="mod.Visible">
                 <td>
                     {{mod.Name}}
                     <small class="mod-alt-names" v-if="mod.AlternateNames">(aka {{mod.AlternateNames}})</small>
@@ -82,8 +80,8 @@
                 </td>
                 <td>
                     <div v-html="mod.Compatibility.Summary"></div>
-                    <div v-if="mod.BetaCompatibility">
-                        <strong v-if="mod.BetaCompatibility">SDV beta only:</strong>
+                    <div v-if="mod.BetaCompatibility" v-show="showAdvanced">
+                        <strong v-if="mod.BetaCompatibility">SDV @Model.BetaVersion only:</strong>
                         <span v-html="mod.BetaCompatibility.Summary"></span>
                     </div>
                     <div v-for="(warning, i) in mod.Warnings">⚠ {{warning}}</div>
@@ -93,12 +91,6 @@
                     <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 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>
                     <small><a v-bind:href="'#' + mod.Slug">#</a></small>
                 </td>