Automatic merge of T1.6-rc4-30-gc09ebebcf 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 #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/Documentation/Manual/options.rst

@@ -875,7 +875,7 @@ checked:
 - the maximum brake cylinder pressure will be reduced to the maximum pressure
   possible from a full service train brake application if it was set above this
   amount
-- any brake pipe leakage specified by ``TrainPipeLeakRate`` is disabled
+- any brake pipe leakage specified by ``TrainPipeLeakRate`` is limited to 2.5 psi/minute
 - the dynamic brake delay on electric locomotives is reduced to 2 seconds
   if it was defined to be above 4 seconds
 - dynamic brake force left at the default value of 20kN will be increased to

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

@@ -1887,21 +1887,6 @@ public override void Initialize()
                 }
             }
 
-            // Initialise Train Pipe Leak Rate
-            if (TrainBrakePipeLeakPSIorInHgpS == 0) // Check to see if TrainBrakePipeLeakPSIorInHgpS has been set in the ENG file.
-            {
-                // Set Default Train Brake Pipe Leak depending upon whether locomotive has Vacuum or air brakes - overwritten by ENG file setting.
-                // Default currently set to zero - means that by default function is off, and a value must be entered into the ENG file to get it to work
-                if ((BrakeSystem is VacuumSinglePipe))
-                {
-                    TrainBrakePipeLeakPSIorInHgpS = 0.0f; // Vacuum brakes
-                }
-                else
-                {
-                    TrainBrakePipeLeakPSIorInHgpS = 0.0f; // Air brakes
-                }
-            }
-
             if (DynamicBrakeEngineBrakeReplacement && DynamicBrakeEngineBrakeReplacementSpeed == 0)
             {
                 DynamicBrakeEngineBrakeReplacementSpeed = DynamicBrakeSpeed2MpS;
@@ -2023,9 +2008,9 @@ protected void CorrectBrakingParams()
                     // correct questionable MaxCylPressurePSI
                     BrakeSystem.CorrectMaxCylPressurePSI(this);
                 }
-                // Disable brake pipe leak to prevent stuck brakes
-                if (TrainBrakePipeLeakPSIorInHgpS > 0)
-                    TrainBrakePipeLeakPSIorInHgpS = 0;
+                // Limit brake pipe leak to 2.5 psi/min (~ 1 bar every 6 minutes) to prevent stuck brakes
+                if (TrainBrakePipeLeakPSIorInHgpS > 2.5f / 60f)
+                    TrainBrakePipeLeakPSIorInHgpS = 2.5f / 60f;
             }
             // No OR compressor speed defined, use MSTS compressor speed or 0.025 m^3/s (whichever is higher)
             if (MainResChargingRatePSIpS < 0)