Automatic merge of T1.6-115-g0d2de70b7 and 12 pull requests

- Pull request #1082 at 8538170: Allow variable water level in glass gauge
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1128 at d116396: Particle Emitter Overhaul
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9.
- Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
- Pull request #1165 at 168c27c: docs: Add code guidelines for logging
- Pull request #1160 at 9dc6b3b: Route Based TTrack Sounds

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -2416,7 +2416,7 @@ private void UpdateDriveWheelWeight(int index,  float masskg, int numberofengine
             }
         }
 
-            private void UpdateTrainBaseResistance()
+        private void UpdateTrainBaseResistance()
         {
             IsBelowMergeSpeed = AbsSpeedMpS < MergeSpeedMpS;
             IsStandStill = AbsSpeedMpS < 0.1f;
@@ -2661,7 +2661,7 @@ private void UpdateTrainBaseResistance_StartingFriction()
         {
             // Dtermine the starting friction factor based upon the type of bearing
             float StartFrictionLoadN = StandstillFrictionN;  // Starting friction
-
+            
             // Determine the starting resistance due to wheel bearing temperature
             // Note reference values in lbf and US tons - converted to metric values as appropriate
             // At -10 DegC it will be equal to the snowing value, as the temperature increases to 25 DegC, it will move towards the summer value
@@ -2795,22 +2795,22 @@ private void UpdateTrainBaseResistance_DavisLowSpeed()
             }
 
             if (WheelBearingTemperatureDegC < LowTemperature)
-                {
-                    // Set to snowing (frozen value)
+            {
+                // Set to snowing (frozen value)
                 StartFrictionInternalFactorN = LowTemperatureResistanceN;
-                }
+            }
             else if (WheelBearingTemperatureDegC > HighTemeprature)
-                {
-                    // Set to normal temperature value
+            {
+                // Set to normal temperature value
                 StartFrictionInternalFactorN = HighTemperatureResistanceN;
-                }
-                else
-                {
-                    // Set to variable value as bearing heats and cools
+            }
+            else
+            {
+                // Set to variable value as bearing heats and cools
                 float LowGrad = (LowTemperatureResistanceN - HighTemperatureResistanceN) / (LowTemperature - HighTemeprature);
                 float LowIntersect = LowTemperatureResistanceN - (LowGrad * LowTemperature);
-                    StartFrictionInternalFactorN = LowGrad * WheelBearingTemperatureDegC + LowIntersect;
-                }
+                StartFrictionInternalFactorN = LowGrad * WheelBearingTemperatureDegC + LowIntersect;
+            }
 
             // Determine the track starting resistance, based upon the axle loading of the wagon
             float LowLoadGrade = 800.0f;