Resolve merge conflict

Author: thisguyStan

AssettoServer/Commands/Modules/GeneralModule.cs

@@ -71,7 +71,7 @@ public async Task ShowLegalNotice()
     [Command("resetcar"), RequireConnectedPlayer]
     public void ResetCarAsync()
     {
-        if (_configuration.Extra is { EnableClientMessages: true, EnableCarReset: true, MinimumCSPVersion: >= CSPVersion.V0_2_3_p211, EnableAi: true })
+        if (_configuration.Extra is { EnableClientMessages: true, EnableCarReset: true, MinimumCSPVersion: >= CSPVersion.V0_2_8, EnableAi: true })
         {
             Reply(Client!.EntryCar.TryResetPosition() 
                 ? "Position successfully reset" 

AssettoServer/Server/ACServer.cs

@@ -109,10 +109,10 @@ public ACServer(
 
         if (_configuration.Extra.EnableCarReset)
         {
-            if (!_configuration.Extra.EnableClientMessages || _configuration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_3_p211  || aiSpline == null)
+            if (!_configuration.Extra.EnableClientMessages || _configuration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_8  || aiSpline == null)
             {
                 throw new ConfigurationException(
-                    "Reset car: Minimum required CSP version of 0.2.3-preview211 (2974); Requires enabled client messages; Requires working AI spline");
+                    "Reset car: Minimum required CSP version of 0.2.8 (3424); Requires enabled client messages; Requires working AI spline");
             }
         }
     }

AssettoServer/Server/Configuration/Extra/ACExtraConfiguration.cs

@@ -29,7 +29,7 @@ public partial class ACExtraConfiguration : ObservableObject
     public int MandatoryClientSecurityLevel { get; internal set; }
     [YamlMember(Description = "Force headlights on for all cars")]
     public bool ForceLights { get; set; }
-    [YamlMember(Description = "Enable usage of /resetcar to teleport the player to the closest spline point. Requires CSP v0.2.3-preview211 (2974) or later")]
+    [YamlMember(Description = "Enable usage of /resetcar to teleport the player to the closest spline point. Requires CSP v0.2.8 (3424) or later")]
     public bool EnableCarReset { get; set; } = false;
     [YamlMember(Description = "Enable vanilla server voting for: Session skip; Session restart")]
     public bool EnableSessionVote { get; set; } = true;

AssettoServer/Utils/CSPVersion.cs

@@ -9,7 +9,5 @@ public static class CSPVersion
     public const int V0_1_80_p389 = 2544;
     public const int V0_2_0  = 2651;
     public const int V0_2_3 = 3044;
-    public const int V0_2_3_p47 = 2796;
-    public const int V0_2_3_p211 = 2974;
     public const int V0_2_8 = 3424;
 }

FastTravelPlugin/FastTravelConfiguration.cs

@@ -8,7 +8,7 @@ namespace FastTravelPlugin;
 [UsedImplicitly(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.WithMembers)]
 public class FastTravelConfiguration : IValidateConfiguration<FastTravelConfigurationValidator>
 {
-    [YamlMember(Description = "Requires CSP version 0.2.3-preview211 (2974) which fixed disabling collisions online. \nSetting this to false will lower the version requirement to 0.2.0 (2651) but clients on versions below 0.2.3-preview211 will not have disabled collisions")]
+    [YamlMember(Description = "Requires CSP version 0.2.8 (3424) which fixed disabling collisions online. \nSetting this to false will lower the version requirement to 0.2.0 (2651) but clients on versions below 0.2.3-preview211 will not have disabled collisions")]
     public bool RequireCollisionDisable { get; set; } = true;
 
     [YamlMember(Description = "Available zoom levels. Last one should to show the full track.\nIf map image is shown, prioritize matching the track to the map image")]

FastTravelPlugin/FastTravelPlugin.cs

@@ -26,9 +26,9 @@ public FastTravelPlugin(FastTravelConfiguration configuration,
     {
         _aiSpline = aiSpline ?? throw new ConfigurationException("FastTravelPlugin does not work with AI traffic disabled");
 
-        if (configuration.RequireCollisionDisable && serverConfiguration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_3_p211)
+        if (configuration.RequireCollisionDisable && serverConfiguration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_8)
         {
-            throw new ConfigurationException("FastTravelPlugin needs a minimum required CSP version of 0.2.3-preview211 (2974)");
+            throw new ConfigurationException("FastTravelPlugin needs a minimum required CSP version of 0.2.8 (3424)");
         }
 
         if (!configuration.RequireCollisionDisable && serverConfiguration.CSPTrackOptions.MinimumCSPVersion < CSPVersion.V0_2_0)