Merge branch 'develop' into stable

2 files changed, 7 insertions, 9 deletions

diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
index 01f7a01f..efad0a3e 100644
--- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
+++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
@@ -85,6 +85,7 @@ namespace StardewModdingApi.Installer
             yield return GetInstallPath("steam_appid.txt");
 
             // Linux/Mac only
+            yield return GetInstallPath("libgdiplus.dylib");
             yield return GetInstallPath("StardewModdingAPI");
             yield return GetInstallPath("StardewModdingAPI.exe.mdb");
             yield return GetInstallPath("System.Numerics.dll");
@@ -158,7 +159,10 @@ namespace StardewModdingApi.Installer
             ****/
             if (!packageDir.Exists)
             {
-                this.PrintError($"The 'internal/{platform}' package folder is missing (should be at {packageDir}).");
+                this.PrintError(platform == Platform.Windows && packageDir.FullName.Contains(Path.GetTempPath()) && packageDir.FullName.Contains(".zip")
+                    ? "The installer is missing some files. It looks like you're running the installer from inside the downloaded zip; make sure you unzip the downloaded file first, then run the installer from the unzipped folder."
+                    : $"The 'internal/{platform}' package folder is missing (should be at {packageDir})."
+                );
                 Console.ReadLine();
                 return;
             }
diff --git a/src/StardewModdingAPI.Installer/readme.txt b/src/StardewModdingAPI.Installer/readme.txt
index 4756099e..cf6090c4 100644
--- a/src/StardewModdingAPI.Installer/readme.txt
+++ b/src/StardewModdingAPI.Installer/readme.txt
@@ -13,13 +13,7 @@
 
 SMAPI lets you run Stardew Valley with mods. Don't forget to download mods separately.
 
-
-To install:
-   - Windows: double-click install.exe.
-   - Linux or Mac: open a terminal and run `mono install.exe`.
-
-
 Need help? See:
-   - Install guide: http://canimod.com/guides/using-mods#installing-smapi
-   - Troubleshooting: http://canimod.com/guides/smapi-faq#troubleshooting
+   - Install guide: http://canimod.com/for-players/install-smapi
+   - Troubleshooting: http://canimod.com/for-players/faqs#troubleshooting
    - Ask for help: https://discord.gg/kH55QXP