Silver's Simple Site - Projects - Open Rails

C:\Program Files\dotnet\sdk\10.0.102\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
C:\Program Files\dotnet\sdk\10.0.102\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
C:\Program Files\dotnet\sdk\10.0.102\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
Open Rails Code Bot started at 2026-01-14 22:07:17Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (18):
  Sharpe49
  twpol
  cjakeman
  pzgulyas
  YoRyan
  perpetualKid
  strawberryfield
  cesarBLG
  peternewell
  Csantucci
  Roeterdink
  wjcurrey
  Looky1173
  markus-GE
  mbm-OR
  SteelFill
  sweiland-openrails
  rwf-rr
Open pull requests (25):
  #57 Ensure that build fails when tests fail to run
    By:     twpol
    Branch: bugfix/net4-test-runner
    Draft:  True
    Labels: not-for-unstable infrastructure
    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 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
  #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: enhancement not-for-unstable
    Allowed to auto-merge? False
  #1013 Tools for reverse engineering shape and ace files (converting)
    By:     Hirek193
    Branch: master
    Draft:  False
    Labels: 
    Allowed to auto-merge? False
  #1057 Switchable brake system
    By:     pzgulyas
    Branch: gpr
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1081 Brake cuts power unification
    By:     cesarBLG
    Branch: brake-cuts-power
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1091 Automatic speed control
    By:     cesarBLG
    Branch: cruise-control-review
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1122 Wagon Size and Centering Controls
    By:     SteelFill
    Branch: size_centering
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1124 Built-in PBL2 brake controller
    By:     cesarBLG
    Branch: pbl2
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1126 ShapeHierarchy Attachment for More Wagon Addons
    By:     SteelFill
    Branch: shape_hierarchy
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1127 Advanced Shape Descriptor Controls
    By:     SteelFill
    Branch: shape_descriptor_features
    Draft:  True
    Labels: enhancement
    Allowed to auto-merge? True
  #1128 Particle Emitter Overhaul
    By:     SteelFill
    Branch: particle_emitter_overhaul
    Draft:  False
    Labels: enhancement refactoring not-for-unstable
    Allowed to auto-merge? False
  #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
    By:     rwf-rr
    Branch: bugfix-f9-index-out-of-range-on-resume
    Draft:  False
    Labels: bug
    Allowed to auto-merge? True
  #1166 Simplify loading of internal and game textures
    By:     twpol
    Branch: feature/texture-file-format-separation
    Draft:  False
    Labels: refactoring
    Allowed to auto-merge? True
  #1169 Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock
    By:     SteelFill
    Branch: manual_articulate
    Draft:  False
    Labels: bug refactoring
    Allowed to auto-merge? True
  #1185 Feat/adds timetable editor
    By:     cjakeman
    Branch: feat/adds-timetable-editor
    Draft:  False
    Labels: refactoring
    Allowed to auto-merge? True
  #1186 Hot Reloading of Simulator and Graphical Assets
    By:     SteelFill
    Branch: hot_reload
    Draft:  True
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
  #1187 Extra webpage with Activity Event messages added.
    By:     sweiland-openrails
    Branch: Activity_Events_webpage
    Draft:  False
    Labels: enhancement
    Allowed to auto-merge? True
  #1189 Adds clarity for ORTSUserPreferenceRemoveForestTreesFromRoads
    By:     cjakeman
    Branch: manual-refine-RemoveForestTreesFromRoads
    Draft:  False
    Labels: bug documentation
    Allowed to auto-merge? True
  #1190 Fix Map Window position saved when minimized.
    By:     rwf-rr
    Branch: fix-map-pos-off-screen
    Draft:  False
    Labels: 
    Allowed to auto-merge? True
  #1194 Rack railway#2
    By:     peternewell
    Branch: rack-railway#2
    Draft:  False
    Labels: enhancement for-unstable
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (16):
  #1194 Rack railway#2
  #1057 Switchable brake system
  #1081 Brake cuts power unification
  #1091 Automatic speed control
  #1122 Wagon Size and Centering Controls
  #1124 Built-in PBL2 brake controller
  #1126 ShapeHierarchy Attachment for More Wagon Addons
  #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
  #1166 Simplify loading of internal and game textures
  #1169 Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock
  #1185 Feat/adds timetable editor
  #1187 Extra webpage with Activity Event messages added.
  #1189 Adds clarity for ORTSUserPreferenceRemoveForestTreesFromRoads
  #1190 Fix Map Window position saved when minimized.
  #1186 Hot Reloading of Simulator and Graphical Assets
  #1127 Advanced Shape Descriptor Controls
