Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 13 pull requests

- Pull request #1104 at 1f7af77: 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 #1123 at dc286f5: Handle null control active locomotive
- Pull request #1125 at 7a4f055: Lift #1096 into 1.6 release
- Pull request #1129 at 034b6e2: adds missing es.po files
- 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

@@ -2769,7 +2769,7 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
                     {
                         if (axle.DriveForceN != 0 && (AdvancedAdhesionModel || !AntiSlip))
                         {
-                            if (axle.SlipPercent > axle.SlipWarningTresholdPercent) SlipControlActive[i] = true;
+                            if (axle.HuDIsWheelSlipWarning) SlipControlActive[i] = true;
                         }
                         else
                         {
@@ -2779,18 +2779,22 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
                         {
                             float absForceN = Math.Abs(axle.DriveForceN);
                             float newForceN;
-                            if (axle.SlipPercent < axle.SlipWarningTresholdPercent * 0.9f)
+                            if (!axle.HuDIsWheelSlipWarning)
                             {
                                 // If well below slip threshold, restore full power in 10 seconds
                                 newForceN = Math.Min(Math.Abs(prevForceN) + absForceN * elapsedClockSeconds / 10, absForceN);
 
                                 // If full force is restored, disengage slip control
                                 if (newForceN / absForceN > 0.95f) SlipControlActive[i] = false;
                             }
-                            else
+                            else if (axle.IsWheelSlipWarning)
                             {
                                 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;
                         }