Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2024-04-25 04:52:31Z
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 (30):
  #57 Ensure that build fails when tests fail to run
    By:     twpol
    Branch: bugfix/net4-test-runner
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #527 Brake cuts power refactor and new parameters
    By:     Sharpe49
    Branch: brake-cuts-power-refactor
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #541 Initial Virtual File System development
    By:     pzgulyas
    Branch: ziparchive
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #570 Experimental glTF 2.0 support with PBR lighting
    By:     pzgulyas
    Branch: gltf2
    Labels: enhancement
    Allowed to auto-merge? True
  #799 Consolidated wind simulation
    By:     twpol
    Branch: feature/one-true-wind
    Labels: 
    Allowed to auto-merge? True
  #800 Changes to migrate from Launchpad Bugs to GitHub Issues
    By:     cjakeman
    Branch: migrate-bugtracker
    Labels: website documentation not-for-unstable infrastructure
    Allowed to auto-merge? False
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
    By:     Csantucci
    Branch: further-cc-parameters
    Labels: enhancement
    Allowed to auto-merge? True
  #848 Ported Launcher.exe over to AvaloniaUI and .NET 6.0 to get platform independency.
    By:     LaT3St
    Branch: master
    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
    Labels: documentation
    Allowed to auto-merge? True
  #882 Blueprint/train car operations UI window
    By:     mbm-OR
    Branch: blueprint/TrainCarOperations-ui-window
    Labels: enhancement
    Allowed to auto-merge? True
  #884 build: Additional settings for dotnet build
    By:     twpol
    Branch: feature/dotnet-build
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #885 feat: Add notifications to Menu
    By:     cjakeman
    Branch: add-menu-notifications
    Labels: enhancement
    Allowed to auto-merge? True
  #886 Scene viewer extension to TrackViewer
    By:     pzgulyas
    Branch: tv3d-m
    Labels: for-unstable
    Allowed to auto-merge? True
  #891 Auto save
    By:     Roeterdink
    Branch: AutoSave
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #892 Signal Function OPP_SIG_ID_TRAINPATH
    By:     Roeterdink
    Branch: OPP_SIG_ID_TRAINPATH
    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
    Labels: enhancement
    Allowed to auto-merge? True
  #900 DMI updates
    By:     pzgulyas
    Branch: dmi280
    Labels: for-unstable
    Allowed to auto-merge? True
  #901 Remove unnecessary spaces and incorrect usage of spaces across the codebase (`Orts.Simulation`)
    By:     Looky1173
    Branch: innocuous-code-quality-fixes
    Labels: refactoring
    Allowed to auto-merge? True
  #903 Downloading route content (Github, zip)
    By:     sweiland-openrails
    Branch: downloadContent
    Labels: enhancement
    Allowed to auto-merge? True
  #912 New Triple Valve Features Vol. 2
    By:     SteelFill
    Branch: triplevalve-improvements-2
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #918 Manual - News topics updated since 1.5.1
    By:     cjakeman
    Branch: manual-news
    Labels: 
    Allowed to auto-merge? True
  #919 Added mouse wheel support for controls which can be moved by pressing t…
    By:     sweiland-openrails
    Branch: MouseWheelSupport
    Labels: 
    Allowed to auto-merge? True
  #922 Autopilot for timetable mode
    By:     Csantucci
    Branch: timetable-autopilot-official
    Labels: enhancement
    Allowed to auto-merge? True
  #923 Add curve squeal to route
    By:     peternewell
    Branch: curve-squeal#2
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #924 Default Asset Improvements
    By:     SteelFill
    Branch: default_texture_improvements
    Labels: enhancement
    Allowed to auto-merge? True
  #927 AI Train Power Supply/Lights Fix
    By:     SteelFill
    Branch: lights_bugfix
    Labels: bug
    Allowed to auto-merge? True
  #929 Add support for common circuit breaker variants
    By:     cesarBLG
    Branch: builtin-circuit-breaker
    Labels: enhancement
    Allowed to auto-merge? True
  #934 Fix bug 1944070: ContentManager search exception.
    By:     rwf-rr
    Branch: fix-contentmanager-search-bug-1944070
    Labels: 
    Allowed to auto-merge? False
  #936 ContentManager Enhancement: show more info for consists
    By:     rwf-rr
    Branch: contentmanager-add-to-consist-info
    Labels: 
    Allowed to auto-merge? False
  #937 Adds missing API cab controls to Manual
    By:     cjakeman
    Branch: manual-extend-api-cabcontrols
    Labels: documentation
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (22):
  #570 Experimental glTF 2.0 support with PBR lighting
  #799 Consolidated wind simulation
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
  #876 docs: add source for documents previously on website to source Documentation folder
  #882 Blueprint/train car operations UI window
  #885 feat: Add notifications to Menu
  #886 Scene viewer extension to TrackViewer
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
  #900 DMI updates
  #901 Remove unnecessary spaces and incorrect usage of spaces across the codebase (`Orts.Simulation`)
  #903 Downloading route content (Github, zip)
  #912 New Triple Valve Features Vol. 2
  #918 Manual - News topics updated since 1.5.1
  #919 Added mouse wheel support for controls which can be moved by pressing t…
  #922 Autopilot for timetable mode
  #923 Add curve squeal to route
  #924 Default Asset Improvements
  #927 AI Train Power Supply/Lights Fix
  #929 Add support for common circuit breaker variants
  #937 Adds missing API cab controls to Manual
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at eb75ed7e99 Automatic merge of T1.5.1-942-g6ac96f9f00 and 16 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 6ac96f9f00fa5f1e7d973b970e4bc0ff738f1889
Merging #570 Experimental glTF 2.0 support with PBR lighting...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3539862b48bb740de3f4174bc24dc0177decc84e
  < 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/RunActivity.csproj
  < Auto-merging Source/RunActivity/Viewer3D/Processes/RenderProcess.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
