Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2025-05-27 20: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 (22):
  #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
    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
  #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
  #1072 Content Creation Shortcuts & Advanced Wagon Shape Interactions
    By:     SteelFill
    Branch: creation_automation
    Draft:  False
    Labels: enhancement for-unstable
    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
  #1084 Timetable: Calculate Delay While Stopped at a Station
    By:     TheGwyd
    Branch: Calculate-Delay-While-At-Stopped-Stations
    Draft:  False
    Labels: bug for-unstable
    Allowed to auto-merge? True
  #1085 updates key commands for Train Operations window and also Daylight Offset
    By:     cjakeman
    Branch: manual-updates
    Draft:  False
    Labels: documentation
    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:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1093 build: Update version numbers to 1.6
    By:     github-actions
    Branch: release/1.6
    Draft:  False
    Labels: 
    Allowed to auto-merge? False
  #1094 Blended Braking Compatibility and Effectiveness Improvements
    By:     SteelFill
    Branch: blended_brake_tweaks
    Draft:  False
    Labels: bug enhancement
    Allowed to auto-merge? True
  #1096 When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. 
    By:     sweiland-openrails
    Branch: mouse_cursor_not_visible
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #1097 Fix For Delayed Particle Emitter Spawning
    By:     SteelFill
    Branch: particle_emitters
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1098 Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics
    By:     SteelFill
    Branch: wheel_speed_consistency
    Draft:  False
    Labels: bug refactoring
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (14):
  #1072 Content Creation Shortcuts & Advanced Wagon Shape Interactions
  #1084 Timetable: Calculate Delay While Stopped at a Station
  #570 glTF 2.0 support with PBR lighting
  #1057 Switchable brake system
  #1085 updates key commands for Train Operations window and also Daylight Offset
  #1086 Add Settings Exporter tool (copy settings to INI, etc)
  #1094 Blended Braking Compatibility and Effectiveness Improvements
  #1096 When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. 
  #1097 Fix For Delayed Particle Emitter Spawning
  #1098 Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics
  #1055 Route Based TTrack Sounds
  #1082 Allow variable water level in glass gauge
  #1081 Brake cuts power unification
  #1091 Automatic speed control
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 73daddefc Automatic merge of T1.5.1-1887-g07be04456 and 9 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 07be04456cc627acd6e5e7bce1f9d225894bfbd9
Merging #1072 Content Creation Shortcuts & Advanced Wagon Shape Interactions...
  Source/Documentation/Manual/cabs.rst +72 -17
  Source/Documentation/Manual/features-rollingstock.rst +699 -146
  Source/Documentation/Manual/options.rst +2 -0
  Source/Documentation/Manual/physics.rst +83 -42
  Source/Documentation/Manual/sound.rst +133 -0
  Source/Orts.Common/Conversions.cs +33 -2
  Source/Orts.Formats.Msts/CabViewFile.cs +4 -0
  Source/Orts.Formats.Msts/LightCollection.cs +2 -0
  Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +107 -3
  Source/Orts.Formats.Msts/SoundManagmentFile.cs +7 -2
  Source/Orts.Formats.OR/ContainerFile.cs +8 -2
  Source/Orts.Parsers.Msts/STFReader.cs +6 -6
  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 +31 -17
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +583 -225
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +97 -35
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +33 -17
  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 +85 -41
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +226 -136
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ContainerViewer.cs +2 -2
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +37 -6
  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +2 -40
  Source/RunActivity/Viewer3D/Shapes.cs +411 -43
  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 a67d5104059fa0bc6be28b8b5019b6c8c4b7f1e2
