Automatic merge of T1.6-rc8-59-g2eb7441b08 and 11 pull requests

- Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at e813c42: Automatic speed control
- Pull request #1104 at 7919243: 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 #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1130 at 38aa3fd: Fix F9 points to an incorrect car ID.
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

Source/Contrib/SettingsExporter/Program.cs

@@ -67,7 +67,7 @@ static int Main(string[] args)
             // determine where to load from
             if (fromArg.Equals("INI")) { loadFilePath = SettingsBase.DefaultSettingsFileName; }
             else if (fromArg.Equals("REG")) { loadRegistryKey = SettingsBase.DefaultRegistryKey; }
-            else if (fromArg.EndsWith(".ini")) { loadFilePath = fromArg; }
+            else if (fromArg.Contains(".ini")) { loadFilePath = fromArg; }
             else { loadRegistryKey = fromArg; }
 
             // check that source exists
@@ -212,6 +212,8 @@ static void ShowHelp()
             Console.WriteLine("  <to>       Specify the destination to save the settings to. Similar to <from>.");
             Console.WriteLine("  /h, /help  Show this help.");
             Console.WriteLine();
+            Console.WriteLine("Important: Close all OpenRails instances before exporting the settings. Otherwise the exported settings may be stale.");
+            Console.WriteLine();
             Console.WriteLine("This utility reads the Settings (Options) from one location, and exports them to another location.");
             Console.WriteLine("It creates a backup of any settings that will be overwritten. Example:");
             Console.WriteLine("  <installfolder>\\OpenRails.ini.bak");

Source/Documentation/Manual/appendices.rst

@@ -750,6 +750,9 @@ The Settings Exporter is accessible from the "Tools" button in the main window.
 The Settings Exporter may also be used to create a backup of the settings, or to copy the settings from
 the INI file back into the registry.
 
+Important: Close all OpenRails instances before exporting the settings.
+Otherwise the exported settings may be stale.
+
 Alternatively, create an empty file "OpenRails.ini" in the same folder as "OpenRails.exe" and start Open Rails.
 The program will attempt to load settings from the file, using default values for settings that 
 cannot be found and populates the INI file with these settings.