diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin index fde47f19..8e7ee763 100644 Binary files a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin differ diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin index 9c2379cf..05535626 100644 Binary files a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin differ diff --git a/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 b/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 index 3e453a43..2c3c985a 100644 Binary files a/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 and b/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04b08824-4840-4f47-985c-deed386293bc.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04b08824-4840-4f47-985c-deed386293bc.vsidx deleted file mode 100644 index 303f1346..00000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04b08824-4840-4f47-985c-deed386293bc.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/216e694a-f2d5-41c2-a0ad-3713fdc5b565.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/216e694a-f2d5-41c2-a0ad-3713fdc5b565.vsidx new file mode 100644 index 00000000..f7b3a172 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/216e694a-f2d5-41c2-a0ad-3713fdc5b565.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/34443959-0c99-4705-a589-bcf6964455e2.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/34443959-0c99-4705-a589-bcf6964455e2.vsidx deleted file mode 100644 index 0c5cc5d0..00000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/34443959-0c99-4705-a589-bcf6964455e2.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/61d93943-74b7-4c98-9cf7-8650f6d58f77.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/61d93943-74b7-4c98-9cf7-8650f6d58f77.vsidx deleted file mode 100644 index 5c5f20cb..00000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/61d93943-74b7-4c98-9cf7-8650f6d58f77.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7636cfd3-8e9f-4f0c-a2d4-c9d5c0908502.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7636cfd3-8e9f-4f0c-a2d4-c9d5c0908502.vsidx new file mode 100644 index 00000000..3865b1e7 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7636cfd3-8e9f-4f0c-a2d4-c9d5c0908502.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/afd79c25-9a88-4bce-96a8-96624bde8473.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/afd79c25-9a88-4bce-96a8-96624bde8473.vsidx deleted file mode 100644 index 6a2d519a..00000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/afd79c25-9a88-4bce-96a8-96624bde8473.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/c8fee1f8-2c00-44eb-bf74-3a73b168e77d.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/c8fee1f8-2c00-44eb-bf74-3a73b168e77d.vsidx deleted file mode 100644 index 7e17f03d..00000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/c8fee1f8-2c00-44eb-bf74-3a73b168e77d.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d584e337-271c-4f0b-86b3-50ad0ec53c9d.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d584e337-271c-4f0b-86b3-50ad0ec53c9d.vsidx new file mode 100644 index 00000000..1a96eba2 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d584e337-271c-4f0b-86b3-50ad0ec53c9d.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/dc5e13bb-7a95-4bd1-b35f-d744f01af283.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/dc5e13bb-7a95-4bd1-b35f-d744f01af283.vsidx new file mode 100644 index 00000000..b77dca85 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/dc5e13bb-7a95-4bd1-b35f-d744f01af283.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/df859033-3ffa-444d-9c08-de2d27c12ad2.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/df859033-3ffa-444d-9c08-de2d27c12ad2.vsidx new file mode 100644 index 00000000..86fb060f Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/df859033-3ffa-444d-9c08-de2d27c12ad2.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 index 9e304375..c848d4fd 100644 Binary files a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 and b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 differ diff --git a/VTOL_2.0.0/Pages/Page_Home.xaml.cs b/VTOL_2.0.0/Pages/Page_Home.xaml.cs index 99c00015..13b5898c 100644 --- a/VTOL_2.0.0/Pages/Page_Home.xaml.cs +++ b/VTOL_2.0.0/Pages/Page_Home.xaml.cs @@ -1414,18 +1414,9 @@ public string Read_From_TextFile_OneLine(string Filepath) } catch (FileNotFoundException ex) - { - var st = new System.Diagnostics.StackTrace(ex, true); - var frame = st.GetFrame(0); - var line = frame.GetFileLineNumber(); - var method = frame.GetMethod().Name; - var className = frame.GetMethod().DeclaringType.Name; - var variables = ""; // You would need to add logic to capture variable values + { + Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}{ex.InnerException}{Environment.NewLine}"); - Log.Fatal(ex, $"An error occurred at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}" + - $" Line Number: {line}, Method Name: {method}, Class Name: {className}, Variables: {variables}" + - $"{Environment.NewLine}{ex.InnerException}{Environment.NewLine}");//Send_Error_Notif(GetTextResource("NOTIF_ERROR_CANNOT_FIND") + Filepath); - //Write_To_Log(ErrorManager(e)); } diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs index 6469bb64..03862a44 100644 --- a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs +++ b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs @@ -2322,11 +2322,17 @@ protected virtual void Delete_Action(object sender, RoutedEventArgs e) // Read the JSON file string jsonContent = File.ReadAllText(Json_Path); - if (jsonContent.IsNullOrEmpty() != true && jsonContent.Length > 5) + + if (jsonContent.IsNullOrEmpty() == true || jsonContent.Length > 2 || jsonContent == "null") {// Parse the JSON content - JObject jsonObject = JObject.Parse(jsonContent); + jsonContent = "{\t\t\n\n}"; + //File.WriteAllText(Json_Path, "{\t\t\n\n}"); + + } + + JObject jsonObject = JObject.Parse(jsonContent); string Name = workingmod; if (jsonObject.TryGetValue(Name, out _)) { @@ -2341,15 +2347,12 @@ protected virtual void Delete_Action(object sender, RoutedEventArgs e) // Write back to the file File.WriteAllText(Json_Path, updatedJson); - } - else - { - File.WriteAllText(Json_Path, "{\t\t\n\n}"); + } - } + string delete_mod_path = Dialog.Tag.ToString(); if (Directory.Exists(temp_Dir)) diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs index c25d46b9..620eaa02 100644 --- a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs +++ b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs @@ -1,5 +1,6 @@ using Downloader; using FuzzyString; +using Lsj.Util.Text; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Serilog; @@ -3747,6 +3748,14 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio // Read the JSON file string jsonContent = File.ReadAllText(Json_Path); + if (jsonContent.IsNullOrEmpty() == true || jsonContent.Length > 2 || jsonContent == "null") + {// Parse the JSON content + + + jsonContent = "{\t\t\n\n}"; + //File.WriteAllText(Json_Path, "{\t\t\n\n}"); + + } // Parse the JSON content JObject jsonObject = JObject.Parse(jsonContent); @@ -3789,7 +3798,6 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio else { - Console.WriteLine("Candidate Detected ------\n\n\n\n\n"); DispatchIfNecessary(async () => { diff --git a/VTOL_2.0.0/Tools-Silhouette-Transparent.png b/VTOL_2.0.0/Tools-Silhouette-Transparent.png deleted file mode 100644 index 3a902bc6..00000000 Binary files a/VTOL_2.0.0/Tools-Silhouette-Transparent.png and /dev/null differ diff --git a/VTOL_2.0.0/UpgradeLog.htm b/VTOL_2.0.0/UpgradeLog.htm deleted file mode 100644 index fb728a21..00000000 --- a/VTOL_2.0.0/UpgradeLog.htm +++ /dev/null @@ -1,274 +0,0 @@ - - - - Migration Report -

- Migration Report -

Overview

ProjectPathErrorsWarningsMessages
VTOL_Installer..\VTOL_Installer_2.0.0\VTOL_Installer.aiproj100
VTOLVTOL.csproj000
SolutionVTOL.sln001

Solution and projects

VTOL_Installer

Message
..\VTOL_Installer_2.0.0\VTOL_Installer.aiproj: - The application which this project type is based on was not found. Please try this link for further information: 840c416c-b8f3-42bc-b0dd-f6bb14c9f8cb

VTOL

Message
VTOL logged no messages. -

Solution

Message
- Show 1 additional messages -
VTOL.sln: - The solution file does not require migration.
- Hide 1 additional messages -
\ No newline at end of file diff --git a/VTOL_2.0.0/UpgradeLog2.htm b/VTOL_2.0.0/UpgradeLog2.htm deleted file mode 100644 index d8deea92..00000000 Binary files a/VTOL_2.0.0/UpgradeLog2.htm and /dev/null differ diff --git a/VTOL_2.0.0/UpgradeLog3.htm b/VTOL_2.0.0/UpgradeLog3.htm deleted file mode 100644 index d8deea92..00000000 Binary files a/VTOL_2.0.0/UpgradeLog3.htm and /dev/null differ diff --git a/VTOL_2.0.0/UpgradeLog4.htm b/VTOL_2.0.0/UpgradeLog4.htm deleted file mode 100644 index d8deea92..00000000 Binary files a/VTOL_2.0.0/UpgradeLog4.htm and /dev/null differ diff --git a/VTOL_2.0.0/UpgradeLog5.htm b/VTOL_2.0.0/UpgradeLog5.htm deleted file mode 100644 index d8deea92..00000000 Binary files a/VTOL_2.0.0/UpgradeLog5.htm and /dev/null differ diff --git a/VTOL_2.0.0/UpgradeLog6.htm b/VTOL_2.0.0/UpgradeLog6.htm deleted file mode 100644 index d8deea92..00000000 Binary files a/VTOL_2.0.0/UpgradeLog6.htm and /dev/null differ diff --git a/VTOL_2.0.0/alternator.jpg b/VTOL_2.0.0/alternator.jpg deleted file mode 100644 index 951d6a32..00000000 Binary files a/VTOL_2.0.0/alternator.jpg and /dev/null differ diff --git a/VTOL_2.0.0/server-icon-download-icons-17.png b/VTOL_2.0.0/server-icon-download-icons-17.png deleted file mode 100644 index e0737534..00000000 Binary files a/VTOL_2.0.0/server-icon-download-icons-17.png and /dev/null differ