Merging #799 Consolidated wind simulation...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change dfc715e503d2234b030bd8955a4c6e414603e669
  < 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/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
Merging #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d00beb98334dc2e4cc74fa7debc6760bd4c3a804
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.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 #882 Blueprint/train car operations UI window...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3ca0eb19f513a1331c05cd6474bb0a31bec18b6c
  < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
  < Auto-merging Source/ORTS.Settings/InputSettings.cs
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Simulation/Common/Commands.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/RenderProcess.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #885 feat: Add notifications to Menu...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0a956f5441f7d501a2363fef46de7b2f97bfe73c
  < Auto-merging Source/Menu/MainForm.cs
  < CONFLICT (content): Merge conflict in Source/Menu/MainForm.cs
  < Auto-merging Source/Menu/Menu.csproj
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 0cdadc24d0 Merge commit '3ca0eb19f513a1331c05cd6474bb0a31bec18b6c' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 0a956f5441f7d501a2363fef46de7b2f97bfe73c failed: 1
Merging #886 Scene viewer extension to TrackViewer...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6c0785b6cbcdf3ec32f167df4891446a7b4e3a4b
  < Auto-merging Source/Contrib/TrackViewer/TrackViewer.csproj
  < Auto-merging Source/ORTS.Common/Coordinates.cs
  < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
  < Auto-merging Source/ORTS.Settings/InputSettings.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
  < Auto-merging Source/RunActivity/Viewer3D/DynamicTrack.cs
  < Auto-merging Source/RunActivity/Viewer3D/Forest.cs
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/RenderProcess.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/WatchdogProcess.cs
  < Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
  < Auto-merging Source/RunActivity/Viewer3D/Trains.cs
  < Auto-merging Source/RunActivity/Viewer3D/Transfers.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #891 Auto save...
  > 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
  < 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 a11ea55a77 Merge commit '6c0785b6cbcdf3ec32f167df4891446a7b4e3a4b' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 9a1d6b20fc7f44d586cbb1c4384993b496b4c2ad failed: 1
Merging #892 Signal Function OPP_SIG_ID_TRAINPATH...
  > 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 #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5866028cf210ce6da161a99ee034c6366e04b25a
  < 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/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