Merging #1084 Timetable: Calculate Delay While Stopped at a Station...
  Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +7 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13454ed624033a884cd551e4d3964b107464292a
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at d617d5087 Merge commit 'a67d5104059fa0bc6be28b8b5019b6c8c4b7f1e2' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13454ed624033a884cd551e4d3964b107464292a failed: 1
Merging #570 glTF 2.0 support with PBR lighting...
  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/ORTS.Common/ConsistGenerator.cs +198 -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 +3 -1
  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 +814 -197
  Source/RunActivity/Content/ShadowMap.fx +146 -10
  Source/RunActivity/RunActivity.csproj +27 -0
  Source/RunActivity/Viewer3D/AnimatedPart.cs +57 -21
  Source/RunActivity/Viewer3D/Cameras.cs +24 -0
  Source/RunActivity/Viewer3D/Forest.cs +1 -1
  Source/RunActivity/Viewer3D/GltfShape.cs +2,073 -0
  Source/RunActivity/Viewer3D/Lights.cs +83 -36
  Source/RunActivity/Viewer3D/Materials.cs +434 -85
  Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
  Source/RunActivity/Viewer3D/RenderFrame.cs +194 -7
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -2
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +50 -53
  Source/RunActivity/Viewer3D/Shaders.cs +165 -28
  Source/RunActivity/Viewer3D/Shapes.cs +141 -39
  Source/RunActivity/Viewer3D/Terrain.cs +3 -3
  Source/RunActivity/Viewer3D/Transfers.cs +1 -2
  Source/RunActivity/Viewer3D/Water.cs +2 -3
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 362e4e7900dc521f5e7a4868a382f03052b39a39
  < Auto-merging Source/Orts.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < 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/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
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at d617d5087 Merge commit 'a67d5104059fa0bc6be28b8b5019b6c8c4b7f1e2' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 362e4e7900dc521f5e7a4868a382f03052b39a39 failed: 1
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 +13 -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 84592f7d8404819c220c8b773c9af76750c7b12e
  < 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/AIs/AITrain.cs
  < 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/TrainCar.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at d617d5087 Merge commit 'a67d5104059fa0bc6be28b8b5019b6c8c4b7f1e2' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 84592f7d8404819c220c8b773c9af76750c7b12e failed: 1
Merging #1085 updates key commands for Train Operations window and also Daylight Offset...
  Source/Documentation/Manual/driving.rst +13 -12
  Source/Documentation/Manual/physics.rst +1 -1
  Source/Documentation/Manual/software-platform.rst +1 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 37e2817f6405ead1d599bfe50a243ec015819e87
  < Auto-merging Source/Documentation/Manual/driving.rst
  < Auto-merging Source/Documentation/Manual/physics.rst
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 #1094 Blended Braking Compatibility and Effectiveness Improvements...
  Source/Documentation/Manual/physics.rst +9 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +50 -10
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +23 -23
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9b4843b4e320c054d3cd96309a16d9ab7d1fe4d
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #1096 When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. ...
  Source/RunActivity/Viewer3D/Viewer.cs +1 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7a4f055b5d12be2da7531d421e61e02fc13a3a11
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #1097 Fix For Delayed Particle Emitter Spawning...
  Source/RunActivity/Viewer3D/ParticleEmitter.cs +3 -3
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 24ff66bbca18c19cabf9d0c2da432eae051129dc
  < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
Merging #1098 Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics...
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +14 -28
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +77 -64
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +3 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/GearBox.cs +3 -6
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +2 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1ca03af75f242153cdbae69a2a11f4a2479f4c59
  < 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/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 +29 -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 +116 -26
  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 24035c5463efbc8421a5af0a011bc891c867f883
  < Auto-merging Source/Documentation/Manual/appendices.rst
  < Auto-merging Source/Documentation/Manual/cabs.rst
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Documentation/Manual/sound.rst
  < 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/CabViewFile.cs
  < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
  < Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.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/PowerSupply/LocomotivePowerSupply.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
  < Auto-merging 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
  < 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/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.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
  < 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
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Cameras.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.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
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging 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 fd844383e Merge commit '1ca03af75f242153cdbae69a2a11f4a2479f4c59' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 24035c5463efbc8421a5af0a011bc891c867f883 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/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
Merging #1091 Automatic speed control...
  Source/Documentation/Manual/cruisecontrol.rst +78 -33
  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +1 -1
  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 +711 -654
  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 b0c622b601161d0e30d08ba4d9094d6fc010c911
  < 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
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.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 4ec59e85d Merge commit '689494b6b368013f482453a41bb0c82c0bbe6ed9' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b0c622b601161d0e30d08ba4d9094d6fc010c911 failed: 1
Pull requests successfully auto-merged (9):
  #1072 Content Creation Shortcuts & Advanced Wagon Shape Interactions
  #1085 updates key commands for Train Operations window and also Daylight Offset
  #1086 Add Settings Exporter tool (copy settings to INI, etc)
  #1094 Blended Braking Compatibility and Effectiveness Improvements
  #1096 When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. 
  #1097 Fix For Delayed Particle Emitter Spawning
  #1098 Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics
  #1082 Allow variable water level in glass gauge
  #1081 Brake cuts power unification
Pull requests not auto-merged (5):
  #1084 Timetable: Calculate Delay While Stopped at a Station
  #570 glTF 2.0 support with PBR lighting
  #1057 Switchable brake system
  #1055 Route Based TTrack Sounds
  #1091 Automatic speed control
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-05-27 20:22:33Z