Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2025-05-06 03:37:10Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (17):
  Sharpe49
  twpol
  cjakeman
  pzgulyas
  YoRyan
  perpetualKid
  strawberryfield
  cesarBLG
  peternewell
  Csantucci
  Roeterdink
  wjcurrey
  Looky1173
  markus-GE
  mbm-OR
  SteelFill
  sweiland-openrails
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 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
  #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
  #892 Signal Function OPP_SIG_ID_TRAINPATH
    By:     Roeterdink
    Branch: OPP_SIG_ID_TRAINPATH
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #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
  #1062 Train Forces popup Window.
    By:     rwf-rr
    Branch: train-forces-popup-window
    Draft:  False
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #1064 Add Train Info tab to Help window (F1)
    By:     rwf-rr
    Branch: help-add-train-info-tab
    Draft:  False
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #1067 Traction and dynamic brake retardation
    By:     cesarBLG
    Branch: controller-delays
    Draft:  False
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #1072 Content Creation Shortcuts
    By:     SteelFill
    Branch: creation_automation
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1074 Gradient - commit 2024-16-12
    By:     Roeterdink
    Branch: Gradient
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1076 Allow depart early
    By:     Roeterdink
    Branch: AllowDepartEarly
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1078 Default PowerSupply script for steam locomotives
    By:     cesarBLG
    Branch: steam-locomotive-script
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1081 Brake cuts power unification
    By:     cesarBLG
    Branch: brake-cuts-power
    Draft:  True
    Labels: enhancement
    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: 
    Allowed to auto-merge? False
  #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
Pull requests suitable for auto-merging (14):
  #570 glTF 2.0 support with PBR lighting
  #1062 Train Forces popup Window.
  #1064 Add Train Info tab to Help window (F1)
  #1067 Traction and dynamic brake retardation
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #1057 Switchable brake system
  #1074 Gradient - commit 2024-16-12
  #1076 Allow depart early
  #1078 Default PowerSupply script for steam locomotives
  #1085 updates key commands for Train Operations window and also Daylight Offset
  #1055 Route Based TTrack Sounds
  #1082 Allow variable water level in glass gauge
  #1072 Content Creation Shortcuts
  #1081 Brake cuts power unification
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 d31463c9b Automatic merge of T1.5.1-1804-g4fdacd539 and 11 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 4fdacd539051e2b83648b72f03b448a566a2b07f
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
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.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
Merging #1062 Train Forces popup Window....
  Source/Orts.Common/Conversions.cs +7 -0
  Source/Orts.Common/Input/UserCommand.cs +1 -0
  Source/Orts.Settings/InputSettings.cs +1 -0
  Source/Orts.Settings/UserSettings.cs +2 -0
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
  Source/RunActivity/RunActivity.csproj +3 -0
  Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs +443 -0
  Source/RunActivity/Viewer3D/Viewer.cs +3 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change bbc00137d1bc6c84eb311549177749aeeea0e13b
  < Auto-merging Source/Orts.Settings/InputSettings.cs
  < Auto-merging Source/Orts.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
Merging #1064 Add Train Info tab to Help window (F1)...
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
  Source/RunActivity/RunActivity.csproj +3 -1
  Source/RunActivity/Viewer3D/Popups/HelpWindow.cs +275 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change cb510d61a6b033b9148e21d5b8bae99f32a18a1d
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
Merging #1067 Traction and dynamic brake retardation...
  Source/Documentation/Manual/physics.rst +65 -0
  Source/Orts.Parsers.Msts/STFReader.cs +27 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +66 -172
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +280 -166
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +4 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +60 -24
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +69 -50
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +4 -10
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +4 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/ElectricMotor.cs +0 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/InductionMotor.cs +1 -4
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +32 -17
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13ab98ba823077a42927cf802b7888b383ba7cf7
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #892 Signal Function OPP_SIG_ID_TRAINPATH...
  Source/Orts.Formats.Msts/SignalScripts.cs +1 -0
  Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs +37 -0
  Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs +4 -0
  Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs +54 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1f5ba4c81b4cda5097d56b671c464767dc6d50f7
  < Auto-merging Source/Orts.Formats.Msts/SignalScripts.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs
