Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2024-12-04 14:08:00Z
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 (24):
  #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 Experimental glTF 2.0 support with PBR lighting
    By:     pzgulyas
    Branch: gltf2
    Draft:  False
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #800 Changes to migrate from Launchpad Bugs to GitHub Issues
    By:     cjakeman
    Branch: migrate-bugtracker
    Draft:  False
    Labels: website documentation not-for-unstable infrastructure
    Allowed to auto-merge? False
  #848 Ported Launcher.exe over to AvaloniaUI and .NET 6.0 to get platform independency.
    By:     LaT3St
    Branch: master
    Draft:  False
    Labels: question
    Allowed to auto-merge? False
  #876 docs: add source for documents previously on website to source Documentation folder
    By:     cjakeman
    Branch: update-Documentation-folder
    Draft:  True
    Labels: documentation
    Allowed to auto-merge? True
  #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
  #891 Auto save
    By:     Roeterdink
    Branch: AutoSave
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #892 Signal Function OPP_SIG_ID_TRAINPATH
    By:     Roeterdink
    Branch: OPP_SIG_ID_TRAINPATH
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
    By:     Csantucci
    Branch: AI-Train-Sound-official
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #900 DMI updates
    By:     pzgulyas
    Branch: dmi280
    Draft:  True
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #936 ContentManager Enhancement: show more info for consists
    By:     rwf-rr
    Branch: contentmanager-add-to-consist-info
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? False
  #961 Improvements for Power Supplies
    By:     cesarBLG
    Branch: powersupply-scripts
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #981 Multiple type trainset lightglows
    By:     Csantucci
    Branch: multiple-lightglows-official
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #996 Replace dynamic brakes by engine brakes at low speeds
    By:     cesarBLG
    Branch: reverse-blending
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1000 Locomotive operation from control car
    By:     cesarBLG
    Branch: control-car-controls
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1001 Telemetry collection and menu options #or-telemetry-system
    By:     twpol
    Branch: feature/telemetry-menu
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1003 Clean up logging during loading #or-std-log
    By:     twpol
    Branch: feature/std-log/clean
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1007 Russian localization up to 2024 Nov 2-nd
    By:     Weter-ORTS
    Branch: master
    Draft:  False
    Labels: 
    Allowed to auto-merge? False
  #1008 Fix: TrainCarOperations doesn't work as expected after resume.
    By:     mbm-OR
    Branch: bugfix/Fix-TrainCarOperations-not-working-as-expected-after-resume
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1009 Fix: TrainCarViewer overlaps when display size changed
    By:     mbm-OR
    Branch: bugfix/Fix-TrainCarViewer-overlaps-when-display-size-changed
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1010 Fix: TrainDrivingInfo window width not stable.
    By:     mbm-OR
    Branch: bugfix/Fix-TrainDrivingInfo-window-width-not-stable
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (14):
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #961 Improvements for Power Supplies
  #981 Multiple type trainset lightglows
  #996 Replace dynamic brakes by engine brakes at low speeds
  #1008 Fix: TrainCarOperations doesn't work as expected after resume.
  #1009 Fix: TrainCarViewer overlaps when display size changed
  #1010 Fix: TrainDrivingInfo window width not stable.
  #900 DMI updates
  #876 docs: add source for documents previously on website to source Documentation folder
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
  #1000 Locomotive operation from control car
  #1001 Telemetry collection and menu options #or-telemetry-system
  #1003 Clean up logging during loading #or-std-log
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 464604f77 Automatic merge of T1.5.1-1417-g99a47c9c6 and 12 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 99a47c9c6197efcb3e60872ccaa2f91c68573c93
Merging #891 Auto save...
  Source/Menu/Options.Designer.cs +74 -3
  Source/Menu/Options.cs +50 -0
  Source/ORTS.Settings/UserSettings.cs +4 -0
  Source/RunActivity/Viewer3D/Popups/QuitWindow.cs +1 -0
  Source/RunActivity/Viewer3D/Viewer.cs +16 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9a1d6b20fc7f44d586cbb1c4384993b496b4c2ad
  < Auto-merging Source/Menu/Options.Designer.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.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 #961 Improvements for Power Supplies...
  Source/Documentation/Manual/cabs.rst +25 -5
  Source/Documentation/Manual/features-rollingstock.rst +93 -5
  Source/Documentation/Manual/physics.rst +143 -5
  Source/ORTS.Common/Conversions.cs +15 -0
  Source/Orts.Formats.Msts/CabViewFile.cs +15 -1
  Source/Orts.Parsers.Msts/STFReader.cs +17 -0
  Source/Orts.Simulation/Common/Commands.cs +56 -7
  Source/Orts.Simulation/Common/Events.cs +13 -2
  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -1
  Source/Orts.Simulation/Common/Scripting/Commands.cs +60 -1
  Source/Orts.Simulation/Common/Scripting/Common.cs +22 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs +8 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PantographSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PowerLimitationSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/VoltageSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +63 -10
  Source/Orts.Simulation/Common/Scripting/PowerSupply/DualModePowerSupply.cs +158 -11
  Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +124 -12
  Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +458 -27
  Source/Orts.Simulation/Common/Scripting/PowerSupply/PassengerCarPowerSupply.cs +59 -19
  Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs +45 -10
  Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffSubsytem.cs +31 -1
  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +43 -5
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +2 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +35 -20
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +32 -9
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +29 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +1 -3
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +106 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +14 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/BatterySwitch.cs +11 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/MasterKey.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs +232 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs +231 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs +243 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +0 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +22 -34
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs +107 -27
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +69 -31
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +17 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/IPowerSupply.cs +6 -3
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +89 -189
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs +8 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +105 -103
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +0 -49
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +128 -20
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +133 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +8 -12
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +20 -9
  Source/Orts.Simulation/Simulation/Simulator.cs +49 -40
  Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
  Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +75 -9
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8a9c8f9b41bd9a9734e9193be6502b2be197584c
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/ORTS.Common/Conversions.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
Merging #981 Multiple type trainset lightglows...
  Source/Documentation/Manual/features-rollingstock.rst +76 -0
  Source/Orts.Formats.Msts/LightCollection.cs +5 -1
  Source/RunActivity/RunActivity.csproj +3 -0
  Source/RunActivity/Viewer3D/Lights.cs +28 -7
  Source/RunActivity/Viewer3D/Materials.cs +9 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 067c009bb9500e1d59b9c11d59df4b6e6c7b214c
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
Merging #996 Replace dynamic brakes by engine brakes at low speeds...
  Source/Documentation/Manual/physics.rst +6 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +3 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +11 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2fcbcde10aebee073de58c3ff3da5b34835feec4
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #1008 Fix: TrainCarOperations doesn't work as expected after resume....
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +2 -0
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +3 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e827fbd8b6dc24d0bf6da8337231be0e237e12d1
Merging #1009 Fix: TrainCarViewer overlaps when display size changed...
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +13 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 80172b809bbc7b998c2cd914412ca2b7c0ca648f
Merging #1010 Fix: TrainDrivingInfo window width not stable....
  Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs +10 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6a1060f0e40ce025004f8fa561a367419b528bdc