Preparing repository...
  > git --no-pager config remove-section remote.origin
  > git --no-pager remote add origin --mirror=fetch git@github.com:openrails/openrails.git
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 6c8099d0b Automatic merge of T1.6-268-g2239fd1af and 12 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 2239fd1afcd7e7c6adf75bd03fca980a08997577
Merging #1194 Rack railway#2...
  Source/Orts.Formats.Msts/TrackSectionsFile.cs +3 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +104 -27
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +31 -1
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +4 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 52f236dc2e1222a87450e548eac1f079077b0a11
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
Merging #1057 Switchable brake system...
  Source/Documentation/Manual/physics.rst +70 -2
  Source/Orts.Common/Conversions.cs +1 -1
  Source/Orts.Parsers.Msts/STFReader.cs +2 -3
  Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -0
  Source/Orts.Simulation/Simulation/Physics/Train.cs +40 -25
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +452 -660
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +76 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +236 -100
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +4 -5
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +0 -11
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +5 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +3 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +10 -15
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +6 -5
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +73 -16
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +12 -5
  Source/Orts.Simulation/Simulation/Simulator.cs +4 -4
  Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +3 -3
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +17 -5
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +4 -4
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +63 -3
  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
  Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
  Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +12 -12
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 85bde8ece8b80eb7c68a08c1e151af0b0ce49ebe
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
Merging #1081 Brake cuts power unification...
  Source/Documentation/Manual/physics.rst +7 -2
  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +7 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +3 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +14 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +3 -9
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +3 -3
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a8127a1a48b670d053696e3aee9bbff97684c989
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
Merging #1091 Automatic speed control...
  Source/Documentation/Manual/cruisecontrol.rst +79 -33
  Source/Orts.Common/AccelerationController.cs +105 -0
  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -2
  Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +30 -0
  Source/Orts.Simulation/Simulation/Confirmer.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +52 -290
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +9 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs +25 -17
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MultiPositionController.cs +6 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +654 -659
  Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs +1 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +32 -74
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 378be5577006f81d5019a5ffe03c7bdb81ca8a2d
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
Merging #1122 Wagon Size and Centering Controls...
  Source/Documentation/Manual/features-rollingstock.rst +94 -0
  Source/Orts.Formats.Msts/ShapeFile.cs +94 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +179 -8
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +7 -0
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 73c47b4cfe5aa601dadcd6f40d9b2f71b6e4644d
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #1124 Built-in PBL2 brake controller...
  Source/Documentation/Manual/features-rollingstock.rst +9 -2
  Source/Orts.Formats.Msts/CabViewFile.cs +2 -0
  Source/Orts.Simulation/Common/Commands.cs +22 -3
  Source/Orts.Simulation/Common/Scripting/BrakeController.cs +10 -0
  Source/Orts.Simulation/Simulation/Confirmer.cs +2 -0
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +10 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +26 -1
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/PBL2BrakeController.cs +465 -0
  Source/Orts.Simulation/Simulation/Simulator.cs +1 -0
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +3 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e241a0d1226220a09811b6882077c9eb77657a92
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Orts.Simulation/Common/Scripting/BrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1126 ShapeHierarchy Attachment for More Wagon Addons...
  Source/Documentation/Manual/cabs.rst +72 -17
  Source/Documentation/Manual/features-rollingstock.rst +244 -142
  Source/Documentation/Manual/physics.rst +17 -1
  Source/Documentation/Manual/sound.rst +133 -0
  Source/Orts.Formats.Msts/CabViewFile.cs +4 -0
  Source/Orts.Formats.Msts/LightCollection.cs +2 -0
  Source/Orts.Formats.Msts/SoundManagmentFile.cs +7 -2
  Source/Orts.Formats.OR/ContainerFile.cs +1 -1
  Source/Orts.Simulation/Simulation/Container.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +13 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +31 -20
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +70 -33
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +8 -2
  Source/RunActivity/Viewer3D/ALSoundHelper.cs +0 -6
  Source/RunActivity/Viewer3D/AnimatedPart.cs +2 -7
  Source/RunActivity/Viewer3D/Cameras.cs +98 -23
  Source/RunActivity/Viewer3D/Lights.cs +12 -33
  Source/RunActivity/Viewer3D/ParticleEmitter.cs +50 -7
  Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +0 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +90 -44
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +179 -130
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +39 -7
  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +3 -41
  Source/RunActivity/Viewer3D/Shapes.cs +61 -13
  Source/RunActivity/Viewer3D/Sound.cs +103 -15
  Source/RunActivity/Viewer3D/Viewer.cs +13 -8
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/physics.rst
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Sound.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 ca6909374 Merge commit 'e241a0d1226220a09811b6882077c9eb77657a92' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701 failed: 1
Merging #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume...
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +11 -0
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +17 -0
  Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +6 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2599bfe3df72fad45a3e8fd60c9486afc5905aac
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
Merging #1166 Simplify loading of internal and game textures...
  Source/Contrib/TrackViewer/Drawing/BasicShapes.cs +1 -1
  Source/Documentation/Manual/features-route.rst +1 -1
  Source/RunActivity/RunActivity.csproj +0 -3
  Source/RunActivity/Viewer3D/Lights.cs +1 -1
  Source/RunActivity/Viewer3D/MSTSSky.cs +4 -4
  Source/RunActivity/Viewer3D/Materials.cs +123 -180
  Source/RunActivity/Viewer3D/Popups/HelpWindow.cs +1 -1
  Source/RunActivity/Viewer3D/Popups/SwitchWindow.cs +1 -1
  Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs +2 -2
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +53 -53
  Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +48 -48
  Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs +1 -1
  Source/RunActivity/Viewer3D/Popups/TrainOperationsWindow.cs +1 -1
  Source/RunActivity/Viewer3D/Popups/WindowManager.cs +2 -2
  Source/RunActivity/Viewer3D/Precipitation.cs +3 -3
  Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +1 -1
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs +1 -1
  Source/RunActivity/Viewer3D/Shaders.cs +1 -1
  Source/RunActivity/Viewer3D/Signals.cs +1 -1
  Source/RunActivity/Viewer3D/Sky.cs +6 -6
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 51e7f7aaf38d57b2070079ecd35be706ce4ce8a2
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
  < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at ae50872d3 Merge commit '2599bfe3df72fad45a3e8fd60c9486afc5905aac' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 51e7f7aaf38d57b2070079ecd35be706ce4ce8a2 failed: 1