Merging #1057 Switchable brake system...
  Source/Documentation/Manual/physics.rst +70 -2
  Source/Orts.Common/Conversions.cs +1 -1
  Source/Orts.Parsers.Msts/STFReader.cs +2 -3
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -0
  Source/Orts.Simulation/Simulation/Physics/Train.cs +40 -25
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +435 -647
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +76 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +236 -100
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +4 -5
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +0 -11
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +5 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +3 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +10 -15
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +6 -5
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +73 -16
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +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
  < 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 2b0dbf3c9 Merge commit '1f5ba4c81b4cda5097d56b671c464767dc6d50f7' 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 #1074 Gradient - commit 2024-16-12...
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -1
  Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +55 -0
  Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +87 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e9a66c166e6d9ed110d7087933636efcd60c1b9f
  < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
Merging #1076 Allow depart early...
  Source/Orts.Formats.Msts/SignalConfigurationFile.cs +9 -0
  Source/Orts.Formats.Msts/SignalScripts.cs +1 -0
  Source/Orts.Simulation/Common/Events.cs +5 -0
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +4 -2
  Source/Orts.Simulation/Simulation/Physics/Train.cs +63 -14
  Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs +12 -0
  Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs +13 -0
  Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs +88 -0
  Source/Orts.Simulation/Simulation/Simulator.cs +7 -0
  Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +136 -27
  Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +558 -52
  Source/RunActivity/Viewer3D/Popups/NextStationWindow.cs +195 -17
  Source/RunActivity/Viewer3D/Popups/TTRequestStopWindow.cs +123 -0
  Source/RunActivity/Viewer3D/Viewer.cs +21 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3bbd5376026833cb5cfaff7a95c31bae0be84200
  < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
  < Auto-merging Source/Orts.Formats.Msts/SignalScripts.cs
  < Auto-merging Source/Orts.Simulation/Common/Events.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/Signalling/SIGSCRfile.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #1078 Default PowerSupply script for steam locomotives...
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricTrainSupplySwitch.cs +4 -3
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +65 -186
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9ab642ec320385e632c70ae869ff248b7dc2b89d
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
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/physics.rst
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 +169 -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 +118 -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 377074652c4a21a5a6015e587b1b971bd40a1cf4
  < Auto-merging Source/Documentation/Manual/cabs.rst
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Documentation/Manual/sound.rst
  < Auto-merging Source/Orts.Common/Conversions.cs
  < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Simulation/Common/Commands.cs
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/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/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/RollingStock/MSTSLocomotiveViewer.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 9c4a01ecc Merge commit '37e2817f6405ead1d599bfe50a243ec015819e87' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 377074652c4a21a5a6015e587b1b971bd40a1cf4 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 #1072 Content Creation Shortcuts...
  Source/Documentation/Manual/features-rollingstock.rst +123 -3
  Source/Documentation/Manual/physics.rst +66 -41
  Source/Orts.Common/Conversions.cs +32 -1
  Source/Orts.Parsers.Msts/STFReader.cs +6 -6
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +457 -194
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +3 -0
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +26 -17
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 073cb17630e79e831978a53db958fe0c583c8639
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Common/Conversions.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Common/Conversions.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 39bf30d9c Merge commit '5845a1af5ca506775f0864a2a69ed01be3f0d30e' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 073cb17630e79e831978a53db958fe0c583c8639 failed: 1
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/TrainControlSystem.cs
Pull requests successfully auto-merged (11):
  #570 glTF 2.0 support with PBR lighting
  #1062 Train Forces popup Window.
  #1064 Add Train Info tab to Help window (F1)
  #1067 Traction and dynamic brake retardation
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #1074 Gradient - commit 2024-16-12
  #1076 Allow depart early
  #1078 Default PowerSupply script for steam locomotives
  #1085 updates key commands for Train Operations window and also Daylight Offset
  #1082 Allow variable water level in glass gauge
  #1081 Brake cuts power unification
Pull requests not auto-merged (3):
  #1057 Switchable brake system
  #1055 Route Based TTrack Sounds
  #1072 Content Creation Shortcuts
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-05-06 03:37:33Z