Commit e395620
committed
Automatic merge of T1.6-89-ga2a9bbcc8 and 12 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at e813c42: Automatic speed control
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1126 at 95e884f: ShapeHierarchy Attachment for More Wagon Addons
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1161 at 6cfe4e2: Fix string trim in .ini files
- Pull request #1082 at 5845a1a: Allow variable water level in glass gaugeFile tree
2 files changed
+3
-3
lines changed- Source/Orts.Simulation
- Common/Scripting/PowerSupply
- Simulation/RollingStocks/SubSystems
2 files changed
+3
-3
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
639 | 639 | | |
640 | 640 | | |
641 | 641 | | |
642 | | - | |
| 642 | + | |
643 | 643 | | |
644 | 644 | | |
645 | 645 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
924 | 924 | | |
925 | 925 | | |
926 | 926 | | |
927 | | - | |
| 927 | + | |
928 | 928 | | |
929 | 929 | | |
930 | 930 | | |
| |||
936 | 936 | | |
937 | 937 | | |
938 | 938 | | |
939 | | - | |
| 939 | + | |
940 | 940 | | |
941 | 941 | | |
942 | 942 | | |
| |||
0 commit comments