Sebastian-byte ff5e98ff7d Fix conflict

2021-11-11 15:26:27 -05:00

..

auth

Fix conflict

2021-11-11 15:26:27 -05:00

gameoptions

…

launch

Fix conflict

2021-11-02 17:04:00 -05:00

legacy

Fix conflict

2021-09-12 20:23:30 -05:00

mod

GH-4227 Don't blindly trust mods.toml to be valid

2021-11-06 22:43:16 +01:00

services

Fix conflict

2021-09-12 20:23:30 -05:00

testdata

…

update

NOISSUE fix typo in FMLLibrariesTask.cpp

2021-10-03 21:46:10 +02:00

AssetsUtils.cpp

…

AssetsUtils.h

…

Component.cpp

…

Component.h

…

ComponentUpdateTask_p.h

…

ComponentUpdateTask.cpp

…

ComponentUpdateTask.h

…

GradleSpecifier_test.cpp

…

GradleSpecifier.h

…

LaunchProfile.cpp

…

LaunchProfile.h

…

Library_test.cpp

…

Library.cpp

…

Library.h

…

MinecraftInstance.cpp

Fix conflict

2021-10-24 17:15:27 -05:00

MinecraftInstance.h

Fix conflict

2021-10-24 17:15:27 -05:00

MinecraftLoadAndCheck.cpp

…

MinecraftLoadAndCheck.h

…

MinecraftUpdate.cpp

…

MinecraftUpdate.h

…

MojangDownloadInfo.h

…

MojangVersionFormat_test.cpp

…

MojangVersionFormat.cpp

NOISSUE continue debranding...

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

MojangVersionFormat.h

…

OneSixVersionFormat.cpp

NOISSUE fix debranding changes affecting version file format

2021-10-24 12:25:44 +02:00

OneSixVersionFormat.h

…

OpSys.cpp

…

OpSys.h

…

PackProfile_p.h

…

PackProfile.cpp

…

PackProfile.h

…

ParseUtils_test.cpp

…

ParseUtils.cpp

…

ParseUtils.h

…

ProfileUtils.cpp

…

ProfileUtils.h

…

Rule.cpp

…

Rule.h

…

VersionFile.cpp

…

VersionFile.h

…

VersionFilterData.cpp

…

VersionFilterData.h

…

World.cpp

…

World.h

…

WorldList.cpp

Fix conflict

2021-09-12 20:23:30 -05:00

WorldList.h

…