Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2024-10-30 00:07:08Z
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 (26):
  #57 Ensure that build fails when tests fail to run
    By:     twpol
    Branch: bugfix/net4-test-runner
    Draft:  True
    Labels: not-for-unstable
    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: 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: 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: 
    Allowed to auto-merge? False
  #953 Fix Lights Crash on Corrupt Shapes
    By:     SteelFill
    Branch: lights_bugfix
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #954 Multiple Track Profiles & Superelevation Rewrite
    By:     SteelFill
    Branch: multi_track_profiles
    Draft:  False
    Labels: enhancement refactoring
    Allowed to auto-merge? True
  #961 Improvements for Power Supplies
    By:     cesarBLG
    Branch: powersupply-scripts
    Draft:  False
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #972 On Map window color changed switch or signal is not changed
    By:     sweiland-openrails
    Branch: mapSwitchChangeBug
    Draft:  False
    Labels: bug
    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
  #984 Player train switching for timetable mode
    By:     Csantucci
    Branch: timetable-player-train-switching-official
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #988 Conditional sound, blueprint https://blueprints.launchpad.net/or/+spec/conditional-sound
    By:     Csantucci
    Branch: conditional-sound-official
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #991 Fix TrainCarOperations no interacts AltPgDn AltPgUp.
    By:     mbm-OR
    Branch: bugfix/Fix-TrainCarOperations-no-interact-AltPgDn-AltPgUp
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #994 2 fixes in the OR manual
    By:     Csantucci
    Branch: OR-manual-corrections
    Draft:  False
    Labels: documentation
    Allowed to auto-merge? True
  #995 Fix: TrainCarOperations and TrainOperationsViewer windows overlap.
    By:     mbm-OR
    Branch: bugfix/Fix-TrainCarOperations-TrainOperationsViewer-overlap
    Draft:  True
    Labels: bug
    Allowed to auto-merge? True
  #996 Replace dynamic brakes by engine brakes at low speeds
    By:     cesarBLG
    Branch: reverse-blending
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #997 Disable independent brake syncing by default
    By:     cesarBLG
    Branch: fix-independent-default
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (17):
  #961 Improvements for Power Supplies
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #953 Fix Lights Crash on Corrupt Shapes
  #954 Multiple Track Profiles & Superelevation Rewrite
  #972 On Map window color changed switch or signal is not changed
  #981 Multiple type trainset lightglows
  #984 Player train switching for timetable mode
  #988 Conditional sound, blueprint https://blueprints.launchpad.net/or/+spec/conditional-sound
  #991 Fix TrainCarOperations no interacts AltPgDn AltPgUp.
  #994 2 fixes in the OR manual
  #996 Replace dynamic brakes by engine brakes at low speeds
  #997 Disable independent brake syncing by default
  #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
  #995 Fix: TrainCarOperations and TrainOperationsViewer windows overlap.
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 6b9337c7c8 Automatic merge of T1.5.1-1321-g597ce24c42 and 18 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach d5ef71956df8f063f8089fc26736a90ba8654f57
Merging #961 Improvements for Power Supplies...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13a9ca164c1405b810cd0619d3c0cfecf46e17fe
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/ORTS.Common/Conversions.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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
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 #953 Fix Lights Crash on Corrupt Shapes...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a51945203c969ce62941872a23494dfb01c90db1
Merging #954 Multiple Track Profiles & Superelevation Rewrite...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 23cb0c3703ad8c68a8824511015985738dac1ef9
  < Auto-merging Source/Menu/Options.Designer.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/ORTS.Common/Conversions.cs
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.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/Signalling/Signals.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/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 c842c4ba41 Merge commit 'a51945203c969ce62941872a23494dfb01c90db1' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 23cb0c3703ad8c68a8824511015985738dac1ef9 failed: 1
Merging #972 On Map window color changed switch or signal is not changed...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e90a2aa6a056bc383cfc28c233df1b9c7e277ebd
  < Auto-merging Source/RunActivity/Viewer3D/Map/MapForm.cs
Merging #981 Multiple type trainset lightglows...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 10d297f8ca7e02191b816597e6de4c957287916b
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
Merging #984 Player train switching for timetable mode...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0f8122ec65b79eea16f1aebd21a1a86b0726b01d
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
Merging #988 Conditional sound, blueprint https://blueprints.launchpad.net/or/+spec/conditional-sound...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f1d4d18b0417faa81b29f889994ab16b0c9877c7
Merging #991 Fix TrainCarOperations no interacts AltPgDn AltPgUp....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 220b61e6cf870bf4396e85269d8ec167603f9d3d
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
Merging #994 2 fixes in the OR manual...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1de8de6f3627af5ec0662fb33e0285f02de24280
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
Merging #996 Replace dynamic brakes by engine brakes at low speeds...
  > 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 #997 Disable independent brake syncing by default...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0de38ec9e306d64cfa674504bb5cb6dc67fea526
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.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
  < 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...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5866028cf210ce6da161a99ee034c6366e04b25a
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < CONFLICT (content): Merge conflict in 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/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 54f54302a5 Merge commit 'f92de7665b04bfea0458cecb457ea7c288c096d3' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 5866028cf210ce6da161a99ee034c6366e04b25a failed: 1
Merging #995 Fix: TrainCarOperations and TrainOperationsViewer windows overlap....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 992191cfe832a904f56d757e308447a12dc61e50
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
Pull requests successfully auto-merged (15):
  #961 Improvements for Power Supplies
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #953 Fix Lights Crash on Corrupt Shapes
  #972 On Map window color changed switch or signal is not changed
  #981 Multiple type trainset lightglows
  #984 Player train switching for timetable mode
  #988 Conditional sound, blueprint https://blueprints.launchpad.net/or/+spec/conditional-sound
  #991 Fix TrainCarOperations no interacts AltPgDn AltPgUp.
  #994 2 fixes in the OR manual
  #996 Replace dynamic brakes by engine brakes at low speeds
  #997 Disable independent brake syncing by default
  #900 DMI updates
  #876 docs: add source for documents previously on website to source Documentation folder
  #995 Fix: TrainCarOperations and TrainOperationsViewer windows overlap.
Pull requests not auto-merged (2):
  #954 Multiple Track Profiles & Superelevation Rewrite
  #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2024-10-30 00:07:28Z