Merge branch 'main' of https://github.com/sp-tarkov/server-csharp

Core/Models/Spt/Config/GiftsConfig.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Profile;
 using Core.Models.Enums;
@@ -63,7 +63,7 @@ public class Gift
     public SeasonalEventType AssociatedEvent { get; set; }
 
     [JsonPropertyName("collectionTimeHours")]
-    public int CollectionTimeHours { get; set; }
+    public int? CollectionTimeHours { get; set; }
 
     /// <summary>
     /// Optional, can be used to change profile settings like level/skills

Core/Models/Utils/ILogger.cs

@@ -7,10 +7,11 @@ public interface ILogger
     // TODO: Removing these 4 methods for now, revisit in the future
     // void WriteToLogFile(string data);
     // void Log(string data, LogTextColor? color, string? backgroundColor = null);
-    // void LogWithColor(string data, LogTextColor textColor, LogBackgroundColor? backgroundColor = null);
+    void LogWithColor(string data, LogTextColor? textColor = null, LogBackgroundColor? backgroundColor = null);
     void Success(string data);
     void Error(string data);
     void Warning(string data);
     void Info(string data);
     void Debug(string data);
+    void Critical(string data);
 }