Skip to content

Commit 673623f

Browse files
committed
Automatic merge of T1.5.1-1887-g07be04456 and 10 pull requests
- Pull request #1072 at 52d5886: Content Creation Shortcuts & Advanced Wagon Shape Interactions - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1094 at b9b4843: Blended Braking Compatibility and Effectiveness Improvements - Pull request #1096 at 7a4f055: When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. - Pull request #1097 at 24ff66b: Fix For Delayed Particle Emitter Spawning - Pull request #1098 at 6bbd2c6: Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics - Pull request #1099 at 5e8b056: Fix TCS orders not being sent to pantographs - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
12 parents 24c7c2a + 07be044 + 52d5886 + 37e2817 + e10390b + b9b4843 + 7a4f055 + 24ff66b + 6bbd2c6 + 5e8b056 + 5845a1a + 689494b commit 673623f

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

Source/Contrib/TimetableEditor/about.lfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object Form2: TForm2
3838
Width = 97
3939
Alignment = taCenter
4040
AutoSize = True
41-
Caption = 'Version: 1.5.1'
41+
Caption = 'Version: 1.6'
4242
Font.CharSet = ANSI_CHARSET
4343
Font.Height = -16
4444
Font.Name = 'Arial'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TFORM2.CAPTION=about
22
TFORM2.BUTTON1.CAPTION=close
33
TFORM2.LABEL1.CAPTION=Timetable Editor
4-
TFORM2.STATICTEXT1.CAPTION=Version: 1.5.1
4+
TFORM2.STATICTEXT1.CAPTION=Version: 1.6
55
TFORM2.LABEL2.CAPTION=Open Rails

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ msgid "Open Rails"
197197
msgstr ""
198198

199199
#: tform2.statictext1.caption
200-
msgid "Version: 1.5"
200+
msgid "Version: 1.6"
201201
msgstr ""
202202

203203
#: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ msgid "Open Rails"
187187
msgstr ""
188188

189189
#: tform2.statictext1.caption
190-
msgid "Version: 1.5"
190+
msgid "Version: 1.6"
191191
msgstr ""
192192

193193
#: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.ru.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ msgid "Open Rails"
197197
msgstr "Open Rails"
198198

199199
#: tform2.statictext1.caption
200-
msgid "Version: 1.5"
201-
msgstr "Версия: 1.5"
200+
msgid "Version: 1.6"
201+
msgstr "Версия: 1.6"
202202

203203
#: tform3.bitbtn2.caption
204204
msgctxt "TFORM3.BITBTN2.CAPTION"

Source/Installer/Version.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define MyAppVersion "1.5"
1+
#define MyAppVersion "none"

Source/Menu/Updater.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[StableSettings]
2-
URL=string:http%3A%2F%2Fopenrails.org%2Fapi%2Fupdate%2Fstable%2F1.5.html
3-
ChangeLogLink=string:http%3A%2F%2Fopenrails.org%2Fdiscover%2Fversion-1-5%2F%3Futm_campaign%3Dchangelog%26utm_source%3Dopenrails.menu%26utm_medium%3Dapp
2+
URL=string:http%3A%2F%2Fopenrails.org%2Fapi%2Fupdate%2Fstable%2F1.6.html
3+
ChangeLogLink=string:http%3A%2F%2Fopenrails.org%2Fdiscover%2Fversion-1-6%2F%3Futm_campaign%3Dchangelog%26utm_source%3Dopenrails.menu%26utm_medium%3Dapp
44
[TestingSettings]
55
URL=string:http%3A%2F%2Fopenrails.org%2Fapi%2Fupdate%2Ftesting%2Fupdate.html
66
ChangeLogLink=string:http%3A%2F%2Fopenrails.org%2Fdownload%2Fchanges%2F%3Futm_campaign%3Dchangelog%26utm_source%3Dopenrails.menu%26utm_medium%3Dapp

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ public void Initialize()
432432
{
433433
if (Locomotive.Pantographs.State == PantographState.Up)
434434
{
435-
Locomotive.LocomotivePowerSupply.HandleEvent(PowerSupplyEvent.LowerPantograph);
435+
Locomotive.LocomotivePowerSupply.HandleEventFromTcs(PowerSupplyEvent.LowerPantograph);
436436
}
437437
};
438438
Script.SetPantographUp = (pantoID) =>
@@ -442,7 +442,7 @@ public void Initialize()
442442
Trace.TraceError($"TCS script used bad pantograph ID {pantoID}");
443443
return;
444444
}
445-
Locomotive.LocomotivePowerSupply.HandleEvent(PowerSupplyEvent.RaisePantograph, pantoID);
445+
Locomotive.LocomotivePowerSupply.HandleEventFromTcs(PowerSupplyEvent.RaisePantograph, pantoID);
446446
};
447447
Script.SetPantographDown = (pantoID) =>
448448
{
@@ -451,7 +451,7 @@ public void Initialize()
451451
Trace.TraceError($"TCS script used bad pantograph ID {pantoID}");
452452
return;
453453
}
454-
Locomotive.LocomotivePowerSupply.HandleEvent(PowerSupplyEvent.LowerPantograph, pantoID);
454+
Locomotive.LocomotivePowerSupply.HandleEventFromTcs(PowerSupplyEvent.LowerPantograph, pantoID);
455455
};
456456
Script.SetPowerAuthorization = (value) => PowerAuthorization = value;
457457
Script.SetCircuitBreakerClosingOrder = (value) => CircuitBreakerClosingOrder = value;

0 commit comments

Comments
 (0)