Merge branch 'develop' into stable

2 files changed, 45 insertions, 24 deletions

diff --git a/src/SMAPI.Web/Views/Index/Index.cshtml b/src/SMAPI.Web/Views/Index/Index.cshtml
index ad58898e..4efb9f8a 100644
--- a/src/SMAPI.Web/Views/Index/Index.cshtml
+++ b/src/SMAPI.Web/Views/Index/Index.cshtml
@@ -13,7 +13,11 @@
 </p>
 
 <div id="call-to-action">
-    <a href="@Model.DownloadUrl" class="main-cta">Download SMAPI @Model.LatestVersion</a><br />
+    <a href="@Model.StableVersion.DownloadUrl" class="main-cta">Download SMAPI @Model.StableVersion.Version</a><br />
+    @if (Model.BetaVersion != null)
+    {
+        <a href="@Model.BetaVersion.DownloadUrl" class="secondary-cta">Download SMAPI @Model.BetaVersion.Version<br /><small>for Stardew Valley 1.3 beta</small></a><br />
+    }
     <a href="https://stardewvalleywiki.com/Modding:Installing_SMAPI" class="secondary-cta">Install guide</a><br />
     <a href="https://stardewvalleywiki.com/Modding:Player_FAQs" class="secondary-cta">FAQs</a><br />
     <img src="favicon.ico" />
@@ -25,12 +29,29 @@
     <li>Get help <a href="https://stardewvalleywiki.com/Modding:Community#Discord">on Discord</a> or <a href="https://community.playstarbound.com/threads/smapi-stardew-modding-api.108375/">in the forums</a></li>
 </ul>
 
-<h2>What's new in SMAPI @Model.LatestVersion?</h2>
-<div class="github-description">
-    @Html.Raw(Markdig.Markdown.ToHtml(Model.Description))
-</div>
+@if (Model.BetaVersion == null)
+{
+    <h2>What's new in SMAPI @Model.StableVersion.Version?</h2>
+    <div class="github-description">
+        @Html.Raw(Markdig.Markdown.ToHtml(Model.StableVersion.Description))
+    </div>
+    <p>See the <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/release-notes.md#release-notes">release notes</a> and <a href="https://stardewvalleywiki.com/Modding:SMAPI_compatibility">mod compatibility list</a> for more info.</p>
+}
+else
+{
+    <h2>What's new in...</h2>
+    <h3>SMAPI @Model.StableVersion.Version?</h3>
+    <div class="github-description">
+        @Html.Raw(Markdig.Markdown.ToHtml(Model.StableVersion.Description))
+    </div>
+    <p>See the <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/release-notes.md#release-notes">release notes</a> and <a href="https://stardewvalleywiki.com/Modding:SMAPI_compatibility">mod compatibility list</a> for more info.</p>
 
-<p>See the <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/release-notes.md#release-notes">release notes</a> and <a href="https://stardewvalleywiki.com/Modding:SMAPI_compatibility">mod compatibility list</a> for more info.</p>
+    <h3>SMAPI @Model.BetaVersion.Version?</h3>
+    <div class="github-description">
+        @Html.Raw(Markdig.Markdown.ToHtml(Model.BetaVersion.Description))
+    </div>
+    <p>See the <a href="https://github.com/Pathoschild/SMAPI/blob/develop/docs/release-notes.md#release-notes">release notes</a> and <a href="https://stardewvalleywiki.com/Modding:SMAPI_compatibility">mod compatibility list</a> for more info.</p>
+}
 
 <h2>Donate to support SMAPI ♥</h2>
 <p>
@@ -62,7 +83,7 @@
 
 <h2>For mod creators</h2>
 <ul>
-    <li><a href="@Model.DevDownloadUrl">SMAPI @Model.LatestVersion for developers</a> (includes <a href="https://docs.microsoft.com/en-us/visualstudio/ide/using-intellisense">intellisense</a> and full console output)</li>
+    <li><a href="@Model.StableVersion.DevDownloadUrl">SMAPI @Model.StableVersion.Version for developers</a> (includes <a href="https://docs.microsoft.com/en-us/visualstudio/ide/using-intellisense">intellisense</a> and full console output)</li>
     <li><a href="https://stardewvalleywiki.com/Modding:Index">Modding documentation</a></li>
     <li>Need help? Come <a href="https://stardewvalleywiki.com/Modding:Community#Discord">chat on Discord</a>.</li>
 </ul>
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index d2d8004e..7213e286 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -54,19 +54,19 @@
             <caption>Game info:</caption>
             <tr>
                 <td>SMAPI version:</td>
