Merge branch 'develop' into stable

1 files changed, 16 insertions, 2 deletions

diff --git a/src/SMAPI/SMAPI.config.json b/src/SMAPI/SMAPI.config.json
index 8324f45b..97e8e00c 100644
--- a/src/SMAPI/SMAPI.config.json
+++ b/src/SMAPI/SMAPI.config.json
@@ -16,9 +16,17 @@ copy all the settings, or you may cause bugs due to overridden changes in future
 */
 {
     /**
-     * Whether SMAPI should log more information about the game context.
+     * The logs for which to enable verbose logging, which may show a lot more information to
+     * simplify troubleshooting.
+     *
+     * The possible values are:
+     *   - "*" for everything (not recommended);
+     *   - "SMAPI" for messages from SMAPI itself;
+     *   - mod IDs from their manifest.json files.
+     *
+     * For example: [ "SMAPI", "Pathoschild.ContentPatcher" ]
      */
-    "VerboseLogging": false,
+    "VerboseLogging": [],
 
     /**
      * Whether SMAPI should check for newer versions of SMAPI and mods when you load the game. If new
@@ -53,6 +61,12 @@ copy all the settings, or you may cause bugs due to overridden changes in future
     "UsePintail": true,
 
     /**
+     * Whether to use raw image data when possible, instead of initializing an XNA Texture2D
+     * instance through the GPU.
+     */
+    "UseRawImageLoading": true,
+
+    /**
      * Whether to add a section to the 'mod issues' list for mods which directly use potentially
      * sensitive .NET APIs like file or shell access. Note that many mods do this legitimately as
      * part of their normal functionality, so these warnings are meaningless without further