Merging #1169 Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock...
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +2 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +1 -1
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +85 -69
  Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +59 -39
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 906f204b33d8b22bda9d0cf07266fe818617383a
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
Merging #1185 Feat/adds timetable editor...
  Build.cmd +0 -5
  Source/Contrib/TimetableEditor/App.config +6 -0
  Source/Contrib/TimetableEditor/App.xaml +9 -0
  Source/Contrib/TimetableEditor/App.xaml.cs +17 -0
  Source/Contrib/TimetableEditor/BasicClass.cs +26 -0
  Source/Contrib/TimetableEditor/Build.cmd +0 -32
  Source/Contrib/TimetableEditor/Converters/Converters.cs +70 -0
  Source/Contrib/TimetableEditor/MainWindow.xaml +42 -0
  Source/Contrib/TimetableEditor/MainWindow.xaml.cs +401 -0
  Source/Contrib/TimetableEditor/Model/BasicPool.cs +97 -0
  Source/Contrib/TimetableEditor/Model/Consist.cs +64 -0
  Source/Contrib/TimetableEditor/Model/DataFile.cs +229 -0
  Source/Contrib/TimetableEditor/Model/DisposeCommand.cs +464 -0
  Source/Contrib/TimetableEditor/Model/DisposeParameter.cs +128 -0
  Source/Contrib/TimetableEditor/Model/PoolItem.cs +40 -0
  Source/Contrib/TimetableEditor/Model/Station.cs +74 -0
  Source/Contrib/TimetableEditor/Model/TimetableCommand.cs +311 -0
  Source/Contrib/TimetableEditor/Model/TimetableParameter.cs +126 -0
  Source/Contrib/TimetableEditor/MyICommand.cs +60 -0
  Source/Contrib/TimetableEditor/Properties/Resources.Designer.cs +63 -0
  Source/Contrib/TimetableEditor/Properties/Resources.resx +117 -0
  Source/Contrib/TimetableEditor/Properties/Settings.Designer.cs +26 -0
  Source/Contrib/TimetableEditor/Properties/Settings.settings +7 -0
  Source/Contrib/TimetableEditor/TimetableEditor.csproj +59 -0
  Source/Contrib/TimetableEditor/ViewModel/DisposeViewModel.cs +356 -0
  Source/Contrib/TimetableEditor/ViewModel/InputBox.xaml +31 -0
  Source/Contrib/TimetableEditor/ViewModel/InputBox.xaml.cs +48 -0
  Source/Contrib/TimetableEditor/ViewModel/MainViewModel.cs +238 -0
  Source/Contrib/TimetableEditor/ViewModel/OpenSaveViewModel.cs +115 -0
  Source/Contrib/TimetableEditor/ViewModel/PoolViewModel.cs +329 -0
  Source/Contrib/TimetableEditor/ViewModel/StationParamsViewModel.cs +163 -0
  Source/Contrib/TimetableEditor/ViewModel/TimetableViewModel.cs +1,145 -0
  Source/Contrib/TimetableEditor/ViewModel/TrainViewModel.cs +621 -0
  Source/Contrib/TimetableEditor/Views/DisposeView.xaml +120 -0
  Source/Contrib/TimetableEditor/Views/DisposeView.xaml.cs +27 -0
  Source/Contrib/TimetableEditor/Views/MainView.xaml +16 -0
  Source/Contrib/TimetableEditor/Views/MainView.xaml.cs +28 -0
  Source/Contrib/TimetableEditor/Views/OpenSaveView.xaml +33 -0
  Source/Contrib/TimetableEditor/Views/OpenSaveView.xaml.cs +33 -0
  Source/Contrib/TimetableEditor/Views/PoolView.xaml +59 -0
  Source/Contrib/TimetableEditor/Views/PoolView.xaml.cs +43 -0
  Source/Contrib/TimetableEditor/Views/StationParametersView.xaml +61 -0
  Source/Contrib/TimetableEditor/Views/StationParametersView.xaml.cs +32 -0
  Source/Contrib/TimetableEditor/Views/StationsView.xaml +55 -0
  Source/Contrib/TimetableEditor/Views/StationsView.xaml.cs +31 -0
  Source/Contrib/TimetableEditor/Views/Table.xaml +55 -0
  Source/Contrib/TimetableEditor/Views/Table.xaml.cs +40 -0
  Source/Contrib/TimetableEditor/Views/TrainView.xaml +248 -0
  Source/Contrib/TimetableEditor/Views/TrainView.xaml.cs +60 -0
  Source/Contrib/TimetableEditor/Views/waiting.xaml +12 -0
  Source/Contrib/TimetableEditor/Views/waiting.xaml.cs +27 -0
  Source/Contrib/TimetableEditor/about.lfm +0 -64
  Source/Contrib/TimetableEditor/about.lrt +0 -5
  Source/Contrib/TimetableEditor/about.pas +0 -53
  Source/Contrib/TimetableEditor/charencstreams.pas +0 -353
  Source/Contrib/TimetableEditor/dispose.lfm +0 -726
  Source/Contrib/TimetableEditor/dispose.lrt +0 -31
  Source/Contrib/TimetableEditor/dispose.pas +0 -471
  Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.de.po +0 -626
  Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.po +0 -617
  Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.ru.po +0 -626
  Source/Contrib/TimetableEditor/languages/lclstrconsts.de.po +0 -1,500
  Source/Contrib/TimetableEditor/languages/lclstrconsts.po +0 -1,479
  Source/Contrib/TimetableEditor/lclstrconsts.de.lrs.muell +0 -686
  Source/Contrib/TimetableEditor/packages.config +4 -0
  Source/Contrib/TimetableEditor/sidings.lfm +0 -953
  Source/Contrib/TimetableEditor/sidings.lrs +0 -937
  Source/Contrib/TimetableEditor/sidings.lrt +0 -18
  Source/Contrib/TimetableEditor/sidings.pas +0 -453
  Source/Contrib/TimetableEditor/stations.lfm +0 -389
  Source/Contrib/TimetableEditor/stations.lrt +0 -5
  Source/Contrib/TimetableEditor/stations.pas +0 -175
  Source/Contrib/TimetableEditor/timetabledata.pas +0 -772
  Source/Contrib/TimetableEditor/timetableedit.lpi +0 -117
  Source/Contrib/TimetableEditor/timetableedit.lpr +0 -26
  Source/Contrib/TimetableEditor/trains.lfm +0 -723
  Source/Contrib/TimetableEditor/trains.lrt +0 -28
  Source/Contrib/TimetableEditor/trains.pas +0 -688
  Source/Contrib/TimetableEditor/tteobjects.pas +0 -322
  Source/Contrib/TimetableEditor/unicodeinfo.pas +0 -1,185
  Source/Contrib/TimetableEditor/uniinfo_data.inc +0 -7,769
  Source/Contrib/TimetableEditor/uniinfo_data2.inc +0 -5,658
  Source/Contrib/TimetableEditor/unit1.lfm +0 -2,229
  Source/Contrib/TimetableEditor/unit1.lrt +0 -31
  Source/Contrib/TimetableEditor/unit1.pas +0 -876
  Source/Contrib/TimetableEditor/utf8proc_LICENSE +0 -64
  Source/Contrib/TimetableEditor/utf8scanner.pas +0 -287
  Source/Contrib/TimetableEditor/utf8tools.pas +0 -15
  Source/ORTS.sln +6 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1f050076aa81e8e2b566b13830decc8ca3be81b5
