Silver's Simple Site - Projects - Open Rails

C:\Program Files\dotnet\sdk\10.0.104\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.104\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.104\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-03-17 00:07:41Z
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 (20):
  #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:  False
    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: 
    Allowed to auto-merge? False
  #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:  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:  False
    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:  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:  False
    Labels: enhancement refactoring not-for-unstable
    Allowed to auto-merge? False
  #1186 Hot Reloading of Trains, Scenery, and Terrain
    By:     SteelFill
    Branch: hot_reload
    Draft:  True
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #1206 Set missing texture color depending on build mode.
    By:     rwf-rr
    Branch: missing-texture-color-debug
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #1207 Allow Zero and Negative Davis Values
    By:     SteelFill
    Branch: auto_friction
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #1208 Fix URL shown during installation
    By:     cjakeman
    Branch: fix/correct-url-for-installation
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1210 Fix for compound locomotive starting valve not working
    By:     peternewell
    Branch: bug_compound_locomotive
    Draft:  False
    Labels: bug for-unstable
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (13):
  #570 glTF 2.0 support with PBR lighting
  #1210 Fix for compound locomotive starting valve not working
  #1057 Switchable brake system
  #1081 Brake cuts power unification
  #1091 Automatic speed control
  #1122 Wagon Size and Centering Controls
  #1124 Built-in PBL2 brake controller
  #1126 ShapeHierarchy Attachment for More Wagon Addons
  #1206 Set missing texture color depending on build mode.
  #1207 Allow Zero and Negative Davis Values
  #1208 Fix URL shown during installation
  #1186 Hot Reloading of Trains, Scenery, and Terrain
  #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 ec71afab9 Automatic merge of T1.6.1-341-g91414172d and 9 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 91414172dea8f16c08e587f2792264110aaabab1
Merging #570 glTF 2.0 support with PBR lighting...
  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/ORTS.Common/ConsistGenerator.cs +201 -0
  Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
  Source/Orts.Settings/UserSettings.cs +4 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +7 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +112 -108
  Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs +4 -1
  Source/Orts.Simulation/Simulation/Simulator.cs +2 -2
  Source/RunActivity/Content/EnvMapDay/images.txt +3 -0
  Source/RunActivity/Content/SceneryShader.fx +870 -290
  Source/RunActivity/Content/ShadowMap.fx +190 -38
  Source/RunActivity/RunActivity.csproj +27 -0
  Source/RunActivity/Viewer3D/AnimatedPart.cs +57 -21
  Source/RunActivity/Viewer3D/Cameras.cs +24 -0
  Source/RunActivity/Viewer3D/DDSLib.cs +35 -35
  Source/RunActivity/Viewer3D/Forest.cs +5 -4
  Source/RunActivity/Viewer3D/GltfShape.cs +2,129 -0
  Source/RunActivity/Viewer3D/Lights.cs +86 -36
  Source/RunActivity/Viewer3D/Materials.cs +520 -189
  Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +2 -2
  Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +4 -0
  Source/RunActivity/Viewer3D/RenderFrame.cs +211 -24
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -2
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +67 -70
  Source/RunActivity/Viewer3D/Shaders.cs +243 -66
  Source/RunActivity/Viewer3D/Shapes.cs +139 -38
  Source/RunActivity/Viewer3D/Signals.cs +6 -4
  Source/RunActivity/Viewer3D/Terrain.cs +19 -11
  Source/RunActivity/Viewer3D/Transfers.cs +4 -5
  Source/RunActivity/Viewer3D/Water.cs +4 -4
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change aa1bd99ae039a3f1057bea8ea1cf5e1df0e58bd6
Merging #1210 Fix for compound locomotive starting valve not working...
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +44 -7
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 450278f7ced6147048c0587ab2fa9f0be08c0c89
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 +452 -660
  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 85bde8ece8b80eb7c68a08c1e151af0b0ce49ebe
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.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
  < 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
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
  < Auto-merging 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 543c86bbe Merge commit '450278f7ced6147048c0587ab2fa9f0be08c0c89' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 85bde8ece8b80eb7c68a08c1e151af0b0ce49ebe failed: 1
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
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 +52 -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 +654 -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 378be5577006f81d5019a5ffe03c7bdb81ca8a2d
  < 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/CruiseControl.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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/TrainCar.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 +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/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/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging 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/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/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at efab845c2 Merge commit 'e241a0d1226220a09811b6882077c9eb77657a92' 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 #1206 Set missing texture color depending on build mode....
  Source/Documentation/Manual/compatibility.rst +2 -1
  Source/RunActivity/Viewer3D/Materials.cs +5 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d9b0bb94fc019dd8a04dc02643da03f414de160f
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
Merging #1207 Allow Zero and Negative Davis Values...
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +3 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +114 -93
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +24 -24
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3bf62767dd1594aadf506d010e562eab29b82f44
  < 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/FreightAnimations.cs
Merging #1208 Fix URL shown during installation...
  Source/RunActivity/Readme.txt +2 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c72ab22035e18959883ff2e7b922cace936efcc2
Merging #1186 Hot Reloading of Trains, Scenery, and Terrain...
  Source/Documentation/Manual/options.rst +76 -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 +61 -27
  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 +17 -2
  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 +37 -3
  Source/RunActivity/Viewer3D/Forest.cs +17 -1
  Source/RunActivity/Viewer3D/Lights.cs +77 -22
  Source/RunActivity/Viewer3D/Materials.cs +172 -36
  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 +138 -14
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +94 -4
  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +19 -0
  Source/RunActivity/Viewer3D/Scenery.cs +194 -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 +382 -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 f0885fba9abe07a8b6bfe6e38c2329086792d27a
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Orts.Settings/UserSettings.cs
  < Auto-merging 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/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/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
  < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
  < Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
  < Auto-merging Source/RunActivity/Viewer3D/Transfers.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 05ef4d8f3 Merge commit 'c72ab22035e18959883ff2e7b922cace936efcc2' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f0885fba9abe07a8b6bfe6e38c2329086792d27a 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/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/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 05ef4d8f3 Merge commit 'c72ab22035e18959883ff2e7b922cace936efcc2' 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
Pull requests successfully auto-merged (9):
  #570 glTF 2.0 support with PBR lighting
  #1210 Fix for compound locomotive starting valve not working
  #1081 Brake cuts power unification
  #1091 Automatic speed control
  #1122 Wagon Size and Centering Controls
  #1124 Built-in PBL2 brake controller
  #1206 Set missing texture color depending on build mode.
  #1207 Allow Zero and Negative Davis Values
  #1208 Fix URL shown during installation
Pull requests not auto-merged (4):
  #1057 Switchable brake system
  #1126 ShapeHierarchy Attachment for More Wagon Addons
  #1186 Hot Reloading of Trains, Scenery, and Terrain
  #1127 Advanced Shape Descriptor Controls
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2026-03-17 00:07:50Z