Merge branch 'master' into dev/v3.10.x

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppUpdater/Commands/RepairFilesCommand.cs

@@ -122,7 +122,7 @@ public override void Execute(CancellationToken cancellationToken)
 
                     unarchiver.UnarchiveSingleFile(entry, cancellationToken);
 
-                    EmplaceFile(Path.Combine(unarchivePath, entry.Name), Path.Combine(_localData.Path, entry.Name));
+                    EmplaceFile(Path.Combine(unarchivePath, entry.Name + _unpackingSuffix), Path.Combine(_localData.Path, entry.Name));
 
                     repairStatus.IsActive.Value = false;
                 });

Assets/PatchKit Patcher/Scripts/Version.cs

@@ -4,11 +4,11 @@ public static class Version
     {
         public const int Major = 3;
         public const int Minor = 10;
-        public const int Release = 0;
+        public const int Release = 1;
 
         public static string Value
         {
             get { return string.Format("v{0}.{1}.{2}", Major, Minor, Release); }
         }
     }
-}
+}

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Patcher will timeout if the downloading stopped sooner than after 5 minutes
 
+## [3.10.1p1]
+### Fixed
+- Missing unpacking suffix when repairing files (3.10.1 failed to fix this issue)
+
 ## [3.10.1]
 ### Fixed
 - Updated torrent-client to fix the issue with paths with spaces in them