Automatic merge of T1.6-rc4-32-g196d83e86 and 13 pull requests

- Pull request #1104 at 6ef735b: Handle simple adhesion within the axle module
- Pull request #1057 at 1c2bcb4: Switchable brake system
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 7fc8de1: Automatic speed control
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID.
- Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters
- Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -2735,11 +2735,27 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
                         // Simple slip control
                         // Motive force is reduced to the maximum adhesive force
                         // In wheelslip situations, motive force is set to zero
-                        float adhesionLimit;
-                        if (axle.SlipPercent > 115) adhesionLimit = 0;
-                        else if (axle.SlipPercent > 95) adhesionLimit = axle.MaximumWheelAdhesion * (115 - axle.SlipSpeedPercent) / 20;
-                        else adhesionLimit = axle.MaximumWheelAdhesion;
-                        axle.DriveForceN = Math.Sign(axle.DriveForceN) * Math.Min(adhesionLimit * axle.AxleWeightN, Math.Abs(axle.DriveForceN));
+                        float absForceN = Math.Min(Math.Abs(axle.DriveForceN), axle.MaximumWheelAdhesion * axle.AxleWeightN);
+                        float newForceN;
+                        if (axle.HuDIsWheelSlip)
+                        {
+                            newForceN = 0;
+                        }
+                        else if (!axle.HuDIsWheelSlipWarning)
+                        {
+                            // If well below slip threshold, restore full power in 10 seconds
+                            newForceN = Math.Min(Math.Abs(prevForceN) + absForceN * elapsedClockSeconds / 10, absForceN);
+                        }
+                        else if (axle.IsWheelSlip)
+                        {
+                            newForceN = Math.Max(Math.Abs(prevForceN) - absForceN * elapsedClockSeconds / 3, 0);
+                        }
+                        else
+                        {
+                            newForceN = absForceN;
+                        }
+                        if (axle.DriveForceN > 0 && prevForceN >= 0) axle.DriveForceN = newForceN;
+                        else if (axle.DriveForceN < 0 && prevForceN <= 0) axle.DriveForceN = -newForceN;
                     }
                     else if (SlipControlSystem == SlipControlType.CutPower)
                     {