Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2025-01-22 00:52:14Z
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 (31):
  #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
  #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
  #961 Improvements for Power Supplies
    By:     cesarBLG
    Branch: powersupply-scripts
    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 2025 Jan 3-rd
    By:     Weter-ORTS
    Branch: master
    Draft:  False
    Labels: for-unstable locales
    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: bug
    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
  #1015 Enhancements for EP brakes
    By:     cesarBLG
    Branch: electrical-braking-enhancement
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1016 Route all logging via Trace #or-std-log
    By:     twpol
    Branch: feature/std-log/trace-log
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1021 Various traincar operations windows fixes
    By:     sweiland-openrails
    Branch: TrainCarOperationsBugfixes
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1024 Fix: Adds guard for missing notifications
    By:     cjakeman
    Branch: guard-missing-notifications
    Draft:  True
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
    By:     Csantucci
    Branch: mp-chuff
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1028 Replace all compression code with System.IO.Compression
    By:     twpol
    Branch: feature/use-native-compression
    Draft:  False
    Labels: refactoring
    Allowed to auto-merge? True
  #1029 DynaTrax Support for Superelevation
    By:     SteelFill
    Branch: multi_track_profiles
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1030 Refactor settings, in prep for settings exporter
    By:     rwf-rr
    Branch: refactor-user-settings-location
    Draft:  True
    Labels: 
    Allowed to auto-merge? False
  #1031 Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server
    By:     Csantucci
    Branch: multiplayer-server-official
    Draft:  True
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #1033 Multiple signal light textures per signal
    By:     cesarBLG
    Branch: multiple-light-textures
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1034 Fix menu notifications
    By:     twpol
    Branch: feature/fix-menu-notifications
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (19):
  #1007 Russian localization up to 2025 Jan 3-rd
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #961 Improvements for Power Supplies
  #1009 Fix: TrainCarViewer overlaps when display size changed
  #1010 Fix: TrainDrivingInfo window width not stable.
  #1015 Enhancements for EP brakes
  #1021 Various traincar operations windows fixes
  #1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
  #1028 Replace all compression code with System.IO.Compression
  #1029 DynaTrax Support for Superelevation
  #1033 Multiple signal light textures per signal
  #1034 Fix menu notifications
  #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
  #1016 Route all logging via Trace #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 48b3540ca Automatic merge of T1.5.1-1485-gbb6c5e4e2 and 18 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 1af726416dd1bb8137667473608a484794128658
Merging #1007 Russian localization up to 2025 Jan 3-rd...
  Source/Locales/Contrib/Contrib.pot +1,975 -1,975
  Source/Locales/Contrib/ru.po +4 -4
  Source/Locales/Menu/Menu.pot +1,763 -1,668
  Source/Locales/Menu/ru.po +776 -398
  Source/Locales/ORTS.Common/ORTS.Common.pot +1,159 -1,159
  Source/Locales/ORTS.Common/ru.po +278 -262
  Source/Locales/ORTS.Menu/ORTS.Menu.pot +82 -82
  Source/Locales/ORTS.Settings/ORTS.Settings.pot +152 -152
  Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot +19 -19
  Source/Locales/Orts.Simulation/Orts.Simulation.pot +3,239 -3,239
  Source/Locales/Orts.Simulation/ru.po +1,115 -810
  Source/Locales/RunActivity/RunActivity.pot +3,847 -3,847
  Source/Locales/RunActivity/ru.po +1,245 -1,034
  Source/Locales/Updater/Updater.pot +17 -17
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ad60314909150906f97e5bd6533aac008b5eb7b4
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/SubSystems/Controllers/BrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
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 #1015 Enhancements for EP brakes...
  Source/Documentation/Manual/physics.rst +33 -17
  Source/Orts.Simulation/Simulation/Physics/Train.cs +6 -6
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +5 -69
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +131 -57
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +91 -15
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +14 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +17 -8
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +4 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +4 -3
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +19 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +5 -4
  Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +1 -1
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +3 -3
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +1 -1
  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
  Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +1 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 514a046408ec531072fa45283f8f1ac52f5313cd
  < 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/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/Brakes/MSTS/ManualBraking.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 3c1b2a141 Merge commit '6a1060f0e40ce025004f8fa561a367419b528bdc' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 514a046408ec531072fa45283f8f1ac52f5313cd failed: 1