Merging #900 DMI updates...
  Source/RunActivity/Viewer3D/Materials.cs +34 -0
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +13 -2
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs +17 -1
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/SpeedDistanceMonitoring.cs +20 -3
  Source/RunActivity/Viewer3D/Shapes.cs +6 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c27f32d9c8e6bd08d80a30fbfc8ae11bfbb01819
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
Merging #876 docs: add source for documents previously on website to source Documentation folder...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f92de7665b04bfea0458cecb457ea7c288c096d3
Merging #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains...
  Source/Documentation/Manual/sound.rst +14 -0
  Source/Orts.Simulation/Common/Events.cs +14 -0
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +53 -1
  Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -0
  Source/Orts.Simulation/Simulation/Simulator.cs +31 -5
  Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +11 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +13 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 838c3140c66693d0d77776d3dcd6c5d90c7eccc3
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
Merging #1000 Locomotive operation from control car...
  Source/Documentation/Manual/cabs.rst +25 -5
  Source/Documentation/Manual/features-rollingstock.rst +93 -5
  Source/Documentation/Manual/physics.rst +144 -6
  Source/ORTS.Common/Conversions.cs +15 -0
  Source/Orts.Formats.Msts/CabViewFile.cs +15 -1
  Source/Orts.Parsers.Msts/STFReader.cs +17 -0
  Source/Orts.Simulation/Common/Commands.cs +57 -8
  Source/Orts.Simulation/Common/Events.cs +13 -2
  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -1
  Source/Orts.Simulation/Common/Scripting/Commands.cs +60 -1
  Source/Orts.Simulation/Common/Scripting/Common.cs +22 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs +8 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs +33 -7
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PantographSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PowerLimitationSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/VoltageSelector.cs +138 -0
  Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +63 -10
  Source/Orts.Simulation/Common/Scripting/PowerSupply/DualModePowerSupply.cs +158 -11
  Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +124 -12
  Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +458 -27
  Source/Orts.Simulation/Common/Scripting/PowerSupply/PassengerCarPowerSupply.cs +59 -19
  Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs +45 -10
  Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffSubsytem.cs +31 -1
  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +43 -5
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +135 -33
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +35 -20
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +32 -9
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +47 -133
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +38 -27
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +106 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +14 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ControlCarPowerSupply.cs +64 -12
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/BatterySwitch.cs +11 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/MasterKey.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs +232 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs +231 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs +243 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +0 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +22 -34
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs +107 -27
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +69 -31
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +17 -6
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/IPowerSupply.cs +6 -3
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +89 -189
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs +8 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +105 -103
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +0 -49
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +128 -20
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +133 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +8 -12
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +20 -9
  Source/Orts.Simulation/Simulation/Simulator.cs +67 -40
  Source/RunActivity/Viewer3D/RollingStock/MSTSControlTrailerCarViewer.cs +78 -0
  Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
  Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +106 -9
  Source/RunActivity/Viewer3D/Trains.cs +1 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d9ab01c2746c87abbdac41d5aebaf96547211ab2
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < CONFLICT (content): Merge conflict in 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 69824b9db Merge commit '838c3140c66693d0d77776d3dcd6c5d90c7eccc3' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d9ab01c2746c87abbdac41d5aebaf96547211ab2 failed: 1
Merging #1001 Telemetry collection and menu options #or-telemetry-system...
  Source/Contrib/DataCollector/Program.cs +7 -1
  Source/Contrib/SimulatorTester/UserSettings.cs +1 -1
  Source/Menu/MainForm.cs +34 -3
  Source/Menu/Notifications/NotificationManager.cs +39 -42
  Source/Menu/Notifications/NotificationPage.cs +30 -1
  Source/Menu/Notifications/Notifications.cs +26 -10
  Source/Menu/Options.Designer.cs +32 -0
  Source/Menu/Options.cs +16 -1
  Source/Menu/Options.resx +3 -0
  Source/Menu/TelemetryForm.Designer.cs +189 -0
  Source/Menu/TelemetryForm.cs +70 -0
  Source/Menu/TelemetryForm.resx +129 -0
  Source/ORTS.Common/PropertySettingsBase.cs +183 -0
  Source/ORTS.Settings/ORTS.Settings.csproj +3 -0
  Source/ORTS.Settings/TelemetryManager.cs +151 -0
  Source/ORTS.Settings/TelemetrySettings.cs +43 -0
  Source/ORTS.Settings/UserSettings.cs +10 -149
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fe770dc367c589d9698b98953aedd7e5020df0ce
  < Auto-merging Source/Menu/Options.Designer.cs
  < CONFLICT (content): Merge conflict in Source/Menu/Options.Designer.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 69824b9db Merge commit '838c3140c66693d0d77776d3dcd6c5d90c7eccc3' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fe770dc367c589d9698b98953aedd7e5020df0ce failed: 1
