Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Triky313 committed Apr 24, 2024
2 parents 3015494 + 1261736 commit d2e5cf7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class SettingsObject
public string AlbionDataProjectBaseUrlEurope { get; set; } = "https://europe.albion-online-data.com/api/v2/";
public string AlbionOnlineApiBaseUrlWest { get; set; } = "https://gameinfo.albiononline.com";
public string AlbionOnlineApiBaseUrlEast { get; set; } = "https://gameinfo-sgp.albiononline.com";
public string AlbionOnlineApiBaseUrlEurope { get; set; } = ""; // TODO: URL still unknown
public string AlbionOnlineApiBaseUrlEurope { get; set; } = "https://gameinfo-ams.albiononline.com";
public double MainWindowHeight { get; set; } = 100;
public double MainWindowWidth { get; set; } = 100;
public double MainWindowLeftPosition { get; set; } = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.3.0.*")]
[assembly: AssemblyFileVersion("7.3.0.0")]
[assembly: AssemblyVersion("7.3.1.*")]
[assembly: AssemblyFileVersion("7.3.1.0")]

0 comments on commit d2e5cf7

Please sign in to comment.