Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2024-10-03 12:53:03Z
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 (28):
  #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
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
    By:     Csantucci
    Branch: further-cc-parameters
    Draft:  False
    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
    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
  #919 Added mouse wheel support for controls which can be moved by pressing t…
    By:     sweiland-openrails
    Branch: MouseWheelSupport
    Draft:  True
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #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
  #952 Investigation - Pulsing graphics
    By:     twpol
    Branch: investigation/pulsing-graphics
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #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 Improvements
    By:     SteelFill
    Branch: multi_track_profiles
    Draft:  False
    Labels: enhancement refactoring
    Allowed to auto-merge? True
  #958 Switch panel (web based) enhancements
    By:     sweiland-openrails
    Branch: SwitchPanel2
    Draft:  True
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #961 Improvements for Power Supplies
    By:     cesarBLG
    Branch: powersupply-scripts
    Draft:  True
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #970 feat: Remove unnecessary Windows.Forms usage
    By:     twpol
    Branch: feature/less-windows-forms
    Draft:  False
    Labels: enhancement
    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
  #980 Downloading route content (Github, zip) second part 
    By:     sweiland-openrails
    Branch: downloadContent2
    Draft:  False
    Labels: 
    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
  #982 WEB based Switch Panel enhancement: Alerter
    By:     sweiland-openrails
    Branch: SwitchPanelAlerter
    Draft:  False
    Labels: 
    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
  #986 Fix: The TrainCarOperations window does not resize correctly.
    By:     mbm-OR
    Branch: bugfix/TrainCarOperations-resize-window
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (16):
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #952 Investigation - Pulsing graphics
  #953 Fix Lights Crash on Corrupt Shapes
  #954 Multiple Track Profiles & Superelevation Improvements
  #970 feat: Remove unnecessary Windows.Forms usage
  #972 On Map window color changed switch or signal is not changed
  #980 Downloading route content (Github, zip) second part 
  #981 Multiple type trainset lightglows
  #982 WEB based Switch Panel enhancement: Alerter
  #984 Player train switching for timetable mode
  #986 Fix: The TrainCarOperations window does not resize correctly.
  #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
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 9f6e2f9b47 Automatic merge of T1.5.1-1284-gca636331f4 and 14 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach ca636331f4abd63f0c1cf4d0857ecbc2153a5fa8
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 #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 #952 Investigation - Pulsing graphics...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8347095ac61d4119b5eb3cf71dd7897af10d7a6e
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.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 Improvements...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 62061b81aba819d7a09df5b142545f12084ddccf
  < 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.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/World.cs
Merging #970 feat: Remove unnecessary Windows.Forms usage...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6fa5eed2f98fac901585e7d60ed78c6500f84f84
  < Auto-merging Source/ContentChecker/ContentChecker.csproj
  < Auto-merging Source/Contrib/SimulatorTester/SimulatorTester.csproj
  < Auto-merging Source/Menu/MainForm.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/Menu/Program.cs
  < Auto-merging Source/ORTS.Common/ORTS.Common.csproj
  < Auto-merging Source/ORTS.Common/SystemInfo.cs
  < Auto-merging Source/ORTS.Settings/ORTS.Settings.csproj
  < CONFLICT (content): Merge conflict in Source/ORTS.Settings/ORTS.Settings.csproj
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/ORTS.Updater/ORTS.Updater.csproj
  < Auto-merging Source/ORTS.Updater/UpdateManager.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at c91b88e022 Merge commit '62061b81aba819d7a09df5b142545f12084ddccf' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 6fa5eed2f98fac901585e7d60ed78c6500f84f84 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 #980 Downloading route content (Github, zip) second part ...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2b79de15340f03ad6d167b30625b5fd5186b1df9
  < Auto-merging Source/Documentation/Manual/options.rst
  < Auto-merging Source/Documentation/Manual/start.rst
  < Auto-merging Source/Menu/MainForm.cs
  < Auto-merging Source/Menu/Options.Designer.cs
  < Auto-merging Source/Menu/Options.cs
  < 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/RunActivity/Viewer3D/Materials.cs
Merging #982 WEB based Switch Panel enhancement: Alerter...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change efcf19c6926744d6f2c70d2a46eb1456c7d3062e
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
Merging #986 Fix: The TrainCarOperations window does not resize correctly....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5d7e69292471a624d165cd1af4fa85bdaca231c9
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
  < 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 5ce64310e5 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
Pull requests successfully auto-merged (14):
  #839 First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
  #891 Auto save
  #892 Signal Function OPP_SIG_ID_TRAINPATH
  #952 Investigation - Pulsing graphics
  #953 Fix Lights Crash on Corrupt Shapes
  #954 Multiple Track Profiles & Superelevation Improvements
  #972 On Map window color changed switch or signal is not changed
  #980 Downloading route content (Github, zip) second part 
  #981 Multiple type trainset lightglows
  #982 WEB based Switch Panel enhancement: Alerter
  #984 Player train switching for timetable mode
  #986 Fix: The TrainCarOperations window does not resize correctly.
  #900 DMI updates
  #876 docs: add source for documents previously on website to source Documentation folder
Pull requests not auto-merged (2):
  #970 feat: Remove unnecessary Windows.Forms usage
  #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-03 12:53:22Z