Project Summary

Author: Open Rails Team

Language: C#

License: GPL-3.0-only

Browse: Builds, Log, Triage, Documentation, Repository

Last automatic build: U2025.07.09-0208 2025-07-09 03:13:12

Build status:

Last changed: 2025-07-09 17:17:17

git clone https://git.launchpad.net/or

Silver's Simple Site - Projects - Open Rails

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.


Preview

Open Rails Code Bot started at 2025-07-11 06:37:10Z
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 (27):
 #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 not-for-unstable
   Allowed to auto-merge? False
 #800 Changes to migrate from Launchpad Bugs to GitHub Issues
   By:     cjakeman
   Branch: migrate-bugtracker
   Draft:  False
   Labels: website documentation not-for-unstable infrastructure
   Allowed to auto-merge? False
 #884 build: Additional settings for dotnet build
   By:     twpol
   Branch: feature/dotnet-build
   Draft:  True
   Labels: 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:
   Allowed to auto-merge? False
 #1055 Route Based TTrack Sounds
   By:     peternewell
   Branch: track_sounds#1
   Draft:  True
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #1057 Switchable brake system
   By:     pzgulyas
   Branch: gpr
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1081 Brake cuts power unification
   By:     cesarBLG
   Branch: brake-cuts-power
   Draft:  True
   Labels: enhancement question
   Allowed to auto-merge? True
 #1082 Allow variable water level in glass gauge
   By:     peternewell
   Branch: water_gauge#1
   Draft:  True
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #1086 Add Settings Exporter tool (copy settings to INI, etc)
   By:     rwf-rr
   Branch: refactor-user-settings-loc/export-settings
   Draft:  False
   Labels:
   Allowed to auto-merge? True
 #1091 Automatic speed control
   By:     cesarBLG
   Branch: cruise-control-review
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1104 Handle simple adhesion within the axle module
   By:     cesarBLG
   Branch: simple-adhesion-axle
   Draft:  False
   Labels: refactoring for-unstable
   Allowed to auto-merge? True
 #1110 Fix Activity Runner persists after loading exception
   By:     cjakeman
   Branch: fix-activity-runner-persists
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1115 Do not activate ETS switch if no suitable cars are attached
   By:     cesarBLG
   Branch: automatic-ets
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1120 Automatically Calculate Friction Values if Missing
   By:     SteelFill
   Branch: auto_friction
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1121 Manually Override Articulation
   By:     SteelFill
   Branch: manual_articulate
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1122 Wagon Size and Centering Controls
   By:     SteelFill
   Branch: size_centering
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1124 Built-in PBL2 brake controller
   By:     cesarBLG
   Branch: pbl2
   Draft:  True
   Labels: enhancement
   Allowed to auto-merge? True
 #1126 ShapeHierarchy Attachment for More Wagon Addons
   By:     SteelFill
   Branch: shape_hierarchy
   Draft:  False
   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:  True
   Labels: enhancement refactoring not-for-unstable
   Allowed to auto-merge? False
 #1130 Fix F9 points to an incorrect car ID.
   By:     mbm-OR
   Branch: bugfix/Fix-F9-CarId-bug
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1132 Fixes For Correct Questionable Braking Parameters
   By:     SteelFill
   Branch: correct_questionable_leaks
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1133 Minor Fix for Brake Pipe Charging
   By:     SteelFill
   Branch: charging_tweak
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (18):
 #1104 Handle simple adhesion within the axle module
 #1057 Switchable brake system
 #1086 Add Settings Exporter tool (copy settings to INI, etc)
 #1091 Automatic speed control
 #1110 Fix Activity Runner persists after loading exception
 #1115 Do not activate ETS switch if no suitable cars are attached
 #1120 Automatically Calculate Friction Values if Missing
 #1121 Manually Override Articulation
 #1122 Wagon Size and Centering Controls
 #1126 ShapeHierarchy Attachment for More Wagon Addons
 #1130 Fix F9 points to an incorrect car ID.
 #1132 Fixes For Correct Questionable Braking Parameters
 #1133 Minor Fix for Brake Pipe Charging
 #1055 Route Based TTrack Sounds
 #1082 Allow variable water level in glass gauge
 #1081 Brake cuts power unification
 #1124 Built-in PBL2 brake controller
 #1127 Advanced Shape Descriptor Controls
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 ca3a08eb9 Automatic merge of T1.6-rc4-30-gc09ebebcf and 14 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 196d83e863e6729544fafa1aebd2dd1cbe800aec
Merging #1104 Handle simple adhesion within the axle module...
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +2 -17
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +127 -175
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +74 -140
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +0 -8
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +0 -8
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +0 -9
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +0 -8
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +0 -9
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +3 -3
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +336 -111
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/InductionMotor.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +66 -81
 Source/RunActivity/Viewer3D/InfoDisplay.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +17 -9
 Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +18 -15
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1f7af77d07c47374f0a39ca3c4fb1f768583ae54
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.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/MSTSWagon.cs +435 -647
 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 +73 -16
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +12 -5
 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 1c2bcb497b4d6f482b32486bd0d3e7ddda74f920
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
Merging #1086 Add Settings Exporter tool (copy settings to INI, etc)...
 Source/Contrib/SettingsExporter/Program.cs +254 -0
 Source/Contrib/SettingsExporter/SettingsExporter.csproj +26 -0
 Source/Documentation/Manual/appendices.rst +10 -2
 Source/ORTS.sln +6 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e10390b0bbf78e211d98aec12cab8db6aa0cd778
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 +53 -290
 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 +651 -659
 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 7fc8de166b42d48bf803fd5df24d6a4ca7b5b859
 < 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/EPBrakeSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
