Automatic merge of T1.6-rc7-38-ge57a7a113 and 15 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. 
- Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast
- Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- 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
- Pull request #1128 at 58de4c3: Particle Emitter Overhaul

Author: openrails-bot

Source/Menu/Options.Designer.cs

@@ -210,8 +210,8 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, Telemetry
             checkDataLogger.Checked = Settings.DataLogger;
             checkDataLogPerformance.Checked = Settings.DataLogPerformance;
             checkDataLogPhysics.Checked = Settings.DataLogPhysics;
-            checkDataLogMisc.Checked = Settings.DataLogMisc;
-            checkDataLogSteamPerformance.Checked = Settings.DataLogSteamPerformance;
+            checkDataLogSteamPerformance.Checked = Settings.DataLogExclusiveSteamPerformance;
+            checkDataLogSteamPowerCurve.Checked = Settings.DataLogExclusiveSteamPowerCurve;
             checkVerboseConfigurationMessages.Checked = Settings.VerboseConfigurationMessages;
 
             // Evaluation tab
@@ -474,8 +474,8 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.DataLogger = checkDataLogger.Checked;
             Settings.DataLogPerformance = checkDataLogPerformance.Checked;
             Settings.DataLogPhysics = checkDataLogPhysics.Checked;
-            Settings.DataLogMisc = checkDataLogMisc.Checked;
-            Settings.DataLogSteamPerformance = checkDataLogSteamPerformance.Checked;
+            Settings.DataLogExclusiveSteamPerformance = checkDataLogSteamPerformance.Checked;
+            Settings.DataLogExclusiveSteamPowerCurve = checkDataLogSteamPowerCurve.Checked;
             Settings.VerboseConfigurationMessages = checkVerboseConfigurationMessages.Checked;
 
             // Evaluation tab

Source/Menu/Options.cs

@@ -144,7 +144,7 @@ public enum DirectXFeature
         public bool DisableTCSScripts { get; set; }
         [Default(false)]
         public bool AutoSaveActive { get; set; }
-        [Default (15)]
+        [Default(15)]
         public int AutoSaveInterval { get; set; }
 
         // Audio settings:
@@ -215,9 +215,9 @@ public enum DirectXFeature
         [Default(false)]
         public bool DataLogPhysics { get; set; }
         [Default(false)]
-        public bool DataLogMisc { get; set; }
+        public bool DataLogExclusiveSteamPerformance { get; set; }
         [Default(false)]
-        public bool DataLogSteamPerformance { get; set; }
+        public bool DataLogExclusiveSteamPowerCurve { get; set; }
         [Default(false)]
         public bool VerboseConfigurationMessages { get; set; }
 

Source/Orts.Settings/UserSettings.cs

@@ -2420,7 +2420,7 @@ public override void Initialize()
 
             ApplyBoilerPressure();
 
-            if (Simulator.Settings.DataLogSteamPerformance)
+            if (Simulator.Settings.DataLogExclusiveSteamPerformance)
             {
                 Trace.TraceInformation("============================================= Steam Locomotive Performance - Locomotive Details =========================================================");
                 Trace.TraceInformation("Version - {0}", VersionInfo.VersionOrBuild);
@@ -6514,7 +6514,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
                 }
 
                 // Calculate the elapse time for the steam performance monitoring
-                if (Simulator.Settings.DataLogSteamPerformance)
+                if (Simulator.Settings.DataLogExclusiveSteamPerformance)
                 {
                     if (SpeedMpS > 0.05)
                     {