Merging #1003 Clean up logging during loading #or-std-log...
  Source/ORTS.Common/FatalException.cs +31 -0
  Source/ORTS.Common/FileTeeLogger.cs +68 -0
  Source/ORTS.Common/NullLogger.cs +41 -0
  Source/{Orts.Simulation/Common/ErrorLogger.cs => ORTS.Common/ORTraceListener.cs} +12 -90
  Source/Orts.Formats.Msts/SignalScripts.cs +0 -5
  Source/Orts.Formats.Msts/WorldSoundFile.cs +0 -1
  Source/Orts.Formats.OR/AESignals.cs +0 -2
  Source/Orts.Simulation/Simulation/AIs/AI.cs +0 -14
  Source/Orts.Simulation/Simulation/Signalling/Signals.cs +0 -2
  Source/Orts.Simulation/Simulation/Simulator.cs +0 -14
  Source/Orts.Simulation/Simulation/Timetables/PoolInfo.cs +0 -2
  Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +0 -4
  Source/Orts.Simulation/Simulation/Timetables/TurntableInfo.cs +0 -2
  Source/Orts.Simulation/Simulation/Turntables.cs +0 -2
  Source/RunActivity/Viewer3D/DynamicTrack.cs +0 -5
  Source/RunActivity/Viewer3D/Scenery.cs +0 -1
  Source/RunActivity/Viewer3D/Shapes.cs +0 -1
  Source/RunActivity/Viewer3D/Terrain.cs +0 -1
  Source/RunActivity/Viewer3D/Trains.cs +0 -1
  Source/RunActivity/Viewer3D/Viewer.cs +0 -7
  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c73459223748d7ba0173b44f409ece0d96c4f899
  < Auto-merging Source/Orts.Formats.Msts/SignalScripts.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Pull requests successfully auto-merged (12):
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #961 Improvements for Power Supplies
  #981 Multiple type trainset lightglows
  #996 Replace dynamic brakes by engine brakes at low speeds
  #1008 Fix: TrainCarOperations doesn't work as expected after resume.
  #1009 Fix: TrainCarViewer overlaps when display size changed
  #1010 Fix: TrainDrivingInfo window width not stable.
  #900 DMI updates
  #876 docs: add source for documents previously on website to source Documentation folder
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
  #1003 Clean up logging during loading #or-std-log
Pull requests not auto-merged (2):
  #1000 Locomotive operation from control car
  #1001 Telemetry collection and menu options #or-telemetry-system
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2024-12-04 14:08:21Z