Merging #1021 Various traincar operations windows fixes...
  Source/Orts.Simulation/Simulation/Physics/Train.cs +5 -7
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +43 -24
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +49 -24
  Source/RunActivity/Viewer3D/Viewer.cs +2 -11
  Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +57 -12
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5a7ba93bddab41a651bc08b81c022dc9cad6060e
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
Merging #1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771...
  Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6a89a97b056e3abb228f60fafa9ca438a836ffd7
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
Merging #1028 Replace all compression code with System.IO.Compression...
  Source/Launcher/Program.cs +1 -3
  Source/Menu/ImportExportSaveForm.cs +15 -38
  Source/Menu/Menu.csproj +1 -1
  Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj +0 -1
  Source/Orts.Parsers.Msts/SBR.cs +4 -2
  Source/Orts.Updater/Orts.Updater.csproj +1 -1
  Source/Orts.Updater/UpdateManager.cs +15 -7
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c5f291d88363bb67d85a7a0d231ac5f74220c1a1
Merging #1029 DynaTrax Support for Superelevation...
  Source/Orts.Formats.Msts/TrackSectionsFile.cs +12 -2
  Source/RunActivity/Viewer3D/SuperElevation.cs +19 -7
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 759b1a18f7345eb3083ce7497ab43ff3da92c213
Merging #1033 Multiple signal light textures per signal...
  Source/Documentation/Manual/appendices.rst +13 -0
  Source/Orts.Formats.Msts/SignalConfigurationFile.cs +5 -0
  Source/RunActivity/Viewer3D/Signals.cs +29 -7
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 171dc86cad35fb5d38f7d5d39d8ae87ca4071e5e
Merging #1034 Fix menu notifications...
  Source/Menu/Notifications/NotificationManager.cs +23 -4
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b6b9325a754bbab4d9bb3499a6407fc94aec2a3d
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 +15 -0
  Source/Orts.Simulation/Common/Events.cs +18 -0
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +17 -1
  Source/Orts.Simulation/Simulation/Physics/Train.cs +78 -1
  Source/Orts.Simulation/Simulation/Simulator.cs +31 -5
  Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +28 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +13 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f1681df56d3bf4c47af96fab933f7d3a6891a588
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.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 8f8577588 Merge commit 'f1681df56d3bf4c47af96fab933f7d3a6891a588' 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 +361 -326
  Source/Menu/Options.cs +16 -1
  Source/Menu/Options.resx +2 -2
  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 6d14344142a71a5c9614db095bd35de2bda3e921
  < Auto-merging Source/Menu/Notifications/NotificationManager.cs
Merging #1003 Clean up logging during loading #or-std-log...
  Source/Orts.Common/FatalException.cs +31 -0
  Source/Orts.Common/FileTeeLogger.cs +66 -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 60139053316c576ce75c35153cd33df94d5e45bd
  < 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
Merging #1016 Route all logging via Trace #or-std-log...
  Source/Orts.Formats.Msts/TrackSectionsFile.cs +1 -1
  Source/Orts.Parsers.Msts/SBR.cs +1 -1
  Source/Orts.Simulation/MultiPlayer/ClientComm.cs +1 -2
  Source/Orts.Simulation/MultiPlayer/MPManager.cs +3 -4
  Source/Orts.Simulation/MultiPlayer/Message.cs +5 -5
  Source/Orts.Simulation/MultiPlayer/OnlineTrains.cs +2 -1
  Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +3 -3
  Source/RunActivity/Viewer3D/Shaders.cs +6 -5
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5a94c4e6225347e0c08a99f953b083c8f1ff6bfd
  < Auto-merging Source/Orts.Formats.Msts/TrackSectionsFile.cs
  < Auto-merging Source/Orts.Parsers.Msts/SBR.cs
Pull requests successfully auto-merged (17):
  #1007 Russian localization up to 2025 Jan 3-rd
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #961 Improvements for Power Supplies
  #1009 Fix: TrainCarViewer overlaps when display size changed
  #1010 Fix: TrainDrivingInfo window width not stable.
  #1021 Various traincar operations windows fixes
  #1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
  #1028 Replace all compression code with System.IO.Compression
  #1029 DynaTrax Support for Superelevation
  #1033 Multiple signal light textures per signal
  #1034 Fix menu notifications
  #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
  #1001 Telemetry collection and menu options #or-telemetry-system
  #1003 Clean up logging during loading #or-std-log
  #1016 Route all logging via Trace #or-std-log
Pull requests not auto-merged (2):
  #1015 Enhancements for EP brakes
  #1000 Locomotive operation from control car
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-01-22 00:52:41Z