Merging #1110 Fix Activity Runner persists after loading exception...
 Source/RunActivity/Viewer3D/Processes/WebServerProcess.cs +9 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 387388eb15021127e81578ec8364da93c8509f15
Merging #1115 Do not activate ETS switch if no suitable cars are attached...
 Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +19 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +12 -7
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +12 -7
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 270f22fb729b8bbc73878bd507033917451a0fec
Merging #1120 Automatically Calculate Friction Values if Missing...
 Source/Documentation/Manual/features-rollingstock.rst +9 -3
 Source/Documentation/Manual/physics.rst +66 -41
 Source/Orts.Common/Conversions.cs +32 -1
 Source/Orts.Parsers.Msts/STFReader.cs +6 -6
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +296 -193
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ba3c47fa79e418483f962f8b2636866c485ba0ad
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Common/Conversions.cs
 < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 1eb17ec3c Merge commit '270f22fb729b8bbc73878bd507033917451a0fec' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ba3c47fa79e418483f962f8b2636866c485ba0ad failed: 1
Merging #1121 Manually Override Articulation...
 Source/Documentation/Manual/features-rollingstock.rst +37 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +2 -0
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +20 -16
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 91d2d26d63754bc0ab34fc565409858a21dc7ace
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #1122 Wagon Size and Centering Controls...
 Source/Documentation/Manual/features-rollingstock.rst +87 -0
 Source/Orts.Formats.Msts/ShapeFile.cs +93 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +141 -6
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +7 -0
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +5 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9426e58ee0545a2ddf7cebc1cd978fc3c32da280
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
 < 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/TrainCar.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 8c12b800f Merge commit '91d2d26d63754bc0ab34fc565409858a21dc7ace' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9426e58ee0545a2ddf7cebc1cd978fc3c32da280 failed: 1
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 -12
 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 -131
 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 -16
 Source/RunActivity/Viewer3D/Viewer.cs +13 -8
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3bb081e7e0963c307da6d5f26418b77cd915116d
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < Auto-merging Source/Documentation/Manual/physics.rst
 < 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/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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 8c12b800f Merge commit '91d2d26d63754bc0ab34fc565409858a21dc7ace' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3bb081e7e0963c307da6d5f26418b77cd915116d failed: 1
