Source of /projects/or

# CLASS project_summary_box
# BREAKOUT right
 # CLASS heading
 Project Summary
 Author: "Open Rails Team" <http://openrails.org> property:[dbpedia-owl:developer] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
 Language: "*C#*" <https://wikipedia.org/wiki/C_Sharp_(programming_language)> property:[dbpedia-owl:language] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/] resource:[http://dbpedia.org/resource/C_Sharp_(programming_language)]
 License: "*GPL-3.0-only*" <https://opensource.org/license/gpl-3-0/> rel:[license] property:[dbpedia-owl:license] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
 Browse: "Builds" <or/builds>, "Log" <or/log>, "Triage" <or/triage>, "Documentation" <or/documentation>, "Repository" <https://git.launchpad.net/or>
 Last automatic build: "U2026.08.16-2253 2026-08-17 00:02:28" <or/builds/2026-08-17_00-02-28_U2026.08.16-2253/Open Rails U2026.08.16-2253 2026-08-17 00-02-28.zip>
 Build status: <image:or/ci_status.svg>
 Last changed: *2026-08-14 16:10:43*
 *git clone https:@//git.launchpad.net/or*

# BREAKOUT END

# CLASS cps-page-title-reversed
Silver's Simple Site @- Projects @- Open Rails
**********************************************

