Merge branch 'develop' into stable

3 files changed, 151 insertions, 201 deletions

diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index 2f3dd0a1..ea28cd7d 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -13,6 +13,13 @@ caption {
 #output {
     padding: 10px;
     overflow: auto;
+}
+
+#output h2 {
+    margin: -10px 0 10px -10px;
+}
+
+#output table {
     font-family: monospace;
 }
 
@@ -43,7 +50,7 @@ table caption {
 /*********
 ** Log metadata & filters
 *********/
-#metadata, #mods, #filters {
+.table, #filters {
     border-bottom: 1px dashed #888888;
     margin-bottom: 5px;
 }
@@ -53,7 +60,7 @@ table caption {
     padding-right: 0.7em;
 }
 
-table#metadata, table#mods {
+.table {
     border: 1px solid #000000;
     background: #ffffff;
     border-radius: 5px;
@@ -63,8 +70,20 @@ table#metadata, table#mods {
     box-shadow: 1px 1px 1px 1px #dddddd;
 }
 
-.invisible {
-    visibility: hidden;
+.mod-entry {
+    height: 1.8em;
+}
+
+.table > caption {
+    min-height: 1.3em;
+}
+
+#fix-list {
+    margin-bottom: 2em;
+}
+
+#updates {
+    min-width: 10em;
 }
 
 #mods {
@@ -87,8 +106,7 @@ table#metadata, table#mods {
     cursor: default;
 }
 
-#metadata tr,
-#mods tr {
+.table tr {
     background: #eee
 }
 
@@ -114,11 +132,11 @@ table#metadata, table#mods {
     display: inline-block;
 }
 
-#mods .mod-entry.hidden {
+.table .hidden {
     opacity: 0.5;
 }
 
-#mods .content-packs {
+.table .content-packs {
     margin-left: 1em;
     font-size: 0.9em;
     font-style: italic;
@@ -128,8 +146,7 @@ table#metadata, table#mods {
     padding-right: 5px;
 }
 
-#metadata tr:nth-child(even),
-#mods tr:nth-child(even) {
+.table tr:nth-child(even) {
     background: #fff
 }
 
diff --git a/src/SMAPI.Web/wwwroot/Content/css/mods.css b/src/SMAPI.Web/wwwroot/Content/css/mods.css
index 730bfc2e..f42800da 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/mods.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/mods.css
@@ -128,8 +128,10 @@ table.wikitable > caption {
     opacity: 0.7;
 }
 
-#mod-list .mod-closed-source {
-    color: red;
-    font-size: 0.8em;
-    opacity: 0.5;
+#mod-list tr[data-status="abandoned"] .mod-page-links,
+#mod-list tr[data-status="broken"] .mod-page-links,
+#mod-list tr[data-status="obsolete"] .mod-page-links,
+#mod-list tr[data-status="unofficial"] .mod-page-links,
+#mod-list tr[data-status="workaround"] .mod-page-links {
+    text-decoration: line-through;
 }
diff --git a/src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json b/src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json
index 45a4959d..818ff9fe 100644
--- a/src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json
+++ b/src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json
@@ -115,22 +115,9 @@
       "Default | UpdateKey": "Nexus:1820"
     },
 
-    /*********
-    ** Content packs
-    *********/
-    "Canon-Friendly Dialogue Expansion": {
-      "ID": "gizzymo.canonfriendlyexpansion",
-      "~1.1.1 | Status": "AssumeBroken" // causes a save crash on certain dates
-    },
-
-    "Everytime Submarine": {
-      "ID": "MustafaDemirel.EverytimeSubmarine",
-      "~1.0.0 | Status": "AssumeBroken" // breaks player saves if their beach bridge is fixed
-    },
-
 
     /*********
-    ** Mods
+    ** Map versions
     *********/
     "Adjust Artisan Prices": {
       "ID": "ThatNorthernMonkey.AdjustArtisanPrices",
@@ -146,28 +133,6 @@
       }
     },
 
