Merge branch 'ACEmulator:master' into metrics

ACEmulator · Sep 30, 2024 · 25ee591 · 25ee591
2 parents e8efbe8 + 83fd7d4
commit 25ee591
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="3.0.0" />
+    <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="3.0.0" />
+    <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
   </ItemGroup>

diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj
@@ -235,7 +235,7 @@
 
   <ItemGroup>
     <PackageReference Include="Lib.Harmony" Version="2.3.3" />
-    <PackageReference Include="log4net" Version="3.0.0" />
+    <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="Log4Net.Async.Standard" Version="3.1.0" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageReference Include="MySqlConnector" Version="2.3.7" />

diff --git 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 = "836837bf3c846f6a58ffb2dda9dfc40aa42f8dc1"; 
+        public static string Commit = "6f63d94bf25a1c34257071f5003ca595429a4626"; 
 
         public static string Version = "1.63"; 
-        public static string Build   = "4605"; 
+        public static string Build   = "4606"; 
 
         public static int BuildYear   = 2024; 
         public static int BuildMonth  = 09; 
         public static int BuildDay    = 30; 
-        public static int BuildHour   = 02; 
-        public static int BuildMinute = 21; 
-        public static int BuildSecond = 32; 
+        public static int BuildHour   = 16; 
+        public static int BuildMinute = 23; 
+        public static int BuildSecond = 07; 
     } 
 }