-                <td>@Model.ParsedLog.ApiVersion</td>
+                <td v-pre>@Model.ParsedLog.ApiVersion</td>
             </tr>
             <tr>
                 <td>Game version:</td>
-                <td>@Model.ParsedLog.GameVersion</td>
+                <td v-pre>@Model.ParsedLog.GameVersion</td>
             </tr>
             <tr>
                 <td>Platform:</td>
-                <td>@Model.ParsedLog.OperatingSystem</td>
+                <td v-pre>@Model.ParsedLog.OperatingSystem</td>
             </tr>
             <tr>
                 <td>Mods path:</td>
-                <td>@Model.ParsedLog.ModPath</td>
+                <td v-pre>@Model.ParsedLog.ModPath</td>
             </tr>
             <tr>
                 <td>Log started:</td>
@@ -85,7 +85,7 @@
             {
                 <tr v-on:click="toggleMod('@GetSlug(mod.Name)')" class="mod-entry" v-bind:class="{ hidden: !showMods['@GetSlug(mod.Name)'] }">
                     <td><input type="checkbox" v-bind:checked="showMods['@GetSlug(mod.Name)']" v-show="anyModsHidden" /></td>
-                    <td>
+                    <td v-pre>
                         @mod.Name
                         @if (contentPacks != null && contentPacks.TryGetValue(mod.Name, out LogModInfo[] contentPackList))
                         {
@@ -97,19 +97,19 @@
                             </div>
                         }
                     </td>
-                    <td>@mod.Version</td>
-                    <td>@mod.Author</td>
+                    <td v-pre>@mod.Version</td>
+                    <td v-pre>@mod.Author</td>
                     @if (mod.Errors == 0)
                     {
-                        <td class="color-green">no errors</td>
+                        <td v-pre class="color-green">no errors</td>
                     }
                     else if (mod.Errors == 1)
                     {
-                        <td class="color-red">@mod.Errors error</td>
+                        <td v-pre class="color-red">@mod.Errors error</td>
                     }
                     else
                     {
-                        <td class="color-red">@mod.Errors errors</td>
+                        <td v-pre class="color-red">@mod.Errors errors</td>
                     }
                 </tr>
             }
@@ -130,16 +130,16 @@
                 string levelStr = message.Level.ToString().ToLower();
 
                 <tr class="@levelStr mod" v-show="filtersAllow('@GetSlug(message.Mod)', '@levelStr')">
-                    <td>@message.Time</td>
-                    <td>@message.Level.ToString().ToUpper()</td>
-                    <td data-title="@message.Mod">@message.Mod</td>
-                    <td>@message.Text</td>
+                    <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>
                 </tr>
                 if (message.Repeated > 0)
                 {
                     <tr class="@levelStr mod mod-repeat" v-show="filtersAllow('@GetSlug(message.Mod)', '@levelStr')">
                         <td colspan="3"></td>
-                        <td><i>repeats [@message.Repeated] times.</i></td>
+                        <td v-pre><i>repeats [@message.Repeated] times.</i></td>
                     </tr>
                 }
             }
@@ -151,11 +151,11 @@ else if (Model.ParsedLog?.IsValid == false)
     <h2>Parsed log</h2>
     <div id="error" class="color-red">
         <p><strong>We couldn't parse that file, but you can still share the link.</strong></p>
-        <p>Error details: @Model.ParsedLog.Error</p>
+        <p v-pre>Error details: @Model.ParsedLog.Error</p>
     </div>
 
     <h3>Raw log</h3>
-    <pre>@Model.ParsedLog.RawText</pre>
+    <pre v-pre>@Model.ParsedLog.RawText</pre>
 }
 
 <div id="upload-area">