Silver's Simple Site - Projects - Open Rails

C:\Program Files\dotnet\sdk\10.0.203\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.203\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.203\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-05-05 05:22:13Z
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 (26):
  #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 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
  #1206 Set missing texture color depending on build mode.
    By:     rwf-rr
    Branch: missing-texture-color-debug
    Draft:  False
    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: 
    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
  #1216 Add missing sounds on control cars
    By:     cesarBLG
    Branch: control-car-sounds
    Draft:  False
    Labels: bug
    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
  #1220 Fix documentation of Web Server API.
    By:     rwf-rr
    Branch: fix-web-server-api-docs
    Draft:  False
    Labels: 
    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
  #1224 Fix ORTSDefaultSnow Terrain Texture Behavior
    By:     SteelFill
    Branch: texture_loading_fix
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1226 Patch for Timetable Crash Bug 2148824
    By:     Roeterdink
    Branch: TimetableCrash_2148824
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #1227 Track based sounds trigger error
    By:     peternewell
    Branch: track_sounds_bug#1
    Draft:  False
    Labels: bug for-unstable
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (19):
  #570 glTF 2.0 support with PBR lighting
  #1057 Switchable brake system
  #1227 Track based sounds trigger error
  #1081 Brake cuts power unification
  #1091 Automatic speed control
  #1124 Built-in PBL2 brake controller
  #1128 Particle Emitter Overhaul
  #1206 Set missing texture color depending on build mode.
  #1216 Add missing sounds on control cars
  #1220 Fix documentation of Web Server API.
  #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)
  #1224 Fix ORTSDefaultSnow Terrain Texture Behavior
  #1226 Patch for Timetable Crash Bug 2148824
  #1214 Update Steam Cylinder Performance
  #1122 Wagon Size and Centering Controls
  #1126 ShapeHierarchy Attachment for More Wagon Addons
  #1127 Advanced Shape Descriptor Controls
  #1186 Hot Reloading of Trains, Scenery, and Terrain
  #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
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
  ! Auto packing the repository for optimum performance.
  ! See "git help gc" for manual housekeeping.
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
  > git --no-pager reset --hard
  < HEAD is now at 2da657370 Automatic merge of T1.6.1-365-ga0db59ce6 and 12 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach a0db59ce647738b4efa9ce646be0a0ac0502491c
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/Documentation/Manual/developing.rst +173 -0
  Source/ORTS.Common/ConsistGenerator.cs +202 -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/Weather.cs +28 -0
  Source/RunActivity/Content/Bloom.fx +275 -0
  Source/RunActivity/Content/EnvMap/cmft.bat +182 -0
  Source/RunActivity/Content/SceneryShader.fx +1,008 -316
  Source/RunActivity/Content/ShadowMap.fx +193 -38
  Source/RunActivity/RunActivity.csproj +12 -0
  Source/RunActivity/Viewer3D/AnimatedPart.cs +57 -21
  Source/RunActivity/Viewer3D/Cameras.cs +50 -0
  Source/RunActivity/Viewer3D/DDSLib.cs +35 -35
  Source/RunActivity/Viewer3D/Forest.cs +17 -13
  Source/RunActivity/Viewer3D/GltfShape.cs +1,938 -0
  Source/RunActivity/Viewer3D/Lights.cs +117 -40
  Source/RunActivity/Viewer3D/MSTSSky.cs +0 -3
  Source/RunActivity/Viewer3D/Materials.cs +1,139 -221
  Source/RunActivity/Viewer3D/ParticleEmitter.cs +8 -6
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +8 -6
  Source/RunActivity/Viewer3D/Precipitation.cs +17 -12
  Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +2 -2
  Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
  Source/RunActivity/Viewer3D/RenderFrame.cs +460 -192
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +9 -9
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +70 -70
  Source/RunActivity/Viewer3D/Scenery.cs +3 -0
  Source/RunActivity/Viewer3D/Shaders.cs +277 -88
  Source/RunActivity/Viewer3D/Shapes.cs +190 -45
  Source/RunActivity/Viewer3D/Signals.cs +29 -8
  Source/RunActivity/Viewer3D/Sky.cs +0 -5
  Source/RunActivity/Viewer3D/SkyInterpolation.cs +2 -0
  Source/RunActivity/Viewer3D/Terrain.cs +29 -12
  Source/RunActivity/Viewer3D/Transfers.cs +15 -13
  Source/RunActivity/Viewer3D/Viewer.cs +2 -2
  Source/RunActivity/Viewer3D/Water.cs +19 -11
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8ddc67713a144f2071fdbf82fec6f3ca195283cf
  < 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/MSTSSky.cs
  < Auto-merging Source/RunActivity/Viewer3D/Scenery.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
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/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1227 Track based sounds trigger error...
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +16 -4
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8072ea4bdc7b32763b68f5b3430540d695073311
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
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 727dbc3b5 Merge commit '8072ea4bdc7b32763b68f5b3430540d695073311' 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 +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 +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 1c649c1f0a474530935fbc00a7a7978bdb14802b
  < 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 727dbc3b5 Merge commit '8072ea4bdc7b32763b68f5b3430540d695073311' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1c649c1f0a474530935fbc00a7a7978bdb14802b 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 727dbc3b5 Merge commit '8072ea4bdc7b32763b68f5b3430540d695073311' 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 727dbc3b5 Merge commit '8072ea4bdc7b32763b68f5b3430540d695073311' 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 #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
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1216 Add missing sounds on control cars...
  Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs +3 -4
  Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +10 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +8 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +8 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ControlCarPowerSupply.cs +137 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricTrainSupplySwitch.cs +24 -9
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +2 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +22 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +8 -1
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -12
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +10 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change da036e11264d339f3975220ce65dfd1b4b1deae2
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1220 Fix documentation of Web Server API....
  Source/Documentation/Manual/software-platform.rst +7 -3
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ce178ed1d85d95d57036a44dddd7fc6d1465187d
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)...
  Source/Documentation/Manual/driving.rst +63 -9
  Source/Documentation/Manual/sound.rst +27 -4
  Source/Orts.Formats.Msts/SoundManagmentFile.cs +151 -24
  Source/Orts.Simulation/Simulation/Physics/Train.cs +10 -4
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +12 -2
  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 +34 -15
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +15 -10
  Source/RunActivity/Viewer3D/ALSoundHelper.cs +14 -0
  Source/RunActivity/Viewer3D/Debugging/SoundDebugForm.Designer.cs +598 -278
  Source/RunActivity/Viewer3D/Debugging/SoundDebugForm.cs +316 -124
  Source/RunActivity/Viewer3D/Sound.cs +148 -123
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c3ac9460c018e171443a9cfee035642d84eabc59
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1224 Fix ORTSDefaultSnow Terrain Texture Behavior...
  Source/RunActivity/Viewer3D/Materials.cs +9 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7c7d08a5fe0363ad4818bfb6bb3ed7bcba43e844
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1226 Patch for Timetable Crash Bug 2148824...
  Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +68 -21
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 84960197b5b02fac837703ef6ef5421202207215
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Merging #1214 Update Steam Cylinder Performance...
  Source/Orts.Parsers.Msts/STFReader.cs +16 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +207 -45
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +2,585 -12
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 4b966aeaf7dbe4d07c798fde5b4c8e10d774e858
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
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
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
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
  < Auto-merging 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 332582fc5 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/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 332582fc5 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 +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 +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 +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 +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 952aa3346380cef08966f0a3fef37504bc02cb7c
  < 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
  < 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/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
  < 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 332582fc5 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 952aa3346380cef08966f0a3fef37504bc02cb7c 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
  ! warning: reflog of 'HEAD' references pruned commits
  ! error: Could not read 95d69efd5a8e8b4ebd15f980da1f9b5437bf4a85
  ! fatal: Failed to traverse parents of commit 630ccaafe171e57431cbf78c7a22da6a481f7374
  ! fatal: failed to run repack
  ! error: task 'gc' failed
Pull requests successfully auto-merged (12):
  #570 glTF 2.0 support with PBR lighting
  #1057 Switchable brake system
  #1227 Track based sounds trigger error
  #1206 Set missing texture color depending on build mode.
  #1216 Add missing sounds on control cars
  #1220 Fix documentation of Web Server API.
  #1221 New Sounds for Diesel Locomotives (+ Refactor of Sound Debug Window)
  #1224 Fix ORTSDefaultSnow Terrain Texture Behavior
  #1226 Patch for Timetable Crash Bug 2148824
  #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
Pull requests not auto-merged (7):
  #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
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2026-05-05 05:25:20Z