Merging #1187 Extra webpage with Activity Event messages added....
  Source/Documentation/Manual/software-platform.rst +3 -0
  Source/RunActivity/RunActivity.csproj +3 -0
  Source/RunActivity/Viewer3D/Popups/ActivityWindow.cs +62 -38
  Source/RunActivity/Viewer3D/Viewer.cs +2 -0
  Source/RunActivity/Viewer3D/WebServices/ActivityEventsWebpage.cs +209 -0
  Source/RunActivity/Viewer3D/WebServices/Web/ActivityEvents/index.css +28 -0
  Source/RunActivity/Viewer3D/WebServices/Web/ActivityEvents/index.html +31 -0
  Source/RunActivity/Viewer3D/WebServices/Web/ActivityEvents/index.js +146 -0
  Source/RunActivity/Viewer3D/WebServices/Web/index.html +1 -0
  Source/RunActivity/Viewer3D/WebServices/WebServer.cs +1 -0
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 893dceee289b52805c85a3a9d738619a2c7390f9
Merging #1189 Adds clarity for ORTSUserPreferenceRemoveForestTreesFromRoads...
  Source/Documentation/Manual/features-route.rst +2 -2
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9d83bb957ecd8fa111c13238451075715ff19fd5
Merging #1190 Fix Map Window position saved when minimized....
  Source/RunActivity/Viewer3D/Map/MapForm.cs +6 -3
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0e45a6bedf72e3b480b20e6276d1a0e1950624bf
Merging #1186 Hot Reloading of Simulator and Graphical Assets...
  Source/Documentation/Manual/options.rst +66 -0
  Source/Menu/Options.Designer.cs +32 -0
  Source/Menu/Options.cs +7 -0
  Source/Orts.Common/Input/UserCommand.cs +1 -0
  Source/Orts.Formats.Msts/CabViewFile.cs +19 -8
  Source/Orts.Formats.Msts/SoundManagmentFile.cs +69 -8
  Source/Orts.Parsers.Msts/STFReader.cs +11 -1
  Source/Orts.Settings/InputSettings.cs +1 -0
  Source/Orts.Settings/UserSettings.cs +2 -0
  Source/Orts.Simulation/Common/ORTSPaths.cs +1 -1
  Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +3 -3
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +63 -27
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +20 -2
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +121 -4
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +8 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/IController.cs +1 -0
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +3 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs +2 -2
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +17 -2
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +11 -3
  Source/Orts.Simulation/Simulation/Simulator.cs +194 -0
  Source/RunActivity/Viewer3D/ALSoundHelper.cs +14 -0
  Source/RunActivity/Viewer3D/DynamicTrack.cs +7 -3
  Source/RunActivity/Viewer3D/Forest.cs +17 -1
  Source/RunActivity/Viewer3D/Lights.cs +80 -24
  Source/RunActivity/Viewer3D/Materials.cs +196 -24
  Source/RunActivity/Viewer3D/ParticleEmitter.cs +34 -1
  Source/RunActivity/Viewer3D/Processes/SoundProcess.cs +201 -2
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +150 -24
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +102 -3
  Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +19 -0
  Source/RunActivity/Viewer3D/Shapes.cs +95 -4
  Source/RunActivity/Viewer3D/Signals.cs +16 -1
  Source/RunActivity/Viewer3D/Sound.cs +54 -33
  Source/RunActivity/Viewer3D/Terrain.cs +18 -3
  Source/RunActivity/Viewer3D/Trains.cs +9 -13
  Source/RunActivity/Viewer3D/Transfers.cs +17 -2
  Source/RunActivity/Viewer3D/Viewer.cs +281 -5
  Source/RunActivity/Viewer3D/Water.cs +16 -1
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 36118d5065645ecd9ef38d810555363888362402
  < Auto-merging Source/Documentation/Manual/options.rst
  < Auto-merging Source/Menu/Options.Designer.cs
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
  < Auto-merging Source/Orts.Settings/UserSettings.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.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/MSTSSteamLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/Sound.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 256afd4fc Merge commit '0e45a6bedf72e3b480b20e6276d1a0e1950624bf' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 36118d5065645ecd9ef38d810555363888362402 failed: 1
