Merge branch 'master' into Patron

This commit is contained in:
Brant Martin
2019-08-27 16:34:46 -04:00
25 changed files with 126 additions and 784 deletions

View File

@@ -104,7 +104,7 @@ namespace Torch.API
/// <summary>
/// Restart the Torch instance, blocking until the restart has been performed.
/// </summary>
void Restart();
void Restart(bool save = true);
/// <summary>
/// Initializes a save of the game.

View File

@@ -30,9 +30,6 @@ namespace Torch.API.WebAPI
public async Task<Job> GetLatestVersion(string branch)
{
#if DEBUG
branch = "master";
#endif
var h = await _client.GetAsync(string.Format(BRANCH_QUERY, branch));
if (!h.IsSuccessStatusCode)
{