-    "Always Scroll Map": {
-      "ID": "bcmpinc.AlwaysScrollMap",
-      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
-    "Animal Mood Fix": {
-      "ID": "GPeters-AnimalMoodFix",
-      "~ | Status": "Obsolete",
-      "~ | StatusReasonPhrase": "the animal mood bugs were fixed in Stardew Valley 1.2."
-    },
-
-    "Arcade Pong": {
-      "ID": "Platonymous.ArcadePong",
-      "~1.0.2 | Status": "AssumeBroken" // broke in SMAPI 2.6-beta.16 due to reflection into SMAPI internals
-    },
-
-    "Automated Doors": {
-      "ID": "azah.automated-doors",
-      "FormerIDs": "1abcfa07-2cf4-4dc3-a6e9-6068b642112b", // changed in 1.4.1
-      "Default | UpdateKey": "GitHub:azah/AutomatedDoors" // added in 1.4.2
-    },
-
     "Basic Sprinklers Improved": {
       "ID": "lrsk_sdvm_bsi.0117171308",
       "MapRemoteVersions": { "1.0.2": "1.0.1-release" } // manifest not updated
@@ -184,11 +149,6 @@
       "MapRemoteVersions": { "1.3.1": "1.3" } // manifest not updated
     },
 
-    "BJS Night Sounds": {
-      "ID": "BunnyJumps.BJSNightSounds",
-      "~1.0.0 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
-    },
-
     "Casks Anywhere": {
       "ID": "CasksAnywhere",
       "MapLocalVersions": { "1.1-alpha": "1.1" }
@@ -199,43 +159,21 @@
       "MapLocalVersions": { "1.3-1": "1.3" }
     },
 
-    "Chest Pooling": {
-      "ID": "mralbobo.ChestPooling",
-      "Default | UpdateKey": "GitHub:mralbobo/stardew-chest-pooling"
-    },
-
     "Cobalt": {
       "ID": "spacechase0.Cobalt",
       "MapRemoteVersions": { "1.1.3": "1.1.2" } // not updated in manifest
     },
 
-    "Colored Chests": {
-      "ID": "4befde5c-731c-4853-8e4b-c5cdf946805f",
-      "~ | Status": "Obsolete",
-      "~ | StatusReasonPhrase": "colored chests were added in Stardew Valley 1.1."
-    },
-
     "Configurable Machines": {
       "ID": "21da6619-dc03-4660-9794-8e5b498f5b97",
       "MapLocalVersions": { "1.2-beta": "1.2" }
     },
 
-    "Craft Counter": {
-      "ID": "bcmpinc.CraftCounter",
-      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
     "Crafting Counter": {
       "ID": "lolpcgaming.CraftingCounter",
       "MapRemoteVersions": { "1.1": "1.0" } // not updated in manifest
     },
 
-    "Custom Farming Automate Bridge": {
-      "ID": "Platonymous.CFAutomate",
-      "~1.0.1 | Status": "AssumeBroken", // no longer compatible with Automate
-      "~1.0.1 | AlternativeUrl": "https://www.nexusmods.com/stardewvalley/mods/991"
-    },
-
     "Customizable Cart Redux": {
       "ID": "KoihimeNakamura.CCR",
       "MapLocalVersions": { "1.1-20170917": "1.1" }
@@ -256,46 +194,6 @@
       "MapLocalVersions": { "1.1": "1.1.1" }
     },
 
-    "Enemy Health Bars": {
-      "ID": "Speeder.HealthBars",
-      "FormerIDs": "SPDHealthBar" // changed in 1.7.1-pathoschild-update
-    },
-
-    "Fall 28 Snow Day": {
-      "ID": "Omegasis.Fall28SnowDay",
-      "~1.4.1  | Status": "AssumeBroken" // broke in SMAPI 2.0, and update for SMAPI 2.0 doesn't do anything
-    },
-
-    "Fishing Adjust": {
-      "ID": "shuaiz.FishingAdjustMod",
-      "~2.0.1 | Status": "AssumeBroken" // Method not found: 'Void Harmony.HarmonyInstance.Patch(System.Reflection.MethodBase, Harmony.HarmonyMethod, Harmony.HarmonyMethod, Harmony.HarmonyMethod)'
-    },
-
-    "Fishing Automaton": {
-      "ID": "Drynwynn.FishingAutomaton",
-      "~1.1 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
-    },
-
-    "Fix Animal Tools": {
-      "ID": "bcmpinc.FixAnimalTools",
-      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
-    "Fix Scythe Exp": {
-      "ID": "bcmpinc.FixScytheExp",
-      "~0.3 | Status": "AssumeBroken" // broke in 1.3: Exception from HarmonyInstance "bcmpinc.FixScytheExp" [...] Bad label content in ILGenerator.
-    },
-
-    "Gate Opener": {
-      "ID": "mralbobo.GateOpener",
-      "Default | UpdateKey": "GitHub:mralbobo/stardew-gate-opener"
-    },
-
-    "Grass Growth": {
-      "ID": "bcmpinc.GrassGrowth",
-      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
     "Hunger Mod (skn)": {
       "ID": "skn.HungerMod",
       "MapRemoteVersions": { "1.2.1": "1.0" } // manifest not updated
@@ -311,32 +209,11 @@
       "MapRemoteVersions": { "1.0.1": "1.0" } // manifest not updated
     },
 
-    "Modder Serialization Utility": {
-      "ID": "SerializerUtils-0-1",
-      "~ | Status": "Obsolete",
-      "~ | StatusReasonPhrase": "it's no longer maintained or used."
-    },
-
-    "More Rain": {
-      "ID": "Omegasis.MoreRain",
-      "~1.4    | Status": "AssumeBroken" // broke in SMAPI 2.0
-    },
-
-    "More Silo Storage": {
-      "ID": "OrneryWalrus.MoreSiloStorage",
-      "~1.0.1 | Status": "AssumeBroken" // broke in SDV 1.3
-    },
-
     "Move Faster": {
       "ID": "shuaiz.MoveFasterMod",
       "~1.0.1   | Status": "AssumeBroken" // doesn't do anything as of SDV 1.2.33 (bad Harmony patch?)
     },
 
-    "Movement Speed": {
-      "ID": "bcmpinc.MovementSpeed",
-      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
     "Multiple Sprites and Portraits On Rotation (File Loading)": {
       "ID": "FileLoading",
       "MapLocalVersions": { "1.1": "1.12" }
@@ -347,33 +224,11 @@
       "MapLocalVersions": { "2.1": "1.3" } // 1.3 had wrong version in manifest
     },
 
-    "No Added Flying Mine Monsters": {
-      "ID": "Drynwynn.NoAddedFlyingMineMonsters",
-      "~1.1 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
-    },
-
-    "No Debug Mode": {
-      "ID": "NoDebugMode",
-      "~ | Status": "Obsolete",
-      "~ | StatusReasonPhrase": "debug mode was removed in SMAPI 1.0."
-    },
-
-    "OmniFarm": {
-      "ID": "PhthaloBlue.OmniFarm",
-      "FormerIDs": "BlueMod_OmniFarm", // changed in 2.0.2-pathoschild-update
-      "Default | UpdateKey": "GitHub:lambui/StardewValleyMod_OmniFarm"
-    },
-
     "Point-and-Plant": {
       "ID": "jwdred.PointAndPlant",
       "MapRemoteVersions": { "1.0.3": "1.0.2" } // manifest not updated
     },
 
-    "Prairie King Made Easy": {
-      "ID": "Mucchan.PrairieKingMadeEasy",
-      "~1.0    | Status": "AssumeBroken" // broke in SDV 1.2
-    },
-
     "Relationship Status": {
       "ID": "relationshipstatus",
       "MapRemoteVersions": { "1.0.5": "1.0.4" } // not updated in manifest
@@ -384,16 +239,6 @@
       "MapLocalVersions": { "1.1.2-release": "1.1.2" }
     },
 
-    "Save Backup": {
-      "ID": "Omegasis.SaveBackup",
-      "~1.2    | Status": "AssumeBroken" // broke in SMAPI 2.0
-    },
-
-    "Server Bookmarker": {
-      "ID": "Ilyaki.ServerBookmarker",
-      "~1.0.0 | Status": "AssumeBroken" // broke in Stardew Valley 1.3.29 (runtime errors)
-    },
-
     "Shop Expander": {
       "ID": "Entoarox.ShopExpander",
       "FormerIDs": "EntoaroxShopExpander", // changed in 1.5.2
@@ -411,6 +256,123 @@
       "MapLocalVersions": { "0.0": "1.4" }
     },
 
+    "Solar Eclipse Event": {
+      "ID": "KoihimeNakamura.SolarEclipseEvent",
+      "MapLocalVersions": { "1.3.1-20180131": "1.3.1" }
+    },
+
+    "Time Reminder": {
+      "ID": "KoihimeNakamura.TimeReminder",
+      "MapLocalVersions": { "1.0-20170314": "1.0.2" }
+    },
+
+
+    /*********
+    ** Obsolete
+    *********/
+    "Animal Mood Fix": {
+      "ID": "GPeters-AnimalMoodFix",
+      "~ | Status": "Obsolete",
+      "~ | StatusReasonPhrase": "the animal mood bugs were fixed in Stardew Valley 1.2."
+    },
+
+    "Colored Chests": {
+      "ID": "4befde5c-731c-4853-8e4b-c5cdf946805f",
+      "~ | Status": "Obsolete",
+      "~ | StatusReasonPhrase": "colored chests were added in Stardew Valley 1.1."
+    },
+
+    "Modder Serialization Utility": {
+      "ID": "SerializerUtils-0-1",
+      "~ | Status": "Obsolete",
+      "~ | StatusReasonPhrase": "it's no longer maintained or used."
+    },
+
+    "No Debug Mode": {
+      "ID": "NoDebugMode",
+      "~ | Status": "Obsolete",
+      "~ | StatusReasonPhrase": "debug mode was removed in SMAPI 1.0."
+    },
+
+
+    /*********
+    ** Broke circa SDV 1.3
+    *********/
+    "Canon-Friendly Dialogue Expansion": {
+      "ID": "gizzymo.canonfriendlyexpansion",
+      "~1.1.1 | Status": "AssumeBroken" // causes a save crash on certain dates
+    },
+
+    "Everytime Submarine": {
+      "ID": "MustafaDemirel.EverytimeSubmarine",
+      "~1.0.0 | Status": "AssumeBroken" // breaks player saves if their beach bridge is fixed
+    },
+
+    "Always Scroll Map": {
+      "ID": "bcmpinc.AlwaysScrollMap",
+      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
+    },
+
+    "Arcade Pong": {
+      "ID": "Platonymous.ArcadePong",
+      "~1.0.2 | Status": "AssumeBroken" // broke in SMAPI 2.6-beta.16 due to reflection into SMAPI internals
+    },
+
+    "BJS Night Sounds": {
+      "ID": "BunnyJumps.BJSNightSounds",
+      "~1.0.0 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
+    },
+
+    "Craft Counter": {
+      "ID": "bcmpinc.CraftCounter",
+      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
+    },
+
+    "Fishing Adjust": {
+      "ID": "shuaiz.FishingAdjustMod",
+      "~2.0.1 | Status": "AssumeBroken" // Method not found: 'Void Harmony.HarmonyInstance.Patch(System.Reflection.MethodBase, Harmony.HarmonyMethod, Harmony.HarmonyMethod, Harmony.HarmonyMethod)'
+    },
+
+    "Fishing Automaton": {
+      "ID": "Drynwynn.FishingAutomaton",
+      "~1.1 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
+    },
+
+    "Fix Animal Tools": {
+      "ID": "bcmpinc.FixAnimalTools",
+      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
+    },
+
+    "Fix Scythe Exp": {
+      "ID": "bcmpinc.FixScytheExp",
+      "~0.3 | Status": "AssumeBroken" // broke in 1.3: Exception from HarmonyInstance "bcmpinc.FixScytheExp" [...] Bad label content in ILGenerator.
+    },
+
+    "Grass Growth": {
+      "ID": "bcmpinc.GrassGrowth",
+      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
+    },
+
+    "More Silo Storage": {
+      "ID": "OrneryWalrus.MoreSiloStorage",
+      "~1.0.1 | Status": "AssumeBroken" // broke in SDV 1.3
+    },
+
+    "Movement Speed": {
+      "ID": "bcmpinc.MovementSpeed",
+      "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
+    },
+
+    "No Added Flying Mine Monsters": {
+      "ID": "Drynwynn.NoAddedFlyingMineMonsters",
+      "~1.1 | Status": "AssumeBroken" // runtime errors with Harmony 1.2.0.1 in SMAPI 2.8+
+    },
+
+    "Server Bookmarker": {
+      "ID": "Ilyaki.ServerBookmarker",
+      "~1.0.0 | Status": "AssumeBroken" // broke in Stardew Valley 1.3.29 (runtime errors)
+    },
+
     "Skill Prestige: Cooking Adapter": {
       "ID": "Alphablackwolf.CookingSkillPrestigeAdapter",
       "FormerIDs": "20d6b8a3-b6e7-460b-a6e4-07c2b0cb6c63", // changed circa 1.1
@@ -423,11 +385,6 @@
       "1.3-beta | Status": "AssumeBroken" // doesn't work in multiplayer, no longer maintained
     },
 
-    "Solar Eclipse Event": {
-      "ID": "KoihimeNakamura.SolarEclipseEvent",
-      "MapLocalVersions": { "1.3.1-20180131": "1.3.1" }
-    },
-
     "Split Screen": {
       "ID": "Ilyaki.SplitScreen",
       "~3.0.1 | Status": "AssumeBroken" // broke in SMAPI 2.6-beta.16 due to reflection into SMAPI internals
@@ -438,11 +395,6 @@
       "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
     },
 
-    "Stardew Notification": {
-      "ID": "stardewnotification",
-      "Default | UpdateKey": "GitHub:monopandora/StardewNotification"
-    },
-
     "Stephan's Lots of Crops": {
       "ID": "stephansstardewcrops",
       "MapRemoteVersions": { "1.41": "1.1" }, // manifest not updated
@@ -460,35 +412,14 @@
       "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
     },
 
-    "Time Reminder": {
-      "ID": "KoihimeNakamura.TimeReminder",
-      "MapLocalVersions": { "1.0-20170314": "1.0.2" }
-    },
-
-    "Tool Charging": {
-      "ID": "mralbobo.ToolCharging",
-      "Default | UpdateKey": "GitHub:mralbobo/stardew-tool-charging"
-    },
-
     "Tree Spread": {
       "ID": "bcmpinc.TreeSpread",
       "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
     },
 
-    "Variable Grass": {
-      "ID": "dantheman999.VariableGrass",
-      "Default | UpdateKey": "GitHub:dantheman999301/StardewMods"
-    },
-
     "Yet Another Harvest With Scythe Mod": {
       "ID": "bcmpinc.HarvestWithScythe",
       "~0.6 | Status": "AssumeBroken" // breaks newer versions of bcmpinc mods (per bcmpinc's request)
-    },
-
-    "Zoom Out Extreme": {
-      "ID": "RockinMods.ZoomMod",
-      "FormerIDs": "ZoomMod", // changed circa 1.2.1
-      "~0.1 | Status": "AssumeBroken" // broke in SDV 1.2
     }
   }
 }