Merge branch 'dev-rebase'

# Conflicts:
#	HotPatcher/Source/HotPatcherCore/Private/Cooker/MultiCooker/SingleCookerProxy.cpp
#	HotPatcher/Source/HotPatcherCore/Public/FlibHotPatcherCoreHelper.h
#	README.md
#	README_Chinese.md

.gitmodules

@@ -1,9 +1,12 @@
-[submodule "Mods/HotMultiCooker"]
-	path = Mods/HotMultiCooker
-	url = [email protected]:hxhb/HotMultiCooker.git
-[submodule "Mods/RemakePak"]
-	path = Mods/RemakePak
-	url = [email protected]:hxhb/RemakePak.git
-[submodule "Mods/libzstd"]
-	path = Mods/libzstd
-	url = [email protected]:hxhb/ue-zstd.git
+[submodule "Mods/HotMultiCooker"]
+	path = Mods/HotMultiCooker
+	url = [email protected]:hxhb/HotMultiCooker.git
+[submodule "Mods/RemakePak"]
+	path = Mods/RemakePak
+	url = [email protected]:hxhb/RemakePak.git
+[submodule "Mods/libzstd"]
+	path = Mods/libzstd
+	url = [email protected]:hxhb/ue-zstd.git
+[submodule "Mods/HotChunker"]
+	path = Mods/HotChunker
+	url = [email protected]:hxhb/HotChunker.git

HotPatcher/Source/CmdHandler/CmdHandler.Build.cs

@@ -1,53 +1,52 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
-
-using UnrealBuildTool;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-public class CmdHandler : ModuleRules
-{
-	public CmdHandler(ReadOnlyTargetRules Target) : base(Target)
-	{
-		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-		bLegacyPublicIncludePaths = false;
-		OptimizeCode = CodeOptimization.InShippingBuildsOnly;
-
-		PublicIncludePaths.AddRange(
-			new string[] {
-				// ... add public include paths required here ...
-			}
-			);
-
-
-		PrivateIncludePaths.AddRange(
-			new string[] {
-				// ... add other private include paths required here ...
-			}
-			);
-
-
-		PublicDependencyModuleNames.AddRange(
-			new string[]
-			{
-				"UnrealEd",
-				"Core",
-                "Json",
-                "SandboxFile",
-                "JsonUtilities",
-                "Settings",
-                // ... add other public dependencies that you statically link with here ...
-			}
-			);
-
-		PrivateDependencyModuleNames.AddRange(
-			new string[]
-			{
-				"InputCore",
-				"CoreUObject",
-				"Engine",
-				// ... add private dependencies that you statically link with here ...	
-			}
-		);
-	}
-}
+// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+public class CmdHandler : ModuleRules
+{
+	public CmdHandler(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		bLegacyPublicIncludePaths = false;
+		OptimizeCode = CodeOptimization.InShippingBuildsOnly;
+
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+
+
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+                "Json",
+                "SandboxFile",
+                "JsonUtilities",
+                "Settings",
+                // ... add other public dependencies that you statically link with here ...
+			}
+			);
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"InputCore",
+				"CoreUObject",
+				"Engine",
+				// ... add private dependencies that you statically link with here ...	
+			}
+		);
+	}
+}

HotPatcher/Source/CmdHandler/Private/CmdHandler.cpp

@@ -2,6 +2,9 @@
 
 #include "CmdHandler.h"
 
+#include "Misc/CommandLine.h"
+#include "Misc/ConfigCacheIni.h"
+
 DEFINE_LOG_CATEGORY(LogCmdHandler);
 
 bool OverrideConfigValue(const FString& FileName,const FString& Section,const FString& Key,int32 NewValue)
@@ -37,7 +40,7 @@ void AddMultiCookerBackendToConfig(const FString& DDCAddr)
 		{
 			Section->Remove(*Key);
 		}
-		Section->FindOrAdd(*Key,FConfigValue(*Value));
+		Section->Add(*Key,FConfigValue(*Value));
 	};
 
 	UpdateKeyLambda(MultiCookerDDCBackendSection,TEXT("MinimumDaysToKeepFile"),TEXT("7"));
@@ -59,7 +62,7 @@ void AddMultiCookerBackendToConfig(const FString& DDCAddr)
 		FCommandLine::Append(*FString::Printf(TEXT(" -ddc=%s"),*DDCBackendName));
 		UE_LOG(LogCmdHandler, Warning, TEXT("Append cmd: %s"),FCommandLine::Get());
 	}
-	UE_LOG(LogCmdHandler, Warning, TEXT("use MultiCookerDDC: %s"),&DDCBackendName);
+	UE_LOG(LogCmdHandler, Warning, TEXT("use MultiCookerDDC: %s"),*DDCBackendName);
 }
 
 static bool bDDCUrl = false;