Merge v1.3

release v1.3 (and rollback previous changes)
zoogies · Apr 14, 2024 · 3217445 · 3217445
2 parents a37cae4 + 9ce1972
commit 3217445
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 51 deletions.
diff --git a/BSM/BSM/App.config b/BSM/BSM/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/BSM/BSM/BSM.csproj b/BSM/BSM/BSM.csproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>BSM</RootNamespace>
     <AssemblyName>BSM</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -80,6 +81,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.manifest">
       <SubType>Designer</SubType>

diff --git a/BSM/BSM/Form1.Designer.cs b/BSM/BSM/Form1.Designer.cs
diff --git a/BSM/BSM/Form1.cs b/BSM/BSM/Form1.cs
@@ -58,7 +58,7 @@ private void Form1_Load(object sender, EventArgs e)
             //check if newer version is available
             using (WebClient client = new WebClient())
             {
-                client.DownloadFile("https://raw.githubusercontent.com/Yoyolick/Boneworks-Save-Manager/master/BSM/resources/newest_version.txt", dataPath + "\\newest_version.txt");
+                client.DownloadFile("https://raw.githubusercontent.com/zoogies/Boneworks-Save-Manager/master/BSM/resources/newest_version.txt", dataPath + "\\newest_version.txt");
             }
             string version_number = File.ReadAllText(dataPath + "\\newest_version.txt");
             if (version_number != "1.3\n")
@@ -330,7 +330,7 @@ public void ValidateFileSystem()
             {
                 using (WebClient client = new WebClient())
                 {
-                    client.DownloadFile("https://raw.githubusercontent.com/Yoyolick/Boneworks-Save-Manager/master/BSM/resources/newest_version.txt", dataPath + "\\newest_version.txt");
+                    client.DownloadFile("https://raw.githubusercontent.com/zoogies/Boneworks-Save-Manager/master/BSM/resources/newest_version.txt", dataPath + "\\newest_version.txt");
                     builtsomething = true;
                 }
             }
@@ -339,23 +339,23 @@ public void ValidateFileSystem()
             {
                 using (WebClient client = new WebClient())
                 {
-                    client.DownloadFile("https://raw.githubusercontent.com/Yoyolick/Boneworks-Save-Manager/master/BSM/resources/application_icon.ico", dataPath + "\\application_icon.ico");
+                    client.DownloadFile("https://raw.githubusercontent.com/zoogies/Boneworks-Save-Manager/master/BSM/resources/application_icon.ico", dataPath + "\\application_icon.ico");
                     builtsomething = true;
                 }
             }
             if (!File.Exists(dataPath + "\\splash_image.jpg"))
             {
                 using (WebClient client = new WebClient())
                 {
-                    client.DownloadFile("https://raw.githubusercontent.com/Yoyolick/Boneworks-Save-Manager/master/BSM/resources/splash_image.jpg", dataPath + "\\splash_image.jpg");
+                    client.DownloadFile("https://raw.githubusercontent.com/zoogies/Boneworks-Save-Manager/master/BSM/resources/splash_image.jpg", dataPath + "\\splash_image.jpg");
                     builtsomething = true;
                 }
             }
             if (!File.Exists(dataPath + "\\splash_image_light.png"))
             {
                 using (WebClient client = new WebClient())
                 {
-                    client.DownloadFile("https://raw.githubusercontent.com/Yoyolick/Boneworks-Save-Manager/master/BSM/resources/splash_image_light.png", dataPath + "\\splash_image_light.png");
+                    client.DownloadFile("https://raw.githubusercontent.com/zoogies/Boneworks-Save-Manager/master/BSM/resources/splash_image_light.png", dataPath + "\\splash_image_light.png");
                     builtsomething = true;
                 }
             }
@@ -453,7 +453,7 @@ private void BtnBrowseHelp_Click(object sender, EventArgs e)
 
         private void Label5_Click(object sender, EventArgs e)
         {
-            Process.Start("https://github.com/Yoyolick/Boneworks-Save-Manager/issues");
+            Process.Start("https://github.com/zoogies/Boneworks-Save-Manager/issues");
         }
 
         private void BtnBrowseBoneworks_Click(object sender, EventArgs e)

diff --git a/BSM/BSM/Properties/Resources.Designer.cs b/BSM/BSM/Properties/Resources.Designer.cs
diff --git a/BSM/BSM/Properties/Settings.Designer.cs b/BSM/BSM/Properties/Settings.Designer.cs
diff --git a/BSM/resources/newest_version.txt b/BSM/resources/newest_version.txt
@@ -1 +1 @@
-1.2
+1.3