Merging #900 DMI updates...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c27f32d9c8e6bd08d80a30fbfc8ae11bfbb01819
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 99f77736f3 Merge commit '5866028cf210ce6da161a99ee034c6366e04b25a' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change c27f32d9c8e6bd08d80a30fbfc8ae11bfbb01819 failed: 1
Merging #901 Remove unnecessary spaces and incorrect usage of spaces across the codebase (`Orts.Simulation`)...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b900e1a5a4454a5d9ade57d440df4622c22add06
  < Auto-merging Source/Orts.Simulation/Common/Commands.cs
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/AIs/AITrain.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Hazzard.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging 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
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.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/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/TTTrain.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 99f77736f3 Merge commit '5866028cf210ce6da161a99ee034c6366e04b25a' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change b900e1a5a4454a5d9ade57d440df4622c22add06 failed: 1
Merging #903 Downloading route content (Github, zip)...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7af1f9134696b677e664060c89baa7233e32014e
  < Auto-merging Source/Documentation/Manual/start.rst
  < Auto-merging Source/Menu/MainForm.cs
  < Auto-merging Source/Menu/Menu.csproj
  < Auto-merging Source/ORTS.Settings/ORTS.Settings.csproj
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
Merging #912 New Triple Valve Features Vol. 2...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 4e2f2d5bfdde19e4fed3508137a86692e7456be5
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.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/Brakes/BrakeSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
Merging #918 Manual - News topics updated since 1.5.1...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f7ba507b731ddb8498f0c2f09b3293f0b617c1a9
  < Auto-merging Source/Documentation/Manual/news.rst
  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/news.rst
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at e3f0afb4fb Merge commit '4e2f2d5bfdde19e4fed3508137a86692e7456be5' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change f7ba507b731ddb8498f0c2f09b3293f0b617c1a9 failed: 1
Merging #919 Added mouse wheel support for controls which can be moved by pressing t…...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 26cc6a82e4711e2c1b38f559780a0ba186760f7f
  < Auto-merging Source/Documentation/Manual/driving.rst
  < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
  < Auto-merging Source/ORTS.Settings/InputSettings.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #922 Autopilot for timetable mode...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change abe2e5224667e0f31a656297c1caa48be61d05bd
  < Auto-merging Source/Documentation/Manual/driving.rst
  < 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/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < Auto-merging Source/RunActivity/Viewer3D/Lights.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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 7b13015656 Merge commit '26cc6a82e4711e2c1b38f559780a0ba186760f7f' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change abe2e5224667e0f31a656297c1caa48be61d05bd failed: 1
Merging #923 Add curve squeal to route...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change fc1ac91347779fcc9c372c6a72c3ed3ea5550a23
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #924 Default Asset Improvements...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6c2c3cdbec6be1a07ce7f5af91268c0dbfb4a581
Merging #927 AI Train Power Supply/Lights Fix...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a28da458b36670745661b1545d83807a8869bd50
Merging #929 Add support for common circuit breaker variants...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a406a69d9fbbf780eb5756e377cbcde0b63ede3d
Merging #937 Adds missing API cab controls to Manual...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change bf4a254f35583e27d132f8c235f027522edf1b9e
  < Auto-merging Source/Documentation/Manual/software-platform.rst
Pull requests successfully auto-merged (16):
  #570 Experimental glTF 2.0 support with PBR lighting
  #799 Consolidated wind simulation
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
  #876 docs: add source for documents previously on website to source Documentation folder
  #882 Blueprint/train car operations UI window
  #886 Scene viewer extension to TrackViewer
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
  #903 Downloading route content (Github, zip)
  #912 New Triple Valve Features Vol. 2
  #919 Added mouse wheel support for controls which can be moved by pressing t…
  #923 Add curve squeal to route
  #924 Default Asset Improvements
  #927 AI Train Power Supply/Lights Fix
  #929 Add support for common circuit breaker variants
  #937 Adds missing API cab controls to Manual
Pull requests not auto-merged (6):
  #885 feat: Add notifications to Menu
  #891 Auto save
  #900 DMI updates
  #901 Remove unnecessary spaces and incorrect usage of spaces across the codebase (`Orts.Simulation`)
  #918 Manual - News topics updated since 1.5.1
  #922 Autopilot for timetable mode
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2024-04-25 04:53:01Z