Merging #1130 Fix F9 points to an incorrect car ID....
 Source/Orts.Simulation/Simulation/Simulator.cs +3 -2
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +116 -115
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +76 -100
 Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +6 -4
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 251a67744d67aaf728c69e16b2cbaa8cbb0c868c
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
Merging #1132 Fixes For Correct Questionable Braking Parameters...
 Source/Documentation/Manual/options.rst +11 -9
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +13 -23
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 934d29e6e9d5b82d91e4018e52f89fa6699fe2de
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #1133 Minor Fix for Brake Pipe Charging...
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +1 -1
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8dc00d587ed0cf30304d291793d547fbc1718206
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
Merging #1055 Route Based TTrack Sounds...
 Build.cmd +6 -9
 Source/Documentation/Manual/appendices.rst +0 -13
 Source/Documentation/Manual/cabs.rst +5 -45
 Source/Documentation/Manual/features-rollingstock.rst +5 -93
 Source/Documentation/Manual/multiplayer.rst +0 -21
 Source/Documentation/Manual/physics.rst +22 -181
 Source/Documentation/Manual/sound.rst +2 -2
 Source/Locales/Menu/de.po +3 -3
 Source/Locales/RunActivity/de.po +16 -16
 Source/Menu/Notifications/NotificationManager.cs +62 -23
 Source/Menu/Notifications/Notifications.cs +19 -44
 Source/MultiPlayerServer/Assembly.cs +0 -4
 Source/MultiPlayerServer/Host.cs +0 -335
 Source/MultiPlayerServer/MultiPlayerServer.csproj +0 -21
 Source/MultiPlayerServer/Program.cs +0 -37
 Source/ORTS.sln +0 -6
 Source/Orts.Common/Conversions.cs +0 -15
 Source/Orts.Formats.Msts/CabViewFile.cs +1 -15
 Source/Orts.Formats.Msts/RouteFile.cs +8 -1
 Source/Orts.Formats.Msts/SignalConfigurationFile.cs +0 -5
 Source/Orts.Formats.Msts/SoundManagmentFile.cs +364 -2
 Source/Orts.Parsers.Msts/STFReader.cs +0 -17
 Source/Orts.Simulation/Common/Commands.cs +7 -56
 Source/Orts.Simulation/Common/Events.cs +2 -13
 Source/Orts.Simulation/Common/Scripting/BrakeController.cs +1 -2
 Source/Orts.Simulation/Common/Scripting/Commands.cs +1 -60
 Source/Orts.Simulation/Common/Scripting/Common.cs +0 -22
 Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs +0 -8
 Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PantographSelector.cs +0 -138
 Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PowerLimitationSelector.cs +0 -138
 Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/VoltageSelector.cs +0 -138
 Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +10 -63
 Source/Orts.Simulation/Common/Scripting/PowerSupply/DualModePowerSupply.cs +11 -158
 Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +12 -124
 Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +27 -458
 Source/Orts.Simulation/Common/Scripting/PowerSupply/PassengerCarPowerSupply.cs +19 -59
 Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs +10 -45
 Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffSubsytem.cs +1 -31
 Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +5 -43
 Source/Orts.Simulation/Simulation/Physics/Train.cs +106 -13
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +3 -2
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +20 -35
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +9 -32
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +4 -30
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +10 -16
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +76 -8
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +58 -131
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +15 -98
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +1 -14
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +9 -18
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +4 -4
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +3 -4
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +2 -19
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +4 -5
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +0 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +0 -157
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{Controllers => }/BatterySwitch.cs +6 -11
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +4 -14
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs +0 -232
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs +0 -231
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs +0 -243
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +1 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +34 -22
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs +27 -107
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +31 -69
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +6 -17
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/IPowerSupply.cs +3 -6
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +189 -89
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{Controllers => }/MasterKey.cs +2 -2
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs +2 -9
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +103 -105
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +49 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +20 -128
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +2 -133
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +12 -8
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +171 -30
 Source/Orts.Simulation/Simulation/Simulator.cs +40 -49
 Source/Orts.Simulation/Simulation/Traveller.cs +3 -6
 Source/RunActivity/Viewer3D/Cameras.cs +3 -10
 Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/OSDCars.cs +2 -8
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +129 -183
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +59 -229
 Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +3 -5
 Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
 Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +11 -90
 Source/RunActivity/Viewer3D/Shapes.cs +0 -8
 Source/RunActivity/Viewer3D/Signals.cs +7 -29
 Source/RunActivity/Viewer3D/Sound.cs +960 -96
 Source/RunActivity/Viewer3D/Viewer.cs +251 -56
 Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
 Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
 Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +26 -109
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5e08321db23e79590f79e74182e2532b11f52d6b
 < Auto-merging Source/Documentation/Manual/appendices.rst
 < Auto-merging Source/Documentation/Manual/cabs.rst
 < 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/Locales/Menu/de.po
 < Auto-merging Source/Locales/RunActivity/de.po
 < CONFLICT (content): Merge conflict in Source/Locales/RunActivity/de.po
 < Auto-merging Source/ORTS.sln
 < CONFLICT (content): Merge conflict in Source/ORTS.sln
 < Auto-merging Source/Orts.Common/Conversions.cs
 < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
 < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Parsers.Msts/STFReader.cs
 < Auto-merging Source/Orts.Simulation/Common/Commands.cs
 < Auto-merging Source/Orts.Simulation/Common/Events.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/BrakeController.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Scripting/BrakeController.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
 < CONFLICT (content): Merge conflict in 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/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
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < warning: Cannot merge binary files: Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png (HEAD vs. 5e08321db23e79590f79e74182e2532b11f52d6b)
 < Auto-merging Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png
 < CONFLICT (content): Merge conflict in Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png
 < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Cameras.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.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/Shapes.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at e53dc43e0 Merge commit '8dc00d587ed0cf30304d291793d547fbc1718206' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5e08321db23e79590f79e74182e2532b11f52d6b failed: 1