# BREAKOUT left
 <image:or/logo.png> property:[dbpprop:logo] xmlns:dbpprop:[http://dbpedia.org/property/]
# BREAKOUT END
# property rdfs:comment
# xmlns:rdfs http://www.w3.org/2000/01/rdf-schema#
Open Rails is a train simulator that supports the world's largest range of digital content. Accurate behaviour for steam, diesel and electric traction including trains with multiple locos. Signals which correctly protect the train and permit complex timetabled operations. Multi-user mode in which any timetabled train can be driven in person or by computer.
# CLASS clearfix
-

Preview
=======
# BORDER 1px #000000
# BACKGROUND #000000
# COLOR #FFFFFF
||C:\Program Files\dotnet\sdk\10.0.400\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
||C:\Program Files\dotnet\sdk\10.0.400\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
||C:\Program Files\dotnet\sdk\10.0.400\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
||Open Rails Code Bot started at 2026-08-17 07:22:58Z
||GitHub organisation: openrails
||GitHub team:         development-team
||GitHub repository:   openrails
||GitHub base branch:  master
||GitHub merge branch: unstable
||Team members (18):
||  Sharpe49
||  twpol
||  cjakeman
||  pzgulyas
||  YoRyan
||  perpetualKid
||  strawberryfield
||  cesarBLG
||  peternewell
||  Csantucci
||  Roeterdink
||  wjcurrey
||  Looky1173
||  markus-GE
||  mbm-OR
||  SteelFill
||  sweiland-openrails
||  rwf-rr
||Open pull requests (32):
||  #57 Ensure that build fails when tests fail to run
||    By:     twpol
||    Branch: bugfix/net4-test-runner
||    Draft:  True
||    Labels: not-for-unstable infrastructure
||    Allowed to auto-merge? False
||  #527 Brake cuts power refactor and new parameters
||    By:     Sharpe49
||    Branch: brake-cuts-power-refactor
||    Draft:  False
||    Labels: enhancement not-for-unstable
||    Allowed to auto-merge? False
||  #541 Initial Virtual File System development
||    By:     pzgulyas
||    Branch: ziparchive
||    Draft:  True
||    Labels: enhancement not-for-unstable
||    Allowed to auto-merge? False
||  #570 glTF 2.0 support with PBR lighting
||    By:     pzgulyas
||    Branch: gltf2
||    Draft:  False
||    Labels: enhancement for-unstable
||    Allowed to auto-merge? True
||  #800 Changes to migrate from Launchpad Bugs to GitHub Issues
||    By:     cjakeman
||    Branch: migrate-bugtracker
||    Draft:  True
||    Labels: website documentation not-for-unstable infrastructure
||    Allowed to auto-merge? False
||  #886 Scene viewer extension to TrackViewer
||    By:     pzgulyas
||    Branch: tv3d-m
||    Draft:  True
||    Labels: enhancement not-for-unstable
||    Allowed to auto-merge? False
||  #1013 Tools for reverse engineering shape and ace files (converting)
||    By:     Hirek193
||    Branch: master
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? False
||  #1057 Switchable brake system
||    By:     pzgulyas
||    Branch: gpr
||    Draft:  False
||    Labels: enhancement for-unstable
||    Allowed to auto-merge? True
||  #1081 Brake cuts power unification
||    By:     cesarBLG
||    Branch: brake-cuts-power
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1091 Automatic speed control
||    By:     cesarBLG
||    Branch: cruise-control-review
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1122 Wagon Size and Centering Controls
||    By:     SteelFill
||    Branch: size_centering
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1124 Built-in PBL2 brake controller
||    By:     cesarBLG
||    Branch: pbl2
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1126 ShapeHierarchy Attachment for More Wagon Addons
||    By:     SteelFill
||    Branch: shape_hierarchy
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1127 Advanced Shape Descriptor Controls
||    By:     SteelFill
||    Branch: shape_descriptor_features
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1128 Particle Emitter Overhaul
||    By:     SteelFill
||    Branch: particle_emitter_overhaul
||    Draft:  False
||    Labels: enhancement refactoring
||    Allowed to auto-merge? True
||  #1186 Hot Reloading of Trains, Scenery, and Terrain
||    By:     SteelFill
||    Branch: hot_reload
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1212 Add dynamic spotlight lighting system
||    By:     Adhi-APLHA-mca
||    Branch: feature/dynamic-lighting-system
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? False
||  #1214 Update Steam Cylinder Performance
||    By:     peternewell
||    Branch: steam_events_#1
||    Draft:  True
||    Labels: enhancement for-unstable
||    Allowed to auto-merge? True
||  #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
||    By:     Csantucci
||    Branch: mp-switch-sync
||    Draft:  True
||    Labels: bug
||    Allowed to auto-merge? True
||  #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)
||    By:     SteelFill
||    Branch: engines_tweaks
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1233 adds Log Motion Data to DataLogger
||    By:     cjakeman
||    Branch: coupling-rod-drift
||    Draft:  True
||    Labels: bug
||    Allowed to auto-merge? True
||  #1235 Expanded Engine RPM Behaviors
||    By:     SteelFill
||    Branch: engine_rpm
||    Draft:  False
||    Labels: enhancement refactoring
||    Allowed to auto-merge? True
||  #1236 adds MissingItem type to handle new item types in notifications/menu.json
||    By:     cjakeman
||    Branch: fix-notifications-missing-item-type
||    Draft:  False
||    Labels: bug
||    Allowed to auto-merge? True
||  #1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
||    By:     sweiland-openrails
||    Branch: display_controls_3d
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1238 Remove transmission from axle module
||    By:     cesarBLG
||    Branch: axle-transmission-efficiency
||    Draft:  False
||    Labels: refactoring
||    Allowed to auto-merge? True
||  #1240 Fix bug with auxiliary tender
||    By:     peternewell
||    Branch: Aux_Tender
||    Draft:  False
||    Labels: bug
||    Allowed to auto-merge? True
||  #1241 Add Support for Dynamic Road Sections
||    By:     SteelFill
||    Branch: dynamic_roads
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1242 Upgrade to .NET 6
||    By:     twpol
||    Branch: feature/dotnet-6
||    Draft:  False
||    Labels: infrastructure
||    Allowed to auto-merge? True
||  #1243 Fix for system name not extracted by Notifications
||    By:     cjakeman
||    Branch: fix/bad-system-name
||    Draft:  False
||    Labels: bug
||    Allowed to auto-merge? True
||  #1244 Fix Speed Limit Warning Signs in Track Monitor
||    By:     SteelFill
||    Branch: HUD
||    Draft:  False
||    Labels: bug
||    Allowed to auto-merge? True
||  #1245 Allow Defining Multiple SMS Files Simultaneously
||    By:     SteelFill
||    Branch: multi_sounds
||    Draft:  False
||    Labels: enhancement
||    Allowed to auto-merge? True
||  #1246 Support for higher-resolution terrain
||    By:     twpol
||    Branch: feature/hi-res-terrain
||    Draft:  True
||    Labels: enhancement
||    Allowed to auto-merge? True
||Pull requests suitable for auto-merging (25) [(d) = draft, (i) = for-unstable]:
||      (i) #570 glTF 2.0 support with PBR lighting
||      (i) #1057 Switchable brake system
||          #1081 Brake cuts power unification
||          #1091 Automatic speed control
||          #1124 Built-in PBL2 brake controller
||          #1128 Particle Emitter Overhaul
||          #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)
||          #1235 Expanded Engine RPM Behaviors
||          #1236 adds MissingItem type to handle new item types in notifications/menu.json
||          #1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
||          #1238 Remove transmission from axle module
||          #1240 Fix bug with auxiliary tender
||          #1242 Upgrade to .NET 6
||          #1243 Fix for system name not extracted by Notifications
||          #1244 Fix Speed Limit Warning Signs in Track Monitor
||          #1245 Allow Defining Multiple SMS Files Simultaneously
||  (d) (i) #1214 Update Steam Cylinder Performance
||  (d)     #1122 Wagon Size and Centering Controls
||  (d)     #1126 ShapeHierarchy Attachment for More Wagon Addons
||  (d)     #1127 Advanced Shape Descriptor Controls
||  (d)     #1186 Hot Reloading of Trains, Scenery, and Terrain
||  (d)     #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
||  (d)     #1233 adds Log Motion Data to DataLogger
||  (d)     #1241 Add Support for Dynamic Road Sections
||  (d)     #1246 Support for higher-resolution terrain
||Preparing repository...
||  > git --no-pager config remove-section remote.origin
||  > git --no-pager remote add origin --mirror=fetch git@github.com:openrails/openrails.git
||  > git --no-pager fetch --update-head-ok
||  > git --no-pager reset --hard
||  < HEAD is now at da60d6330f Automatic merge of T1.6.1-399-g47b64cca15 and 17 pull requests
||  > git --no-pager clean --force -d -x
||  > git --no-pager checkout --quiet --detach 47b64cca15616fde979055347f3a5c2b6668714a
||Merging #570 glTF 2.0 support with PBR lighting...
||  .appveyor.yml +2 -3
||  Program/Readme - this folder is intentionally empty.txt +0 -32
||  Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt +10 -0
||  Source/3rdPartyLibs/glTFLoader/animation.channel.target.schema.json +40 -0
||  Source/3rdPartyLibs/glTFLoader/extras.schema.json +13 -0
||  Source/Contrib/TrackViewer/Drawing/BasicShapes.cs +1 -1
||  Source/Contrib/TrackViewer/Drawing/DrawTerrain.cs +1 -1
||  Source/Documentation/Manual/developing.rst +173 -0
||  Source/ORTS.Common/ConsistGenerator.cs +204 -0
||  Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
||  Source/Orts.Settings/UserSettings.cs +2 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +7 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +3 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs +4 -1
||  Source/Orts.Simulation/Simulation/Simulator.cs +2 -2
||  Source/Orts.Simulation/Simulation/Turntables.cs +15 -15
||  Source/Orts.Simulation/Simulation/Weather.cs +25 -0
||  Source/RunActivity/Content/Bloom.fx +275 -0
||  Source/RunActivity/Content/EnvMap/cmft.bat +74 -0
||  Source/RunActivity/Content/SceneryShader.fx +1,096 -319
||  Source/RunActivity/Content/ShadowMap.fx +260 -44
||  Source/RunActivity/RunActivity.csproj +12 -0
||  Source/RunActivity/Viewer3D/AnimatedPart.cs +201 -82
||  Source/RunActivity/Viewer3D/Cameras.cs +50 -0
||  Source/RunActivity/Viewer3D/DDSLib.cs +508 -73
||  Source/RunActivity/Viewer3D/Forest.cs +18 -14
||  Source/RunActivity/Viewer3D/GltfShape.cs +2,190 -0
||  Source/RunActivity/Viewer3D/Lights.cs +116 -40
||  Source/RunActivity/Viewer3D/MSTSSky.cs +0 -3
||  Source/RunActivity/Viewer3D/Materials.cs +1,241 -225
||  Source/RunActivity/Viewer3D/ParticleEmitter.cs +8 -6
||  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +8 -6
||  Source/RunActivity/Viewer3D/Precipitation.cs +18 -13
||  Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +2 -2
||  Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
||  Source/RunActivity/Viewer3D/RenderFrame.cs +453 -192
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +49 -44
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +94 -78
||  Source/RunActivity/Viewer3D/RollingStock/SubSystems/DistributedPowerInterface.cs +8 -6
||  Source/RunActivity/Viewer3D/Scenery.cs +18 -5
||  Source/RunActivity/Viewer3D/Shaders.cs +288 -91
||  Source/RunActivity/Viewer3D/Shapes.cs +689 -861
||  Source/RunActivity/Viewer3D/Signals.cs +139 -160
||  Source/RunActivity/Viewer3D/Sky.cs +0 -5
||  Source/RunActivity/Viewer3D/SkyInterpolation.cs +2 -0
||  Source/RunActivity/Viewer3D/Terrain.cs +30 -13
||  Source/RunActivity/Viewer3D/Transfers.cs +17 -14
||  Source/RunActivity/Viewer3D/Viewer.cs +2 -2
||  Source/RunActivity/Viewer3D/Water.cs +21 -12
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 29351b69026e85cc08a560a214fecc91ddd75c53
||  < Auto-merging Source/Orts.Formats.Msts/ConsistFile.cs
||  < Auto-merging Source/Orts.Settings/UserSettings.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
||  < Auto-merging Source/RunActivity/Viewer3D/MSTSSky.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Scenery.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
||Merging #1057 Switchable brake system...
||  Source/Documentation/Manual/physics.rst +70 -2
||  Source/Orts.Common/Conversions.cs +1 -1
||  Source/Orts.Parsers.Msts/STFReader.cs +2 -3
||  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -0
||  Source/Orts.Simulation/Simulation/Physics/Train.cs +40 -25
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +62 -29
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +480 -685
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +76 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +236 -100
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +4 -5
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +0 -11
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +5 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +3 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +10 -15
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +6 -5
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +78 -21
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +6 -6
||  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +15 -6
||  Source/Orts.Simulation/Simulation/Simulator.cs +4 -4
||  Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +3 -3
||  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +17 -5
||  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +4 -4
||  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +63 -3
||  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
||  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
||  Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +12 -12
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
||Merging #1081 Brake cuts power unification...
||  Source/Documentation/Manual/physics.rst +7 -2
||  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +7 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +3 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +14 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +3 -9
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +3 -3
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a8127a1a48b670d053696e3aee9bbff97684c989
||  < Auto-merging Source/Documentation/Manual/physics.rst
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 993501baed Merge commit '261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a8127a1a48b670d053696e3aee9bbff97684c989 failed: 1
||Merging #1091 Automatic speed control...
||  Source/Documentation/Manual/cruisecontrol.rst +79 -33
||  Source/Orts.Common/AccelerationController.cs +105 -0
||  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -2
||  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +30 -0
||  Source/Orts.Simulation/Simulation/Confirmer.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +63 -296
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +9 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs +25 -17
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MultiPositionController.cs +6 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +661 -664
||  Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs +1 -1
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +32 -74
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5ac1f7d87a6730bd516315fd3bdd46421e888c3b
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 993501baed Merge commit '261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5ac1f7d87a6730bd516315fd3bdd46421e888c3b failed: 1
||Merging #1124 Built-in PBL2 brake controller...
||  Source/Documentation/Manual/features-rollingstock.rst +9 -2
||  Source/Orts.Formats.Msts/CabViewFile.cs +2 -0
||  Source/Orts.Simulation/Common/Commands.cs +22 -3
||  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +10 -0
||  Source/Orts.Simulation/Simulation/Confirmer.cs +2 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +10 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +26 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/PBL2BrakeController.cs +465 -0
||  Source/Orts.Simulation/Simulation/Simulator.cs +1 -0
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +3 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e241a0d1226220a09811b6882077c9eb77657a92
||  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
||  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 993501baed Merge commit '261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e241a0d1226220a09811b6882077c9eb77657a92 failed: 1
||Merging #1128 Particle Emitter Overhaul...
||  Source/Documentation/Manual/physics.rst +217 -10
||  Source/Orts.Simulation/MultiPlayer/Message.cs +14 -12
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +4 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +69 -137
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +131 -52
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +2 -4
||  Source/RunActivity/Content/ParticleEmitterShader.fx +44 -21
||  Source/RunActivity/RunActivity.csproj +6 -0
||  Source/RunActivity/Viewer3D/ParticleEmitter.cs +439 -137
||  Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +3 -5
||  Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs +47 -45
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +14 -14
||  Source/RunActivity/Viewer3D/Shaders.cs +7 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 941abd8cd323f65880244734d052c84d41e28ab6
||  < Auto-merging Source/Documentation/Manual/physics.rst
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
||  < Auto-merging Source/RunActivity/RunActivity.csproj
||  < CONFLICT (content): Merge conflict in Source/RunActivity/RunActivity.csproj
||  < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 993501baed Merge commit '261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 941abd8cd323f65880244734d052c84d41e28ab6 failed: 1
||Merging #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)...
||  Source/Documentation/Manual/driving.rst +64 -9
||  Source/Documentation/Manual/sound.rst +34 -11
||  Source/Orts.Formats.Msts/SoundManagmentFile.cs +217 -83
||  Source/Orts.Simulation/Simulation/Physics/Train.cs +10 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +12 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +7 -13
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +43 -15
||  Source/RunActivity/Viewer3D/ALSoundHelper.cs +14 -0
||  Source/RunActivity/Viewer3D/Debugging/SoundDebugForm.Designer.cs +660 -298
||  Source/RunActivity/Viewer3D/Debugging/SoundDebugForm.cs +316 -124
||  Source/RunActivity/Viewer3D/Sound.cs +104 -170
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b0664efa0a1d5383698d5c02cc78507046956efe
||  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||Merging #1235 Expanded Engine RPM Behaviors...
||  Source/Documentation/Manual/options.rst +17 -0
||  Source/Documentation/Manual/physics.rst +463 -128
||  Source/Orts.Common/Conversions.cs +23 -0
||  Source/Orts.Formats.Msts/EngineFile.cs +3 -0
||  Source/Orts.Parsers.Msts/Interpolator.cs +91 -24
||  Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +32 -11
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +191 -110
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +71 -19
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +2 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +19 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +1,185 -1,108
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +6 -7
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +3 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/GearBox.cs +8 -19
||  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +10 -10
||  Source/RunActivity/Viewer3D/Popups/HelpWindow.cs +6 -3
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f7091767eb98ad322eb2ecbab876729330f8fadc
||  < Auto-merging Source/Documentation/Manual/physics.rst
||  < Auto-merging Source/Orts.Common/Conversions.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
||Merging #1236 adds MissingItem type to handle new item types in notifications/menu.json...
||  Source/Menu/Notifications/NotificationManager.cs +18 -4
||  Source/Menu/Notifications/Notifications.cs +8 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 14144d9b502214057ccade1afafb66ede3aefab9
||Merging #1237 added Control Rectangles (Ctrl+F5) for 3d locomotives...
||  Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs +39 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d29cebf937a6904d07e3fdeca5ea06226900d369
||Merging #1238 Remove transmission from axle module...
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +9 -58
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/ElectricMotor.cs +17 -3
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/InductionMotor.cs +4 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/SeriesMotor.cs +2 -2
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7d4c2582923ff33df67ff7a5596fb3bd3d1932bd
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs
||Merging #1240 Fix bug with auxiliary tender...
||  Source/Orts.Simulation/Simulation/Physics/Train.cs +37 -29
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 48bd2733fdb93f3c39f2a5a593831d59dde1623c
||  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
||Merging #1242 Upgrade to .NET 6...
||  .appveyor.yml +4 -5
||  .config/dotnet-tools.json +1 -1
||  Build.cmd +8 -12
||  Source/ContentChecker/ContentChecker.csproj +2 -3
||  Source/ContentChecker/app.config +0 -6
||  Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj +2 -3
||  Source/Contrib/ActivityEditor/ActivityEditor/app.config +0 -6
||  Source/Contrib/ActivityEditor/LibAE/LibAE.csproj +2 -3
||  Source/Contrib/ContentManager/ContentManager.csproj +1 -2
||  Source/Contrib/ContentManager/app.config +0 -3
||  Source/Contrib/DataCollector/DataCollector.csproj +2 -3
||  Source/Contrib/DataCollector/app.config +0 -6
||  Source/Contrib/DataConverter/DataConverter.csproj +1 -2
||  Source/Contrib/DataConverter/app.config +0 -6
||  Source/Contrib/DataValidator/DataValidator.csproj +1 -3
||  Source/Contrib/DataValidator/app.config +0 -6
||  Source/Contrib/SettingsExporter/SettingsExporter.csproj +1 -2
||  Source/Contrib/SimulatorTester/App.config +0 -6
||  Source/Contrib/SimulatorTester/SimulatorTester.csproj +1 -3
||  Source/Contrib/TimetableEditor/App.config +0 -6
||  Source/Contrib/TimetableEditor/TimetableEditor.csproj +1 -3
||  Source/Contrib/TrackViewer/TrackViewer.csproj +2 -3
||  Source/Contrib/TrackViewer/app.config +1 -1
||  Source/Directory.Build.props +3 -0
||  Source/Installer/CodeDependencies.iss +872 -0
||  Source/Installer/Installer.iss +13 -63
||  Source/Installer/Version.iss +1 -1
||  Source/Launcher/Launcher.csproj +1 -2
||  Source/Launcher/Program.cs +3 -69
||  Source/Launcher/app.config +0 -7
||  Source/Menu/Menu.csproj +2 -3
||  Source/Menu/app.config +0 -6
||  Source/MultiPlayerServer/MultiPlayerServer.csproj +1 -2
||  Source/Orts.Common/Orts.Common.csproj +2 -3
||  Source/Orts.Content/Orts.Content.csproj +1 -2
||  Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj +2 -3
||  Source/Orts.Formats.OR/Orts.Formats.OR.csproj +2 -3
||  Source/Orts.IO/Orts.IO.csproj +1 -2
||  Source/Orts.Menu/Orts.Menu.csproj +1 -2
||  Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj +2 -3
||  Source/Orts.Parsers.OR/Orts.Parsers.OR.csproj +2 -3
||  Source/Orts.Settings/Orts.Settings.csproj +2 -3
||  Source/Orts.Simulation/Orts.Simulation.csproj +2 -3
||  Source/Orts.Updater/Orts.Updater.csproj +1 -2
||  Source/RunActivity/Prerequisites.txt +6 -5
||  Source/RunActivity/Readme.txt +2 -2
||  Source/RunActivity/RunActivity.csproj +2 -4
||  Source/RunActivity/Viewer3D/Shaders.cs +0 -35
||  Source/RunActivity/app.config +0 -6
||  Source/Tests/Tests.csproj +2 -3
||  Source/Updater/Updater.csproj +1 -2
||  Source/Updater/app.config +0 -6
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fccd89d076bfede9b7e0f726bf8d74c19a8ca42e
||  < Auto-merging .appveyor.yml
||  < Auto-merging Source/Contrib/SettingsExporter/SettingsExporter.csproj
||  < Auto-merging Source/RunActivity/RunActivity.csproj
||  < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
||Merging #1243 Fix for system name not extracted by Notifications...
||  Source/Menu/Notifications/NotificationManager.cs +11 -1
||  Source/Menu/Notifications/Notifications.cs +2 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13eef889d31578a998a6c199850846a23dd58b73
||  < Auto-merging Source/Menu/Notifications/NotificationManager.cs
||  < Auto-merging Source/Menu/Notifications/Notifications.cs
||Merging #1244 Fix Speed Limit Warning Signs in Track Monitor...
||  Source/Orts.Simulation/Simulation/Physics/Train.cs +14 -8
||  Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs +1 -1
||  Source/RunActivity/Viewer3D/WebServices/TrackMonitorDisplay.cs +4 -1
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 85e71401eee2c59cc927b7d42a697bf02be15bd7
||  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
||Merging #1245 Allow Defining Multiple SMS Files Simultaneously...
||  Source/Documentation/Manual/sound.rst +28 -0
||  Source/Orts.Formats.Msts/WorldSoundFile.cs +8 -10
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +24 -9
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +31 -11
||  Source/RunActivity/Viewer3D/Sound.cs +9 -6
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 611773d9a1f21455de7c8a3aa7431aaee83ea94e
||  < Auto-merging Source/Documentation/Manual/sound.rst
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
||Merging #1214 Update Steam Cylinder Performance...
||  Source/Orts.Parsers.Msts/STFReader.cs +16 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +5,082 -227
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +2,872 -13
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 73ee2a64b6ac218c5b06799355223948e246f66a
||  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
||Merging #1122 Wagon Size and Centering Controls...
||  Source/Documentation/Manual/features-rollingstock.rst +94 -0
||  Source/Orts.Formats.Msts/ShapeFile.cs +94 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +179 -8
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +7 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ebe6df9de04cf3e944d49bf047d6682253e9832f
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
||Merging #1126 ShapeHierarchy Attachment for More Wagon Addons...
||  Source/Documentation/Manual/cabs.rst +72 -17
||  Source/Documentation/Manual/features-rollingstock.rst +244 -142
||  Source/Documentation/Manual/physics.rst +17 -1
||  Source/Documentation/Manual/sound.rst +133 -0
||  Source/Orts.Formats.Msts/CabViewFile.cs +4 -0
||  Source/Orts.Formats.Msts/LightCollection.cs +2 -0
||  Source/Orts.Formats.Msts/SoundManagmentFile.cs +7 -2
||  Source/Orts.Formats.OR/ContainerFile.cs +1 -1
||  Source/Orts.Simulation/Simulation/Container.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +1 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +13 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +31 -20
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +70 -33
||  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +8 -2
||  Source/RunActivity/Viewer3D/ALSoundHelper.cs +0 -6
||  Source/RunActivity/Viewer3D/AnimatedPart.cs +2 -7
||  Source/RunActivity/Viewer3D/Cameras.cs +98 -23
||  Source/RunActivity/Viewer3D/Lights.cs +12 -33
||  Source/RunActivity/Viewer3D/ParticleEmitter.cs +50 -7
||  Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +0 -1
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +90 -44
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +179 -130
||  Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +39 -7
||  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +3 -41
||  Source/RunActivity/Viewer3D/Shapes.cs +61 -13
||  Source/RunActivity/Viewer3D/Sound.cs +103 -15
||  Source/RunActivity/Viewer3D/Viewer.cs +13 -8
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701
||  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
||  < Auto-merging Source/Documentation/Manual/physics.rst
||  < Auto-merging Source/Documentation/Manual/sound.rst
||  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
||  < Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/SoundManagmentFile.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
||  < Auto-merging Source/RunActivity/Viewer3D/ALSoundHelper.cs
||  < Auto-merging Source/RunActivity/Viewer3D/AnimatedPart.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/AnimatedPart.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Lights.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Lights.cs
||  < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Sound.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Viewer.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 40369e9da1 Merge commit 'ebe6df9de04cf3e944d49bf047d6682253e9832f' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701 failed: 1
||Merging #1127 Advanced Shape Descriptor Controls...
||  Source/Documentation/Manual/features-rollingstock.rst +351 -3
||  Source/Documentation/Manual/options.rst +2 -0
||  Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +118 -3
||  Source/Orts.Formats.OR/ContainerFile.cs +8 -2
||  Source/Orts.Simulation/Simulation/Container.cs +6 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +2 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +2 -1
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +18 -15
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +113 -15
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +29 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +2 -0
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -1
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +53 -32
||  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ContainerViewer.cs +2 -2
||  Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +1 -1
||  Source/RunActivity/Viewer3D/Shapes.cs +353 -33
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f9af9cd2331335328756eb0326d257c9a7a41422
||  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
||  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
||  < Auto-merging Source/Documentation/Manual/options.rst
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 40369e9da1 Merge commit 'ebe6df9de04cf3e944d49bf047d6682253e9832f' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f9af9cd2331335328756eb0326d257c9a7a41422 failed: 1
||Merging #1186 Hot Reloading of Trains, Scenery, and Terrain...
||  Source/Documentation/Manual/options.rst +77 -0
||  Source/Menu/Options.Designer.cs +32 -0
||  Source/Menu/Options.cs +7 -0
||  Source/Orts.Common/Input/UserCommand.cs +1 -0
||  Source/Orts.Formats.Msts/AceFile.cs +20 -6
||  Source/Orts.Formats.Msts/CabViewFile.cs +19 -8
||  Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +40 -5
||  Source/Orts.Formats.Msts/SoundManagmentFile.cs +69 -8
||  Source/Orts.Parsers.Msts/STFReader.cs +11 -1
||  Source/Orts.Settings/InputSettings.cs +1 -0
||  Source/Orts.Settings/UserSettings.cs +2 -0
||  Source/Orts.Simulation/Common/ORTSPaths.cs +1 -1
||  Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +2 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +3 -3
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +2 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +68 -30
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +20 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +121 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +8 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/IController.cs +1 -0
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +3 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs +2 -2
||  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +19 -4
||  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +11 -3
||  Source/Orts.Simulation/Simulation/Simulator.cs +194 -0
||  Source/RunActivity/Viewer3D/ALSoundHelper.cs +14 -0
||  Source/RunActivity/Viewer3D/DDSLib.cs +2 -1
||  Source/RunActivity/Viewer3D/DynamicTrack.cs +84 -7
||  Source/RunActivity/Viewer3D/Forest.cs +17 -1
||  Source/RunActivity/Viewer3D/Lights.cs +77 -22
||  Source/RunActivity/Viewer3D/Materials.cs +174 -32
||  Source/RunActivity/Viewer3D/ParticleEmitter.cs +34 -0
||  Source/RunActivity/Viewer3D/Popups/OSDLocations.cs +4 -4
||  Source/RunActivity/Viewer3D/Processes/SoundProcess.cs +201 -2
||  Source/RunActivity/Viewer3D/RoadCars.cs +28 -4
||  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +137 -13
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +94 -4
||  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +19 -0
||  Source/RunActivity/Viewer3D/Scenery.cs +240 -53
||  Source/RunActivity/Viewer3D/Shapes.cs +132 -16
||  Source/RunActivity/Viewer3D/Signals.cs +15 -0
||  Source/RunActivity/Viewer3D/Sound.cs +56 -35
||  Source/RunActivity/Viewer3D/Terrain.cs +131 -14
||  Source/RunActivity/Viewer3D/Tiles.cs +11 -4
||  Source/RunActivity/Viewer3D/Trains.cs +35 -16
||  Source/RunActivity/Viewer3D/Transfers.cs +16 -1
||  Source/RunActivity/Viewer3D/Viewer.cs +435 -4
||  Source/RunActivity/Viewer3D/Water.cs +36 -0
||  Source/RunActivity/Viewer3D/World.cs +23 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 51969db53f0732707c4bf40474f4128e3a461f78
||  < Auto-merging Source/Documentation/Manual/options.rst
||  < Auto-merging Source/Menu/Options.Designer.cs
||  < Auto-merging Source/Menu/Options.cs
||  < Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/SoundManagmentFile.cs
||  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
||  < Auto-merging Source/Orts.Settings/UserSettings.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
||  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
||  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
||  < Auto-merging Source/RunActivity/Viewer3D/DDSLib.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Forest.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Lights.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Materials.cs
||  < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Scenery.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Sound.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Transfers.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Water.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at 40369e9da1 Merge commit 'ebe6df9de04cf3e944d49bf047d6682253e9832f' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 51969db53f0732707c4bf40474f4128e3a461f78 failed: 1
||Merging #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode...
||  Source/Orts.Simulation/MultiPlayer/Message.cs +1 -0
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 135564bc83be461132fa62606cac89b24ed56e35
||Merging #1233 adds Log Motion Data to DataLogger...
||  Source/Menu/Options.Designer.cs +13 -0
||  Source/Menu/Options.cs +1 -0
||  Source/Orts.Settings/UserSettings.cs +2 -0
||  Source/RunActivity/Viewer3D/InfoDisplay.cs +16 -0
||  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +15 -3
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6e6c0f682c43db2955b936170a3ef0f02ac1a98b
||  < Auto-merging Source/Menu/Options.Designer.cs
||  < Auto-merging Source/Menu/Options.cs
||  < Auto-merging Source/Orts.Settings/UserSettings.cs
||  < Auto-merging Source/RunActivity/Viewer3D/InfoDisplay.cs
||  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
||  < Automatic merge failed; fix conflicts and then commit the result.
||  > git --no-pager reset --hard
||  < HEAD is now at e52624733d Merge commit '135564bc83be461132fa62606cac89b24ed56e35' into HEAD
||  > git --no-pager clean --force -d -x
||  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6e6c0f682c43db2955b936170a3ef0f02ac1a98b failed: 1
||Merging #1241 Add Support for Dynamic Road Sections...
||  Source/Orts.Formats.Msts/WorldFile.cs +8 -0
||  Source/Orts.Parsers.Msts/TokenID.cs +2 -1
||  Source/RunActivity/Viewer3D/DynamicTrack.cs +111 -3
||  Source/RunActivity/Viewer3D/Scenery.cs +33 -32
||  Source/RunActivity/Viewer3D/SuperElevation.cs +52 -34
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fb45299b1bead610478a30e7351546bad6c514d7
||  < Auto-merging Source/RunActivity/Viewer3D/Scenery.cs
||Merging #1246 Support for higher-resolution terrain...
||  Source/RunActivity/Viewer3D/RenderFrame.cs +1 -2
||  Source/RunActivity/Viewer3D/Terrain.cs +28 -30
||  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 14d1f00c2ae97f634f2cefffd472edd99617b6b9
||  < Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
||  < Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
||Pull requests successfully auto-merged (17):
||  #570 glTF 2.0 support with PBR lighting
||  #1057 Switchable brake system
||  #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)
||  #1235 Expanded Engine RPM Behaviors
||  #1236 adds MissingItem type to handle new item types in notifications/menu.json
||  #1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
||  #1238 Remove transmission from axle module
||  #1240 Fix bug with auxiliary tender
||  #1242 Upgrade to .NET 6
||  #1243 Fix for system name not extracted by Notifications
||  #1244 Fix Speed Limit Warning Signs in Track Monitor
||  #1245 Allow Defining Multiple SMS Files Simultaneously
||  #1214 Update Steam Cylinder Performance
||  #1122 Wagon Size and Centering Controls
||  #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
||  #1241 Add Support for Dynamic Road Sections
||  #1246 Support for higher-resolution terrain
||Pull requests not auto-merged (8):
||  #1081 Brake cuts power unification
||  #1091 Automatic speed control
||  #1124 Built-in PBL2 brake controller
||  #1128 Particle Emitter Overhaul
||  #1126 ShapeHierarchy Attachment for More Wagon Addons
||  #1127 Advanced Shape Descriptor Controls
||  #1186 Hot Reloading of Trains, Scenery, and Terrain
||  #1233 adds Log Motion Data to DataLogger
||No changes to push into merge branch
||  > git --no-pager checkout --quiet unstable
||Open Rails Code Bot finished at 2026-08-17 07:23:13Z

Continuous Integration graphs
=============================
# CLASS project_graph
# BREAKOUT left
 Test results
 ------------
 <image:or/ci_tests.png> [Test results]
# BREAKOUT end
# CLASS clearfix
-