Sebastian-byte 95b8e17ae2 Fix another conflict

2021-11-23 19:57:06 -05:00

..

ClaimAccount.cpp

NOISSUE Some happy little refactors

2021-11-20 16:22:22 +01:00

ClaimAccount.h

GH-3392 dirty initial MSA support that shares logic with Mojang flows

2021-08-15 23:18:50 +02:00

CreateGameFolders.cpp

Fix conflict

2021-07-25 18:34:28 -05:00

CreateGameFolders.h

Fix conflict

2021-07-25 18:34:28 -05:00

DirectJavaLaunch.cpp

NOISSUE continue debranding...

2021-10-21 00:47:53 +02:00

DirectJavaLaunch.h

Fix conflict

2021-07-25 18:34:28 -05:00

ExtractNatives.cpp

Fix conflict

2021-07-25 18:34:28 -05:00

ExtractNatives.h

Fix conflict

2021-07-25 18:34:28 -05:00

InjectAuthlib.cpp

Hopefully does some build fixes

2021-11-20 16:26:01 -05:00

InjectAuthlib.h

Fix conflict

2021-07-25 18:34:28 -05:00

LauncherPartLaunch.cpp

NOISSUE continue refactoring things to make tests pass

2021-11-21 23:21:12 +01:00

LauncherPartLaunch.h

Fix conflict

2021-07-25 18:34:28 -05:00

MinecraftServerTarget.cpp

GH-1795 add terminal launch option to use a specific Minecraft profile

2021-10-31 21:43:33 +01:00

MinecraftServerTarget.h

Fix conflict

2021-07-25 18:34:28 -05:00

ModMinecraftJar.cpp

Fix conflict

2021-07-25 18:34:28 -05:00

ModMinecraftJar.h

Fix conflict

2021-07-25 18:34:28 -05:00

PrintInstanceInfo.cpp

NOISSUE continue debranding...

2021-10-21 00:47:53 +02:00

PrintInstanceInfo.h

Fix conflict

2021-07-25 18:34:28 -05:00

ReconstructAssets.cpp

Fix conflict

2021-07-25 18:34:28 -05:00

ReconstructAssets.h

Fix conflict

2021-07-25 18:34:28 -05:00

ScanModFolders.cpp

Fix conflict

2021-07-25 18:34:28 -05:00

ScanModFolders.h

Fix conflict

2021-07-25 18:34:28 -05:00

VerifyJavaInstall.cpp

NOISSUE Error on launch when launching 1.18 with < Java 17

2021-11-16 18:25:16 +00:00

VerifyJavaInstall.h

Fix conflict

2021-07-25 18:34:28 -05:00