v2.02 Midship - fix mod downloading by changing repository location t…

…o icebox.mx.mt
Clef-0 · Jan 12, 2024 · f0eb64b · f0eb64b
1 parent 058e6d1
commit f0eb64b
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 26 deletions.
diff --git a/.vs/FMM2/FileContentIndex/4b38bdc1-08b8-441e-bd06-888cf80339e7.vsidx b/.vs/FMM2/FileContentIndex/4b38bdc1-08b8-441e-bd06-888cf80339e7.vsidx
diff --git a/.vs/FMM2/v17/.suo b/.vs/FMM2/v17/.suo
diff --git a/FMM2/About.xaml b/FMM2/About.xaml
@@ -16,7 +16,7 @@
         <ScrollViewer Margin="102,0,10,0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" VerticalAlignment="Center" VerticalContentAlignment="Center" MaxHeight="95">
             <Grid>
                 <Label Content="Foundation Mod Manager" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" FontWeight="Bold"/>
-                <Label Content="v2.00 Kandinsky" HorizontalAlignment="Left" Margin="0,15,0,0" VerticalAlignment="Top"/>
+                <Label Content="v2.02 Midship" HorizontalAlignment="Left" Margin="0,15,0,0" VerticalAlignment="Top"/>
                 <Label Content="Developed by Clef" HorizontalAlignment="Left" Margin="0,30,0,0" VerticalAlignment="Top"/>
                 <Label Content="Special thanks to jabukufo, dany5639 and shad0wshayd3" HorizontalAlignment="Left" Margin="0,45,0,0" VerticalAlignment="Top"/>
             </Grid>

diff --git a/FMM2/LoadFMMLanguage.cs b/FMM2/LoadFMMLanguage.cs
@@ -24,14 +24,14 @@ private void loadFMMLang()
             }
 
 
-            if (string.IsNullOrEmpty(readFMMLang("Title")))
-            {
-                writeFMMLang("Title", this.Title);
-            }
-            else
-            {
-                this.Title = readFMMLang("Title");
-            }
+            //if (string.IsNullOrEmpty(readFMMLang("Title")))
+            //{
+            //    writeFMMLang("Title", this.Title);
+            //}
+            //else
+            //{
+            //    this.Title = readFMMLang("Title");
+            //}
 
             if (string.IsNullOrEmpty(readFMMLang("Tab_MyMods")))
             {

diff --git a/FMM2/MainWindow.xaml b/FMM2/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FMM2"
         mc:Ignorable="d"
-        Title="Foundation Mod Manager v2.01 Longest" Height="670" Width="800" Loaded="Window_Loaded" DataContext="{Binding RelativeSource={RelativeSource Self}}" Closing="Window_Closing">
+        Title="Foundation Mod Manager v2.02 Midship" Height="670" Width="800" Loaded="Window_Loaded" DataContext="{Binding RelativeSource={RelativeSource Self}}" Closing="Window_Closing">
     <Window.Background>
         <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}"/>
     </Window.Background>

diff --git a/FMM2/MainWindow.xaml.cs b/FMM2/MainWindow.xaml.cs
@@ -547,8 +547,7 @@ public partial class MainWindow : Window
         BackgroundWorker workerBackupCreate = new BackgroundWorker();
         BackgroundWorker workerBackupRestore = new BackgroundWorker();
 