Merging #1082 Allow variable water level in glass gauge...
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +145 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5845a1af5ca506775f0864a2a69ed01be3f0d30e
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
Merging #1081 Brake cuts power unification...
 Source/Documentation/Manual/physics.rst +7 -3
 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 689494b6b368013f482453a41bb0c82c0bbe6ed9
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
 < 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
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 +455 -0
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +3 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fab545726c40ec8451eb2e3b88340e5c1f980f47
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < Auto-merging Source/Orts.Simulation/Common/Scripting/BrakeController.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1127 Advanced Shape Descriptor Controls...
 Source/Documentation/Manual/features-rollingstock.rst +335 -3
 Source/Documentation/Manual/options.rst +2 -0
 Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +109 -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 3ebde0a249a9178a2481ec32c3c03587cb03351b
 < 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
 < 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
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at fe1f7e599 Merge commit 'fab545726c40ec8451eb2e3b88340e5c1f980f47' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3ebde0a249a9178a2481ec32c3c03587cb03351b failed: 1
Pull requests successfully auto-merged (13):
 #1104 Handle simple adhesion within the axle module
 #1057 Switchable brake system
 #1086 Add Settings Exporter tool (copy settings to INI, etc)
 #1091 Automatic speed control
 #1110 Fix Activity Runner persists after loading exception
 #1115 Do not activate ETS switch if no suitable cars are attached
 #1121 Manually Override Articulation
 #1130 Fix F9 points to an incorrect car ID.
 #1132 Fixes For Correct Questionable Braking Parameters
 #1133 Minor Fix for Brake Pipe Charging
 #1082 Allow variable water level in glass gauge
 #1081 Brake cuts power unification
 #1124 Built-in PBL2 brake controller
Pull requests not auto-merged (5):
 #1120 Automatically Calculate Friction Values if Missing
 #1122 Wagon Size and Centering Controls
 #1126 ShapeHierarchy Attachment for More Wagon Addons
 #1055 Route Based TTrack Sounds
 #1127 Advanced Shape Descriptor Controls
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-07-11 06:37:33Z

Continuous Integration graphs

Test results

Static analysis violations


Powered by the Content Parser System, copyright 2002 - 2025 James G. Ross.