Merge branch 'master' into Dev

modules/ROOT/pages/Development/Cpp/hooking.adoc

@@ -219,7 +219,7 @@ in order to unsubscribe from the function.
 == Blueprint-Hooking
 
 Blueprint function hooking works by changing the instructions of a Blueprint UFunction
-so that first your hook gets called.
+so that your hook gets called before the original function.
 
 The hook function signature is `void(FBlueprintHookHelper&)`.
 This helper structure provides a couple of functions allowing you to read and write data
@@ -233,6 +233,7 @@ Usage goes as following:
 [source,cpp]
 ----
 #include "Patching/BlueprintHookManager.h"
+#include "Patching/BlueprintHookHelper.h"
 
 void registerHooks() {
 	UClass* SomeClass = ...;

modules/ROOT/pages/faq.adoc

@@ -384,16 +384,28 @@ You might see error messages like:
 - `Unexpected error while downloading file: self signed certificate in certificate chain`
 
 Internet restrictions, and sometimes VPNs and proxies, mess with our services.
-To work around this, download the mod files mentioned in the error message from SMR manually.
-If they are named `[ModName].zip` rename them to `[ModName].smod`
+You can work around this by downloading the mod files mentioned in the error message from ficsit.app manually.
+The process for doing this changes if you're using SMM2 or SMM3 and is described below.
+You can also try using a different proxy, VPN, or hotspot to download the mod instead.
 
-If the mod you downloaded is SML,
-then place the file into 
-`%localappdata%\SatisfactoryModManager\downloadCache\smlVersions\[the SML version you need]`,
-otherwise, place the file into
-`%localappdata%\SatisfactoryModManager\downloadCache\mods`.
+[id="ManualDownloadForCache_SMM2"]
+=== If using SMM2
 
-You can also try using a proxy or VPN.
+Once you have downloaded the mod file(s) from ficsit.app,
+rename the file to `[ModName].smod` if it was named `[ModName].zip`.
+
+Then, put the file into SMM's download cache.
+For SMM2, this is `%localappdata%\SatisfactoryModManager\downloadCache\mods`,
+unless the mod you downloaded is SML,
+in which case place the file into `%localappdata%\SatisfactoryModManager\downloadCache\smlVersions\[the SML version number]`.
+
+[id="ManualDownloadForCache_SMM3"]
+=== If using SMM3
+
+Once you have downloaded the mod file(s) from ficsit.app,
+place the zips into `%localappdata%\ficsit\downloadCache`.
+Make sure to rename them to the `ModReference_version_target.zip` format, for example,
+`SML_3.7.0_Windows.zip`
 
 == How can I troubleshoot crash issues?