Skip to content

Commit

Permalink
Merge branch 'master' of ssh://github.com/space-wizards/SS14.Launcher…
Browse files Browse the repository at this point in the history
… into launcher-logging-default
  • Loading branch information
VasilisThePikachu committed May 27, 2024
2 parents c524760 + a7ef163 commit 8e2c99f
Show file tree
Hide file tree
Showing 98 changed files with 4,452 additions and 561 deletions.
68 changes: 68 additions & 0 deletions Assets/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions Assets/cross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<PackageVersion Include="Mono.Posix.NETStandard" Version="1.0.0"/>
<PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1"/>
<PackageVersion Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
<PackageVersion Include="Linguini.Bundle" Version="0.8.1" />
<!-- Test stuff -->
<PackageVersion Include="nunit" Version="3.13.3"/>
<PackageVersion Include="NUnit.Analyzers" Version="3.6.1"/>
Expand Down
2 changes: 1 addition & 1 deletion Launcher.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
3. Local dev SS14.Loader launching code.
-->
<TargetFramework>net8.0</TargetFramework>
<Version>0.26.1</Version>
<Version>0.27.2</Version>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions SS14.Launcher/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
<StyleInclude Source="/Theme/ThemeServerList.axaml" />
<StyleInclude Source="/Theme/ThemeCheckBox.axaml" />
<StyleInclude Source="/Theme/ThemeIconLabel.xaml" />
<StyleInclude Source="/Theme/ThemeRandomMessage.xaml" />
</Application.Styles>
</Application>
Loading

0 comments on commit 8e2c99f

Please sign in to comment.