-        const string repository = "https://github.com/Clef-0/FMM-Mods/trunk/";
-        const string filerepository = "https://github.com/Clef-0/FMM-Files/trunk/";
+        const string repository = "svn://icebox.mx.mt/FMM-Mods/master/";
 
         public static string ReturnCleanASCII(string s)
         {

diff --git a/FMM2/Properties/AssemblyInfo.cs b/FMM2/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Foundation Mod Manager")]
-[assembly: AssemblyCopyright("Copyright © Clef 2023")]
+[assembly: AssemblyCopyright("Copyright © Clef 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
diff --git a/FMM2/Worker_PopulateDLMods.cs b/FMM2/Worker_PopulateDLMods.cs
@@ -41,7 +41,7 @@ private void populateDLModsList(object sender, DoWorkEventArgs e)
             {
                 try
                 {
-                    client.DownloadFile("https://raw.githubusercontent.com/Clef-0/FMM-Mods/master/meta/links.txt", Path.Combine(Directory.GetCurrentDirectory(), "fmm", "temp", "links.txt"));
+                    client.DownloadFile("https://raw.githubusercontent.com/Clef-0/FMM-Mods/master/meta/links2.txt", Path.Combine(Directory.GetCurrentDirectory(), "fmm", "temp", "links.txt"));
                 }
                 catch
                 {

diff --git a/FMM2/bin/x86/Release/FMM.exe.config b/FMM2/bin/x86/Release/FMM.exe.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+  </startup>
+</configuration>
diff --git a/FMM2/bin/x86/Release/FMM.pdb b/FMM2/bin/x86/Release/FMM.pdb
diff --git a/FMM2/obj/x86/Release/About.baml b/FMM2/obj/x86/Release/About.baml
diff --git a/FMM2/obj/x86/Release/About.g.cs b/FMM2/obj/x86/Release/About.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A5A780F20E9BCFA081DDB8B659430E4E822E65A64B3515BC6CCF5BC8A2586D7"
+#pragma checksum "..\..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F505931D2DEF650C2874B2B0F7A0123D4BEB3B0208A2657F0C0C3F48151862AB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

diff --git a/FMM2/obj/x86/Release/About.g.i.cs b/FMM2/obj/x86/Release/About.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A5A780F20E9BCFA081DDB8B659430E4E822E65A64B3515BC6CCF5BC8A2586D7"
+#pragma checksum "..\..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F505931D2DEF650C2874B2B0F7A0123D4BEB3B0208A2657F0C0C3F48151862AB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

diff --git a/FMM2/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache b/FMM2/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/FMM2/obj/x86/Release/FMM.exe b/FMM2/obj/x86/Release/FMM.exe
diff --git a/FMM2/obj/x86/Release/FMM.g.resources b/FMM2/obj/x86/Release/FMM.g.resources
diff --git a/FMM2/obj/x86/Release/FMM.pdb b/FMM2/obj/x86/Release/FMM.pdb
diff --git a/FMM2/obj/x86/Release/FMM2.csproj.AssemblyReference.cache b/FMM2/obj/x86/Release/FMM2.csproj.AssemblyReference.cache
diff --git a/FMM2/obj/x86/Release/FMM2.csproj.CoreCompileInputs.cache b/FMM2/obj/x86/Release/FMM2.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9d42da87f7d126490276727e01e56e7d77fe710d
+14a1c2d364e72d1b1ba5fe97217d18620ef85c2e26a082ada40b9f719f69ec61
diff --git a/FMM2/obj/x86/Release/FMM2.csproj.FileListAbsolute.txt b/FMM2/obj/x86/Release/FMM2.csproj.FileListAbsolute.txt
@@ -34,3 +34,21 @@ C:\Users\madr\Documents\GitHub\FMM2\FMM2\obj\x86\Release\FMM2.csproj.GenerateRes
 C:\Users\madr\Documents\GitHub\FMM2\FMM2\obj\x86\Release\FMM2.csproj.CoreCompileInputs.cache
 C:\Users\madr\Documents\GitHub\FMM2\FMM2\obj\x86\Release\FMM.exe
 C:\Users\madr\Documents\GitHub\FMM2\FMM2\obj\x86\Release\FMM.pdb
+C:\Users\madr\Downloads\FMM2-master\FMM2\bin\x86\Release\FMM.exe.config
+C:\Users\madr\Downloads\FMM2-master\FMM2\bin\x86\Release\FMM.exe
+C:\Users\madr\Downloads\FMM2-master\FMM2\bin\x86\Release\FMM.pdb
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM2.csproj.AssemblyReference.cache
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\About.g.cs
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\MainWindow.g.cs
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\App.g.cs
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM_MarkupCompile.cache
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM_MarkupCompile.lref
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\About.baml
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\MainWindow.baml
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM.g.resources
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM2.Properties.Resources.resources
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM2.csproj.GenerateResource.cache
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM2.csproj.CoreCompileInputs.cache
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM.exe
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\FMM.pdb
diff --git a/FMM2/obj/x86/Release/FMM2.csproj.GenerateResource.Cache b/FMM2/obj/x86/Release/FMM2.csproj.GenerateResource.Cache
diff --git a/FMM2/obj/x86/Release/FMM_MarkupCompile.cache b/FMM2/obj/x86/Release/FMM_MarkupCompile.cache
@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\madr\Documents\GitHub\FMM2\FMM2\obj\x86\Release\
+C:\Users\madr\Downloads\FMM2-master\FMM2\obj\x86\Release\
 FMM2
 none
 false
 TRACE
-C:\Users\madr\Documents\GitHub\FMM2\FMM2\App.xaml
+C:\Users\madr\Downloads\FMM2-master\FMM2\App.xaml
 21177156620
 
 291209195497
-17-2024856032
+17931717666
 About.xaml;MainWindow.xaml;
 fmm.png
 False

diff --git a/FMM2/obj/x86/Release/FMM_MarkupCompile.lref b/FMM2/obj/x86/Release/FMM_MarkupCompile.lref
@@ -1,5 +1,5 @@
 
 
-FC:\Users\madr\Documents\GitHub\FMM2\FMM2\About.xaml;;
-FC:\Users\madr\Documents\GitHub\FMM2\FMM2\MainWindow.xaml;;
+FC:\Users\madr\Downloads\FMM2-master\FMM2\About.xaml;;
+FC:\Users\madr\Downloads\FMM2-master\FMM2\MainWindow.xaml;;
 
diff --git a/FMM2/obj/x86/Release/MainWindow.baml b/FMM2/obj/x86/Release/MainWindow.baml
diff --git a/FMM2/obj/x86/Release/MainWindow.g.cs b/FMM2/obj/x86/Release/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DD854FBE5966D391C0558C427E76BFEF4BC1A89B16C17DF61F250EF71B464800"
+#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E27A4B865FAC8CB384530D970638035FD7A2B7838B681B67612BAE4A9DEE97FA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

diff --git a/FMM2/obj/x86/Release/MainWindow.g.i.cs b/FMM2/obj/x86/Release/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DD854FBE5966D391C0558C427E76BFEF4BC1A89B16C17DF61F250EF71B464800"
+#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E27A4B865FAC8CB384530D970638035FD7A2B7838B681B67612BAE4A9DEE97FA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     try
                     {
-                        client.DownloadFile("https://raw.githubusercontent.com/Clef-0/FMM-Mods/master/meta/links.txt", Path.Combine(Directory.GetCurrentDirectory(), "fmm", "temp", "links.txt"));
+                        client.DownloadFile("https://raw.githubusercontent.com/Clef-0/FMM-Mods/master/meta/links2.txt", Path.Combine(Directory.GetCurrentDirectory(), "fmm", "temp", "links.txt"));
                     }
                     catch
                     {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9d42da87f7d126490276727e01e56e7d77fe710d
		14a1c2d364e72d1b1ba5fe97217d18620ef85c2e26a082ada40b9f719f69ec61