Merging #1127 Advanced Shape Descriptor Controls...
  Source/Documentation/Manual/features-rollingstock.rst +326 -3
  Source/Documentation/Manual/options.rst +2 -0
  Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +109 -3
  Source/Orts.Formats.OR/ContainerFile.cs +8 -2
  Source/Orts.Simulation/Simulation/Container.cs +6 -1
  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +2 -1
  Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +2 -1
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +18 -15
  Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +113 -15
  Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +29 -2
  Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +2 -0
  Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -1
  Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +53 -32
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/ContainerViewer.cs +2 -2
  Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +1 -1
  Source/RunActivity/Viewer3D/Shapes.cs +353 -33
  > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ec158ce32f2992633ab40d1340337b198104c611
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/options.rst
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 256afd4fc Merge commit '0e45a6bedf72e3b480b20e6276d1a0e1950624bf' into HEAD
  > git --no-pager clean --force -d -x
  Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ec158ce32f2992633ab40d1340337b198104c611 failed: 1
Pull requests successfully auto-merged (12):
  #1194 Rack railway#2
  #1057 Switchable brake system
  #1081 Brake cuts power unification
  #1091 Automatic speed control
  #1122 Wagon Size and Centering Controls
  #1124 Built-in PBL2 brake controller
  #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
  #1169 Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock
  #1185 Feat/adds timetable editor
  #1187 Extra webpage with Activity Event messages added.
  #1189 Adds clarity for ORTSUserPreferenceRemoveForestTreesFromRoads
  #1190 Fix Map Window position saved when minimized.
Pull requests not auto-merged (4):
  #1126 ShapeHierarchy Attachment for More Wagon Addons
  #1166 Simplify loading of internal and game textures
  #1186 Hot Reloading of Simulator and Graphical Assets
  #1127 Advanced Shape Descriptor Controls
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2026-01-14 22:07:27Z