From 088d558aadd62484f39a2a6b579c361e0de8920a Mon Sep 17 00:00:00 2001 From: iAmAsval Date: Sat, 6 Jun 2020 22:00:35 +0200 Subject: [PATCH] FModel x Ramirez --- FModel/Utils/Endpoints.cs | 6 +++--- FModel/Utils/Localizations.cs | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/FModel/Utils/Endpoints.cs b/FModel/Utils/Endpoints.cs index 6a58e201..1605016c 100644 --- a/FModel/Utils/Endpoints.cs +++ b/FModel/Utils/Endpoints.cs @@ -10,14 +10,14 @@ namespace FModel.Utils { public const string BENBOT_AES = "https://benbotfn.tk/api/v1/aes"; public const string BENBOT_HOTFIXES = "https://benbotfn.tk/api/v1/hotfixes"; - public const string FMODEL_JSON = "https://cdn.asval.tk/d/FModel/NotFModel.json"; + public const string FMODEL_JSON = "https://dl.dropbox.com/s/sxyaqo6zu1drlea/FModel.json?dl=0"; public static async Task GetStringEndpoint(string url) => await GetStringEndpoint(url, string.Empty); public static async Task GetStringEndpoint(string url, string token) { DebugHelper.WriteLine("{0} {1} {2} {3}", "[FModel]", "[Endpoints]", "[GET]", url); - using (HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(3) }) + using (HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(2) }) using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url))) { if (!string.IsNullOrEmpty(token)) @@ -51,7 +51,7 @@ namespace FModel.Utils url += $"?version={Uri.EscapeDataString(query)}"; DebugHelper.WriteLine("{0} {1} {2} {3}", "[FModel]", "[Endpoints]", "[GET]", url); - using (HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(3) }) + using (HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(2) }) using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url))) { try diff --git a/FModel/Utils/Localizations.cs b/FModel/Utils/Localizations.cs index aa76c85d..53d0676c 100644 --- a/FModel/Utils/Localizations.cs +++ b/FModel/Utils/Localizations.cs @@ -101,10 +101,6 @@ namespace FModel.Utils return dRet; } - // i guess this save times - if ((ELanguage)Properties.Settings.Default.AssetsLanguage == ELanguage.English) - return defaultText; - if (_fortniteLocalizationDict.Count > 0 && _fortniteLocalizationDict.TryGetValue(sNamespace, out var dict) && dict.TryGetValue(sKey, out var ret))