Skip to content

Commit aaee0ac

Browse files
committed
Automatic merge of T1.5.1-870-ge0bf062eb and 18 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at e6baa97: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at 659396e: New Triple Valve Features Vol. 2 - Pull request #914 at f29be1e: Adjustments to Duplex steam - Pull request #915 at 6d911d7: Correct calculation error with curve friction - Pull request #916 at 11ac52c: Distributed Power Air Brake Synchronization - Pull request #917 at fde18cf: Lighting Configuration Enhancements - Pull request #918 at f7ba507: Manual - News topics updated since 1.5.1
20 parents 0a9108c + e0bf062 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + e6baa97 + 9b0b04f + 6834af0 + 659396e + f29be1e + 6d911d7 + 11ac52c + fde18cf + f7ba507 commit aaee0ac

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

Source/Menu/DownloadContentForm.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ private bool infoChangedAndAddedFileForGitHubDownloadType(ContentRouteSettings.R
732732
}
733733
else
734734
{
735-
outputFile.WriteLine(Catalog.GetString("- No updates found") + "<br></p>");
735+
outputFile.WriteLine("- " + Catalog.GetString("No updates found") + "<br></p>");
736736
}
737737

738738
return changedFound && remoteUpdateFound;
@@ -980,10 +980,17 @@ private void updateButton_Click(object sender, EventArgs e)
980980
return;
981981
}
982982
}
983-
983+
if (doThePull(route))
984+
{
985+
message = Catalog.GetString("Updates installed");
986+
MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Information);
987+
}
988+
}
989+
else
990+
{
991+
message = Catalog.GetString("No updates found");
992+
MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Information);
984993
}
985-
986-
doThePull(route);
987994
}
988995

989996
private bool doThePull(ContentRouteSettings.Route route) {
@@ -997,7 +1004,7 @@ private bool doThePull(ContentRouteSettings.Route route) {
9971004

9981005
// User information to create a merge commit
9991006
var signature = new LibGit2Sharp.Signature(
1000-
new Identity(route.AuthorName, route.AuthorUrl), DateTimeOffset.Now);
1007+
new Identity("Open Rails", "www.openrails.org"), DateTimeOffset.Now);
10011008

10021009
// Pull
10031010
Commands.Pull(repo, signature, options);

0 commit comments

Comments
 (0)