Merge branch 'develop' into stable

2 files changed, 30 insertions, 4 deletions

diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
index efad0a3e..78d3d10e 100644
--- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
+++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
@@ -82,6 +82,7 @@ namespace StardewModdingApi.Installer
             yield return GetInstallPath("StardewModdingAPI.config.json");
             yield return GetInstallPath("StardewModdingAPI.data.json");
             yield return GetInstallPath("StardewModdingAPI.AssemblyRewriters.dll");
+            yield return GetInstallPath("System.ValueTuple.dll");
             yield return GetInstallPath("steam_appid.txt");
 
             // Linux/Mac only
diff --git a/src/StardewModdingAPI.Installer/readme.txt b/src/StardewModdingAPI.Installer/readme.txt
index cf6090c4..eb27ac52 100644
--- a/src/StardewModdingAPI.Installer/readme.txt
+++ b/src/StardewModdingAPI.Installer/readme.txt
@@ -13,7 +13,32 @@
 
 SMAPI lets you run Stardew Valley with mods. Don't forget to download mods separately.
 
-Need help? See:
-   - Install guide: http://canimod.com/for-players/install-smapi
-   - Troubleshooting: http://canimod.com/for-players/faqs#troubleshooting
-   - Ask for help: https://discord.gg/kH55QXP
+
+Install guide
+--------------------------------
+See http://stardewvalleywiki.com/Modding:Installing_SMAPI.
+
+
+Need help?
+--------------------------------
+- FAQs: http://stardewvalleywiki.com/Modding:Player_FAQs
+- Ask for help: https://discord.gg/kH55QXP
+
+
+Manual install
+--------------------------------
+THIS IS NOT RECOMMENDED FOR MOST PLAYERS. See instructions above instead.
+If you really want to install SMAPI manually, here's how.
+
+1. Download the latest version of SMAPI: https://github.com/Pathoschild/SMAPI/releases.
+2. Unzip the .zip file somewhere (not in your game folder).
+3. Copy the files from the "internal/Windows" folder (on Windows) or "internal/Mono" folder (on
+   Linux/Mac) into your game folder. The `StardewModdingAPI.exe` file should be right next to the
+   game's executable.
+4.
+  - Windows only: if you use Steam, see the install guide above to enable achievements and
+    overlay. Otherwise, just run StardewModdingAPI.exe in your game folder to play with mods.
+
+  - Linux/Mac only: rename the "StardewValley" file (no extension) to "StardewValley-original", and
+    "StardewModdingAPI" (no extension) to "StardewValley". Now just launch the game as usual to
+    play with mods.