From 623486c38092ceb27fdc91555506b8f5fed04123 Mon Sep 17 00:00:00 2001 From: gmriggs Date: Sat, 1 Feb 2025 16:43:37 -0500 Subject: [PATCH 1/5] fix dat chunking (#4275) --- Source/ACE.DatLoader/DatReader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.DatLoader/DatReader.cs b/Source/ACE.DatLoader/DatReader.cs index 96a32a09a8..7b364f65ce 100644 --- a/Source/ACE.DatLoader/DatReader.cs +++ b/Source/ACE.DatLoader/DatReader.cs @@ -35,7 +35,7 @@ private static byte[] ReadDat(FileStream stream, uint offset, uint size, uint bl while (size > 0) { - if (size < blockSize) + if (nextAddress == 0) { stream.Read(buffer, bufferOffset, Convert.ToInt32(size)); size = 0; // We know we've read the only/last sector, so just set this to zero to proceed. From 64636510f15ab0a26e8149adfefd0923c4f42788 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 21:44:06 +0000 Subject: [PATCH 2/5] Bump MSTest.TestFramework from 3.7.1 to 3.7.3 in /Source (#4273) --- Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj index bc42051fa3..f1cc77eea3 100644 --- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj +++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index 1c57b986ec..4354435521 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -30,7 +30,7 @@ - + diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index d8220ff8c6..b1e9002c7a 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -30,7 +30,7 @@ - + From 0e85c10b073c8be7b72fd5ba2ca51206b37711d9 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sat, 1 Feb 2025 21:50:35 +0000 Subject: [PATCH 3/5] [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.66.4632.20250201214534-master-6463651 --- Source/ACE.Server/ServerBuildInfo_Dynamic.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs index 30d494f0dc..9fa8508a6d 100644 --- a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs +++ b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs @@ -4,17 +4,17 @@ namespace ACE.Server public static partial class ServerBuildInfo { public static string Branch = "master"; - public static string Commit = "3f255c321e3dcc66b79af5565c87e2ee818934af"; + public static string Commit = "64636510f15ab0a26e8149adfefd0923c4f42788"; public static string Version = "1.66"; - public static string Build = "4630"; + public static string Build = "4632"; public static int BuildYear = 2025; - public static int BuildMonth = 01; - public static int BuildDay = 15; - public static int BuildHour = 02; - public static int BuildMinute = 11; - public static int BuildSecond = 03; + public static int BuildMonth = 02; + public static int BuildDay = 01; + public static int BuildHour = 21; + public static int BuildMinute = 45; + public static int BuildSecond = 34; } } From d05d87acffbce6c80366114009e1fcb1def73cf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 21:57:51 +0000 Subject: [PATCH 4/5] Bump MSTest.TestAdapter from 3.7.1 to 3.7.3 in /Source (#4274) --- Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj index f1cc77eea3..38d3e878cb 100644 --- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj +++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj @@ -28,7 +28,7 @@ - + diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index 4354435521..7861b08ff0 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index b1e9002c7a..a8375c71aa 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -29,7 +29,7 @@ - + From 448956d5467c1f9fde8c0e8125811be36e34bdaf Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sat, 1 Feb 2025 22:04:19 +0000 Subject: [PATCH 5/5] [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.66.4633.20250201215856-master-d05d87a --- Source/ACE.Server/ServerBuildInfo_Dynamic.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs index 9fa8508a6d..2ad27465f9 100644 --- a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs +++ b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs @@ -4,17 +4,17 @@ namespace ACE.Server public static partial class ServerBuildInfo { public static string Branch = "master"; - public static string Commit = "64636510f15ab0a26e8149adfefd0923c4f42788"; + public static string Commit = "d05d87acffbce6c80366114009e1fcb1def73cf2"; public static string Version = "1.66"; - public static string Build = "4632"; + public static string Build = "4633"; public static int BuildYear = 2025; public static int BuildMonth = 02; public static int BuildDay = 01; public static int BuildHour = 21; - public static int BuildMinute = 45; - public static int BuildSecond = 34; + public static int BuildMinute = 58; + public static int BuildSecond = 56; } }