Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2020-08-09 01:36:10Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (11):
  Sharpe49
  twpol
  cjakeman
  YoRyan
  perpetualKid
  strawberryfield
  peternewell
  Csantucci
  wjcurrey
  markus-GE
  mbm-OR
Open pull requests (16):
  #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
  #79 Update version calculation for new unstable versions
    By:     twpol
    Branch: feature/unstable-version-numbers
    Labels: 
    Allowed to auto-merge? True
  #95 https://blueprints.launchpad.net/or/+spec/temporary-options-for-activ.
    By:     peternewell
    Branch: activity_options
    Labels: enhancement not-for-unstable
    Allowed to auto-merge? False
  #105 refactor: Reformat all code with dotnet format
    By:     twpol
    Branch: feature/dotnet-format
    Labels: 
    Allowed to auto-merge? True
  #228 adds links to OR on Elvas Tower
    By:     cjakeman
    Branch: website-update
    Labels: website
    Allowed to auto-merge? True
  #230 Work in progress Monogame migration
    By:     twpol
    Branch: monogame/master
    Labels: not-for-unstable refactoring
    Allowed to auto-merge? False
  #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
    By:     YoRyan
    Branch: nextgen-consists
    Labels: enhancement
    Allowed to auto-merge? True
  #234 Rehabilitate unit testing suite, migrate to xUnit 2
    By:     YoRyan
    Branch: fix-tests
    Labels: refactoring
    Allowed to auto-merge? True
  #241 Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
    By:     Sharpe49
    Branch: fix-signals-hsl
    Labels: bug refactoring
    Allowed to auto-merge? True
  #243 Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
    By:     YoRyan
    Branch: fix-freightanim-friction
    Labels: bug
    Allowed to auto-merge? True
  #244 expanded Variable Sound Triggers
    By:     cjakeman
    Branch: manual-sound
    Labels: documentation
    Allowed to auto-merge? True
  #245 Manual build fixes
    By:     cjakeman
    Branch: manual-build-fixes
    Labels: documentation
    Allowed to auto-merge? True
  #247 adds Manual.pdf in Spanish
    By:     cjakeman
    Branch: spanish-manual2
    Labels: documentation
    Allowed to auto-merge? True
  #248 Russian translation
    By:     Weter-ORTS
    Branch: master
    Labels: for-unstable locales
    Allowed to auto-merge? True
  #251 Change 3D cab key behaviour
    By:     Sharpe49
    Branch: change-3d-cab-key-behaviour
    Labels: enhancement
    Allowed to auto-merge? True
  #252 Script compilation with Roslyn in order to support C# v7
    By:     Sharpe49
    Branch: script-csharp7
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (13):
  #79 Update version calculation for new unstable versions
  #105 refactor: Reformat all code with dotnet format
  #228 adds links to OR on Elvas Tower
  #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
  #234 Rehabilitate unit testing suite, migrate to xUnit 2
  #241 Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
  #243 Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
  #244 expanded Variable Sound Triggers
  #245 Manual build fixes
  #247 adds Manual.pdf in Spanish
  #248 Russian translation
  #251 Change 3D cab key behaviour
  #252 Script compilation with Roslyn in order to support C# v7
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 95ddd1fb9 Automatic merge of X1.3.1-203-g4d6188725 and 11 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 4d61887252746f5adc2714d9f7950d7a4fe8a097
Merging #79 Update version calculation for new unstable versions...
  > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
  < Auto-merging Build.cmd
Merging #105 refactor: Reformat all code with dotnet format...
  > git --no-pager merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379
  < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
  < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
  < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowText.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowManager.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/WindowManager.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/Window.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TTDetachWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Materials.cs
  < Auto-merging Source/RunActivity/Viewer3D/MSTSSky.cs
  < Auto-merging Source/RunActivity/Viewer3D/InfoDisplay.cs
  < Auto-merging Source/RunActivity/Viewer3D/Debugging/MessageViewer.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Debugging/MessageViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Turntables.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Turntables.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTPool.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Timetables/PoolInfo.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.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/RollingStocks/SubSystems/TrainControlSystem.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.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/MSTSDieselLocomotive.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/LevelCrossing.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Confirmer.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Activity.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/AIs/AIAuxAction.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/AIs/AIAuxAction.cs
  < Auto-merging Source/Orts.Simulation/Simulation/AIs/AI.cs
  < Auto-merging Source/Orts.Simulation/MultiPlayer/Message.cs
  < Auto-merging Source/Orts.Simulation/Common/Events.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Events.cs
  < Auto-merging Source/Orts.Simulation/Common/Commands.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Commands.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Parsers.Msts/Interpolator.cs
  < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/ORTS.Settings/UserSettings.cs
  < CONFLICT (content): Merge conflict in Source/ORTS.Settings/UserSettings.cs
  < Auto-merging Source/ORTS.Settings/InputSettings.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/Menu/MainForm.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at e221b40ae Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379 failed: 1
