Skip to content

Commit 8f8c91a

Browse files
committed
Squashed v1.3 from development
1 parent eb3c74d commit 8f8c91a

File tree

13 files changed

+263
-153
lines changed

13 files changed

+263
-153
lines changed

FlashpointInstaller/FlashpointInstaller.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<DebugType>pdbonly</DebugType>
4848
<Optimize>true</Optimize>
4949
<OutputPath>bin\Release\</OutputPath>
50-
<DefineConstants>TRACE</DefineConstants>
50+
<DefineConstants>
51+
</DefineConstants>
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<Prefer32Bit>false</Prefer32Bit>
@@ -297,6 +298,7 @@
297298
</EmbeddedResource>
298299
<EmbeddedResource Include="src\Forms\Main.resx">
299300
<DependentUpon>Main.cs</DependentUpon>
301+
<SubType>Designer</SubType>
300302
</EmbeddedResource>
301303
<EmbeddedResource Include="Properties\Resources.resx">
302304
<Generator>ResXFileCodeGenerator</Generator>

FlashpointInstaller/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.1.0")]
35-
[assembly: AssemblyFileVersion("1.11")]
34+
[assembly: AssemblyVersion("1.2.0.0")]
35+
[assembly: AssemblyFileVersion("1.2")]

FlashpointInstaller/src/Common.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static class FPM
151151
// Pointer to main form
152152
public static Main Main { get => (Main)Application.OpenForms["Main"]; }
153153
// Internet location of component list XML
154-
public static string ListURL { get; set; } = "https://nexus-dev.unstable.life/repository/stable/components.xml";
154+
public static string ListURL { get; set; } = "https://nexus-dev.flashpointarchive.org/repository/stable/components.xml";
155155
// The parsed component list XML
156156
public static XmlDocument XmlTree { get; set; }
157157
// WebClient instance used to download files

FlashpointInstaller/src/Forms/Main.Designer.cs

Lines changed: 56 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FlashpointInstaller/src/Forms/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private void Main_Load(object sender, EventArgs e)
4040

4141
private void Link_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
4242
{
43-
Process.Start(new ProcessStartInfo("https://bluemaxima.org/flashpoint") { UseShellExecute = true });
43+
Process.Start(new ProcessStartInfo("https://flashpointarchive.org/") { UseShellExecute = true });
4444
}
4545

4646
public void ComponentList_BeforeCheck(object sender, TreeViewCancelEventArgs e)

FlashpointInstaller/src/Forms/Main.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<data name="Logo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122122
<value>
123123
iVBORw0KGgoAAAANSUhEUgAAAiYAAAC0CAYAAACg/+cnAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
124-
wgAADsIBFShKgAAAP3pJREFUeF7tnQd4HNW5/m1MDRAC2N7dmdk+MsUBkjjcQHohIZWSekkhIUB6AULI
124+
wQAADsEBuJFr7QAAP3pJREFUeF7tnQd4HNW5/m1MDRAC2N7dmdk+MsUBkjjcQHohIZWSekkhIUB6AULI
125125
DTcVkkByk5Ce8CcJKUDA9GKDGzY2xbhigw3GNBe0uzLF9Grp/77SHPlofGZ2ZnYlrbTf73nexyDtnllp
126126
bc1P3znnO2MEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQWgrNo3fZ7vO
127127
tJup2G6m6pR29j4sCIIgCIIwPGxwnO2qWTdfddzDICj7VdLuOO9TgiAIgiAIw0PF6ShCTL5SdTqO7xnz

FlashpointManager/FlashpointManager.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<DebugType>pdbonly</DebugType>
4848
<Optimize>true</Optimize>
4949
<OutputPath>bin\Release\</OutputPath>
50-
<DefineConstants>TRACE</DefineConstants>
50+
<DefineConstants>
51+
</DefineConstants>
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<Prefer32Bit>false</Prefer32Bit>
@@ -304,6 +305,7 @@
304305
</EmbeddedResource>
305306
<EmbeddedResource Include="src\Forms\Main.resx">
306307
<DependentUpon>Main.cs</DependentUpon>
308+
<SubType>Designer</SubType>
307309
</EmbeddedResource>
308310
<EmbeddedResource Include="Properties\Resources.resx">
309311
<Generator>ResXFileCodeGenerator</Generator>

FlashpointManager/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.1.0")]
35-
[assembly: AssemblyFileVersion("1.11")]
34+
[assembly: AssemblyVersion("1.3.0.0")]
35+
[assembly: AssemblyFileVersion("1.3")]

FlashpointManager/Properties/app.manifest

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,12 @@
4747
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
4848
4949
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
50-
<!--
5150
<application xmlns="urn:schemas-microsoft-com:asm.v3">
5251
<windowsSettings>
5352
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
54-
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
53+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
5554
</windowsSettings>
5655
</application>
57-
-->
5856
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
5957
<!--
6058
<dependency>

0 commit comments

Comments
 (0)