Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2022-01-21 07:06:52Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (13):
  Sharpe49
  twpol
  cjakeman
  pzgulyas
  YoRyan
  perpetualKid
  strawberryfield
  cesarBLG
  peternewell
  Csantucci
  wjcurrey
  markus-GE
  mbm-OR
Open pull requests (19):
  #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
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
    By:     peternewell
    Branch: diesel-mechanic#1
    Labels: enhancement
    Allowed to auto-merge? True
  #524 Further strings translation
    By:     Weter-ORTS
    Branch: master
    Labels: locales
    Allowed to auto-merge? False
  #525 TCS extensions
    By:     Sharpe49
    Branch: tcs-extensions
    Labels: enhancement
    Allowed to auto-merge? True
  #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
  #533 fix for shapes hidden by animations( 0 )
    By:     cjakeman
    Branch: fix-for-hidden-shapes
    Labels: bug
    Allowed to auto-merge? True
  #537 C# signal script extensions
    By:     Sharpe49
    Branch: csharp-script-extensions
    Labels: enhancement refactoring
    Allowed to auto-merge? True
  #541 Initial Virtual File System development
    By:     pzgulyas
    Branch: ziparchive
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #545 Fix VRAM usage
    By:     Sharpe49
    Branch: fix-vram-usage
    Labels: bug
    Allowed to auto-merge? True
  #553 ScriptManager migration to the CodeAnalysis class. This is in preparation for the net 6 migration.
    By:     pzgulyas
    Branch: roslyn
    Labels: refactoring
    Allowed to auto-merge? True
  #560 https://blueprints.launchpad.net/or/+spec/label-for-cab-controls , by Jindrich
    By:     Csantucci
    Branch: cabview-control-label
    Labels: enhancement
    Allowed to auto-merge? True
  #561 Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907
    By:     cesarBLG
    Branch: manual-callon-advanced
    Labels: bug
    Allowed to auto-merge? True
  #562 Remove the locomotive handle from the script, because no interface function can allow access to any internal structure.
    By:     pzgulyas
    Branch: tcs-script-fix
    Labels: 
    Allowed to auto-merge? True
  #564 Added TCS parameters file path in consist files (+ refactoring and code cleanup)
    By:     Sharpe49
    Branch: tcs-parameters-in-consist
    Labels: enhancement refactoring
    Allowed to auto-merge? True
  #565 Correct Steam locomoti starting tractive effort.
    By:     peternewell
    Branch: steam-tractive-effort#2
    Labels: bug
    Allowed to auto-merge? True
  #567 Adds 64-bit compatibility
    By:     cjakeman
    Branch: 64-bit
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #569 Upgraded project files to .Net SDK project file format
    By:     Sharpe49
    Branch: dotnetsdk-project-files-upgrade
    Labels: enhancement
    Allowed to auto-merge? True
  #570 Experimental glTF 2.0 support with PBR lighting
    By:     pzgulyas
    Branch: gltf2
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #571 01: Manual entries for Menu > Options corrected
    By:     cjakeman
    Branch: menu-options01
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (13):
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
  #525 TCS extensions
  #533 fix for shapes hidden by animations( 0 )
  #537 C# signal script extensions
  #545 Fix VRAM usage
  #553 ScriptManager migration to the CodeAnalysis class. This is in preparation for the net 6 migration.
  #560 https://blueprints.launchpad.net/or/+spec/label-for-cab-controls , by Jindrich
  #561 Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907
  #562 Remove the locomotive handle from the script, because no interface function can allow access to any internal structure.
  #564 Added TCS parameters file path in consist files (+ refactoring and code cleanup)
  #565 Correct Steam locomoti starting tractive effort.
  #569 Upgraded project files to .Net SDK project file format
  #571 01: Manual entries for Menu > Options corrected
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 15bc14024 Automatic merge of T1.4-148-ge5d8f1cf2 and 10 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach e5d8f1cf2e06e41785196474202ef100fcadd814
Merging #510 Add performance monitoring for diesel mechanic locomotives and new parameters...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d259c6d80dca86b25e341d0df07a88257236abe7
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.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/SubSystems/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at e5d8f1cf2 Merge pull request #559 from Csantucci/Distributed-power-cab-display
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change d259c6d80dca86b25e341d0df07a88257236abe7 failed: 1
Merging #525 TCS extensions...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 614b22208a1d7670f14751b2fc50e379e76a96c7
Merging #533 fix for shapes hidden by animations( 0 )...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 62a1c271c1072bc3a4d5dbf0756455587ffc210f
Merging #537 C# signal script extensions...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d2f0cc8edf3345a4c83b6f02de95c70a9c6c1c88
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 8ef09db62 Merge commit '62a1c271c1072bc3a4d5dbf0756455587ffc210f' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change d2f0cc8edf3345a4c83b6f02de95c70a9c6c1c88 failed: 1
Merging #545 Fix VRAM usage...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3f57012c7f2eff79ea68dc36627751dec6fbed39
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #553 ScriptManager migration to the CodeAnalysis class. This is in preparation for the net 6 migration....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 12e53b11b346b66989a9f25b1f2f3ffdd43d5d6c
Merging #560 https://blueprints.launchpad.net/or/+spec/label-for-cab-controls , by Jindrich...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c5d0a1f6ba878594d9398f687b33379d04a238e7
  < Auto-merging Source/Documentation/Manual/cabs.rst
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #561 Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 36dcd192a99a0cde2151550b589f964268b9beec
Merging #562 Remove the locomotive handle from the script, because no interface function can allow access to any internal structure....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 44f35b4b7bf9383edf3552c1b09f17954cf730e7
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
Merging #564 Added TCS parameters file path in consist files (+ refactoring and code cleanup)...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change af9e9aecd519766127479201cc0d09535bf1d130
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
Merging #565 Correct Steam locomoti starting tractive effort....
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ebcd9e87ae6183361ce7f5a16ba709389c4fde3d
Merging #569 Upgraded project files to .Net SDK project file format...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9b757a193e005ba0b6530df1b14e7c60045bda94
  < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
  < CONFLICT (modify/delete): Source/Orts.Simulation/packages.config deleted in 9b757a193e005ba0b6530df1b14e7c60045bda94 and modified in HEAD.  Version HEAD of Source/Orts.Simulation/packages.config left in tree.
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at ccfd50959 Merge commit 'ebcd9e87ae6183361ce7f5a16ba709389c4fde3d' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 9b757a193e005ba0b6530df1b14e7c60045bda94 failed: 1
Merging #571 01: Manual entries for Menu > Options corrected...
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f81fe9f6543cdd7177a939ec1d074bc515691fd7
Pull requests successfully auto-merged (10):
  #525 TCS extensions
  #533 fix for shapes hidden by animations( 0 )
  #545 Fix VRAM usage
  #553 ScriptManager migration to the CodeAnalysis class. This is in preparation for the net 6 migration.
  #560 https://blueprints.launchpad.net/or/+spec/label-for-cab-controls , by Jindrich
  #561 Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907
  #562 Remove the locomotive handle from the script, because no interface function can allow access to any internal structure.
  #564 Added TCS parameters file path in consist files (+ refactoring and code cleanup)
  #565 Correct Steam locomoti starting tractive effort.
  #571 01: Manual entries for Menu > Options corrected
Pull requests not auto-merged (3):
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
  #537 C# signal script extensions
  #569 Upgraded project files to .Net SDK project file format
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2022-01-21 07:07:06Z