Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Knossos.NET/Models/Nebula.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public struct NebulaModTagJson
//https://dl.fsnebula.org/storage/repo.json
//https://fsnebula.org/storage/repo.json"

public static string[] nebulaMirrors = { "cf.fsnebula.org", "dl.fsnebula.org", "fsnebula.org", "talos.feralhosting.com", "fsnebula.global.ssl.fastly.net" }; //lowercase, last one is the image host
public static string[] nebulaMirrors = { "cf.fsnebula.org", "dl.fsnebula.org", "fsnebula.org", "hestia.feralhosting.com", "fsnebula.global.ssl.fastly.net" }; //lowercase, last one is the image host
private static readonly string repoUrl = @"https://fsnebula.org/storage/repo_minimal.json";
private static readonly string apiURL = @"https://api.fsnebula.org/api/1/";
private static readonly string nebulaURL = @"https://fsnebula.org/";
Expand Down
20 changes: 10 additions & 10 deletions Knossos.NET/ViewModels/GlobalSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ internal bool BlDlNebula
set { if (blDlNebula != value) { this.SetProperty(ref blDlNebula, value); UnCommitedChanges = true; } }
}

private bool blTalos = false;
internal bool BlTalos
private bool blHestia = false;
internal bool BlHestia
{
get { return blTalos; }
set { if (blTalos != value) { this.SetProperty(ref blTalos, value); UnCommitedChanges = true; } }
get { return blHestia; }
set { if (blHestia != value) { this.SetProperty(ref blHestia, value); UnCommitedChanges = true; } }
}

private bool enableLogFile = true;
Expand Down Expand Up @@ -638,7 +638,7 @@ public void LoadData()

BlDlNebula = false;
BlCfNebula = false;
BlTalos = false;
BlHestia = false;
if (Knossos.globalSettings.mirrorBlacklist != null)
{
if (Knossos.globalSettings.mirrorBlacklist.Contains("dl.fsnebula.org"))
Expand All @@ -649,9 +649,9 @@ public void LoadData()
{
BlCfNebula = true;
}
if (Knossos.globalSettings.mirrorBlacklist.Contains("talos.feralhosting.com"))
if (Knossos.globalSettings.mirrorBlacklist.Contains("hestia.feralhosting.com"))
{
BlTalos = true;
BlHestia = true;
}
}

Expand Down Expand Up @@ -1218,9 +1218,9 @@ internal void SaveCommand()
{
blMirrors.Add("cf.fsnebula.org");
}
if (BlTalos)
if (BlHestia)
{
blMirrors.Add("talos.feralhosting.com");
blMirrors.Add("hestia.feralhosting.com");
}
if (blMirrors.Any() && blMirrors.Count() != 3 /*Invalid!*/)
{
Expand All @@ -1231,7 +1231,7 @@ internal void SaveCommand()
Knossos.globalSettings.mirrorBlacklist = null;
BlDlNebula = false;
BlCfNebula = false;
BlTalos = false;
BlHestia = false;
}

Knossos.globalSettings.modCompression = ModCompression;
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/GlobalSettingsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<WrapPanel Grid.Column="1" Margin="8,0,0,0">
<CheckBox Margin="0,0,0,0" IsChecked="{Binding !BlDlNebula}">dl.fsnebula.org</CheckBox>
<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlCfNebula}">cf.fsnebula.org</CheckBox>
<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlTalos}">talos.feralhosting.com</CheckBox>
<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlHestia}">hestia.feralhosting.com</CheckBox>
</WrapPanel>
</Grid>
<!-- Log File -->
Expand Down