Merging #228 adds links to OR on Elvas Tower...
  > git --no-pager merge --quiet --no-edit --no-ff 72c01464ce0a6303a9c385b841dab1d72353b04d
Merging #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor...
  > git --no-pager merge --quiet --no-edit --no-ff 0dc0892ca66701ce68fe290584e10b23b9c78df4
Merging #234 Rehabilitate unit testing suite, migrate to xUnit 2...
  > git --no-pager merge --quiet --no-edit --no-ff f67b8c5b628f7fb10bff073d94c18b07e265bda7
  < Auto-merging Website/openrails.org/contribute/developing-code/index.php
  < Removing Source/3rdPartyLibs/xunit.dll
Merging #241 Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304...
  > git --no-pager merge --quiet --no-edit --no-ff ddd28b1f62b6dcadf821c05b4f82382576b6d7f3
Merging #243 Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448...
  > git --no-pager merge --quiet --no-edit --no-ff 9607b850fca7fea77f7aebda12b333953804f1f8
Merging #244 expanded Variable Sound Triggers...
  > git --no-pager merge --quiet --no-edit --no-ff e7f37e9a1137f0e16c849ad765a04763efeb6f7b
Merging #245 Manual build fixes...
  > git --no-pager merge --quiet --no-edit --no-ff 220ba32ed018cf22759422bd19f85a5922fbcbaf
Merging #247 adds Manual.pdf in Spanish...
  > git --no-pager merge --quiet --no-edit --no-ff 171d28828dbe9ac348dfe6642493495dbe4a876a
  < Auto-merging Source/Menu/MainForm.cs
Merging #248 Russian translation...
  > git --no-pager merge --quiet --no-edit --no-ff 68f2db13e8814e1ca42a126a3ba33a9d5af51c71
Merging #251 Change 3D cab key behaviour...
  > git --no-pager merge --quiet --no-edit --no-ff 8f988d04fdc9984a98613c5477dc93e35970383b
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/Locales/RunActivity/RunActivity.pot
  < CONFLICT (content): Merge conflict in Source/Locales/RunActivity/RunActivity.pot
  < Auto-merging Source/Locales/Orts.Simulation/Orts.Simulation.pot
  < CONFLICT (content): Merge conflict in Source/Locales/Orts.Simulation/Orts.Simulation.pot
  < Auto-merging Source/Locales/ORTS.Menu/ORTS.Menu.pot
  < CONFLICT (content): Merge conflict in Source/Locales/ORTS.Menu/ORTS.Menu.pot
  < Auto-merging Source/Locales/ORTS.Common/ORTS.Common.pot
  < CONFLICT (content): Merge conflict in Source/Locales/ORTS.Common/ORTS.Common.pot
  < Auto-merging Source/Locales/Menu/Menu.pot
  < CONFLICT (content): Merge conflict in Source/Locales/Menu/Menu.pot
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 57d25b3e9 Merge commit '68f2db13e8814e1ca42a126a3ba33a9d5af51c71' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 8f988d04fdc9984a98613c5477dc93e35970383b failed: 1
Merging #252 Script compilation with Roslyn in order to support C# v7...
  > git --no-pager merge --quiet --no-edit --no-ff 91d30aacbfd90f78f4df388ce6b311bd62bb9b1e
  < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
Pull requests successfully auto-merged (11):
  #79 Update version calculation for new unstable versions
  #228 adds links to OR on Elvas Tower
  #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
  #234 Rehabilitate unit testing suite, migrate to xUnit 2
  #241 Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
  #243 Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
  #244 expanded Variable Sound Triggers
  #245 Manual build fixes
  #247 adds Manual.pdf in Spanish
  #248 Russian translation
  #252 Script compilation with Roslyn in order to support C# v7
Pull requests not auto-merged (2):
  #105 refactor: Reformat all code with dotnet format
  #251 Change 3D cab key behaviour
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2020-08-09 01:36:27Z