Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
v2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
misandrie committed Jan 27, 2024
1 parent 4b39826 commit e4f07c4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Marsey/Config/MarseyVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
namespace Marsey.Config;

/// <summary>
/// Variables only changed at compile
/// Variables only set at compile
/// </summary>
public static class MarseyVars
{
/// <summary>
/// Due to the nature of how Marseyloader is compiled (its not) we cannot check it's version
/// </summary>
public static readonly Version MarseyVersion = new Version("2.11.1");
public static readonly Version MarseyVersion = new Version("2.12.0");

/// <summary>
/// Default MarseyAPI endpoint url
Expand Down
3 changes: 2 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ Enable loader debug, will be on your desktop

#### STOP!

Project EOL's immediately when our beloved friends *over there* allow client-side resource packs
Project EOL's immediately when our beloved friends *over there* allow client-side resource packs and UI mods.<br>
This will never happen though.

### TODO
* Resource swapping (resource packs)
4 changes: 2 additions & 2 deletions SS14.Launcher/Models/Connector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ private async Task<ContentLaunchInfo> InstallContentBundleAsync(
IEnumerable<string> extraArgs,
List<(string, string)> env)
{
var engineVersion = launchInfo.ModuleInfo.Single(x => x.Module == "Robust").Version;
var startInfo = await GetLoaderStartInfo(engineVersion, launchInfo.Version, env);
string engineVersion = launchInfo.ModuleInfo.Single(x => x.Module == "Robust").Version;
ProcessStartInfo startInfo = await GetLoaderStartInfo(engineVersion, launchInfo.Version, env);

// Abort if engine version hates us and we dont hide ourselves
if (Abjure.CheckMalbox(engineVersion, (HideLevel)_cfg.GetCVar(CVars.MarseyHide)))
Expand Down

0 comments on commit e4f07c4

Please sign in to comment.