Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2021-07-30 02:51:11Z
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 (12):
  #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
  #408 Updating RailDriver SDK library to prepare for 64bit mode
    By:     perpetualKid
    Branch: RailDriverUpdate
    Labels: refactoring
    Allowed to auto-merge? True
  #412 New TCS function to get speed post information (including warning speed posts)
    By:     Sharpe49
    Branch: tcs-speed-post-features
    Labels: enhancement
    Allowed to auto-merge? True
  #420 Delete Russian timetable.rst
    By:     YoRyan
    Branch: delete-timetable-rst
    Labels: 
    Allowed to auto-merge? True
  #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
    By:     Sharpe49
    Branch: tcs-eb-manuel-reset
    Labels: enhancement
    Allowed to auto-merge? True
  #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
    By:     mbm-OR
    Branch: blueprint/train-driving-ui-window
    Labels: enhancement
    Allowed to auto-merge? True
  #433 Don't unload sound sources of the player train when camera near it 
    By:     Csantucci
    Branch: sound-cutoff-improve
    Labels: enhancement
    Allowed to auto-merge? True
  #435 Revised installer for Release 1.4
    By:     cjakeman
    Branch: installer
    Labels: help wanted
    Allowed to auto-merge? True
  #440 Addition of Derail Coefficient and further coupler animation
    By:     peternewell
    Branch: derail_notification#2
    Labels: enhancement
    Allowed to auto-merge? True
  #442 Correct input discrepancy for tractive force tables
    By:     peternewell
    Branch: tractive-force-curves
    Labels: bug
    Allowed to auto-merge? True
  #443 CVCDiscrete extended to report correct MaxValue
    By:     cjakeman
    Branch: api-cabcontrols3
    Labels: bug
    Allowed to auto-merge? True
  #444 First phase of wheel slide protection
    By:     peternewell
    Branch: brake-enhancements
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (11):
  #408 Updating RailDriver SDK library to prepare for 64bit mode
  #412 New TCS function to get speed post information (including warning speed posts)
  #420 Delete Russian timetable.rst
  #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
  #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
  #433 Don't unload sound sources of the player train when camera near it 
  #435 Revised installer for Release 1.4
  #440 Addition of Derail Coefficient and further coupler animation
  #442 Correct input discrepancy for tractive force tables
  #443 CVCDiscrete extended to report correct MaxValue
  #444 First phase of wheel slide protection
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at c555c0feaf Automatic merge of X1.3.1-380-gde02eda617 and 10 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach de02eda61729e579a682cc813e67b06c345221b7
Merging #408 Updating RailDriver SDK library to prepare for 64bit mode...
  > git --no-pager merge --quiet --no-edit --no-ff e77a86a481c79bc016bbb7f9dcc3a369259bae2d
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < Removing Source/3rdPartyLibs/PIEHidDotNet.dll
Merging #412 New TCS function to get speed post information (including warning speed posts)...
  > git --no-pager merge --quiet --no-edit --no-ff 26e29edea62043c5879fb53bf42514fa6b5683e3
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
Merging #420 Delete Russian timetable.rst...
  > git --no-pager merge --quiet --no-edit --no-ff 39843b106ce618f6e6d3dab71b3741e3e14509e5
  < Removing Source/Documentation/Manual/ru/timetable.rst
Merging #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator...
  > git --no-pager merge --quiet --no-edit --no-ff 843eb30ac9df5cdfe356ee7325037a73f974d7fc
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
Merging #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window...
  > git --no-pager merge --quiet --no-edit --no-ff f67719317afdf3fdeb0d05a8f9ba2db00064f467
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < Auto-merging Source/ORTS.Settings/InputSettings.cs
  < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
Merging #433 Don't unload sound sources of the player train when camera near it ...
  > git --no-pager merge --quiet --no-edit --no-ff 5f52b34ef0775915a3f51ba58f9d0b0a6d9fafbf
Merging #435 Revised installer for Release 1.4...
  > git --no-pager merge --quiet --no-edit --no-ff e1e48c40f4721721e014e3fc5f4ddb7cb361c797
  < Auto-merging Source/Launcher/Program.cs
  < Auto-merging Source/Launcher/Launcher.csproj
  < Removing Source/Installer/Readme.txt
  < Removing Source/Installer/OpenRails shared/Version.iss
  < Removing Source/Installer/OpenRails shared/OpenRails.iss
  < Removing Source/Installer/OpenRails from download/OpenRails from download.iss
  < Removing Source/Installer/OpenRails from DVD/OpenRails from DVD.iss
  < Auto-merging Build.cmd
  < CONFLICT (content): Merge conflict in Build.cmd
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at e5726b1fb9 Merge commit '5f52b34ef0775915a3f51ba58f9d0b0a6d9fafbf' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff e1e48c40f4721721e014e3fc5f4ddb7cb361c797 failed: 1
Merging #440 Addition of Derail Coefficient and further coupler animation...
  > git --no-pager merge --quiet --no-edit --no-ff 150b1ab49ef7a4828ed52a32068a49bcd55a0445
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #442 Correct input discrepancy for tractive force tables...
  > git --no-pager merge --quiet --no-edit --no-ff f4df6f4795be696d6d083091d6319a03fc4beeba
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
Merging #443 CVCDiscrete extended to report correct MaxValue...
  > git --no-pager merge --quiet --no-edit --no-ff 12674756583155c003945a5dcef9923e02538b8f
Merging #444 First phase of wheel slide protection...
  > git --no-pager merge --quiet --no-edit --no-ff 4a0e48a9f2296a3650f89918b7250ef4a3c25b61
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
Pull requests successfully auto-merged (10):
  #408 Updating RailDriver SDK library to prepare for 64bit mode
  #412 New TCS function to get speed post information (including warning speed posts)
  #420 Delete Russian timetable.rst
  #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
  #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
  #433 Don't unload sound sources of the player train when camera near it 
  #440 Addition of Derail Coefficient and further coupler animation
  #442 Correct input discrepancy for tractive force tables
  #443 CVCDiscrete extended to report correct MaxValue
  #444 First phase of wheel slide protection
Pull requests not auto-merged (1):
  #435 Revised installer for Release 1.4
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-07-30 02:51:23Z