External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 04:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ffeb4d9ffad65b46d67d178d7243bcf887a7d334
UltimMC_Launcher/launcher/minecraft
History
Sebastian ffeb4d9ffa Merge branch 'MultiMC:develop' into develop
2021-10-03 15:13:57 -05:00
..
auth
Merge branch 'MultiMC:develop' into develop
2021-10-03 15:13:57 -05:00
gameoptions
Fix conflict
2021-07-25 18:34:28 -05:00
launch
Fix conflict again
2021-09-12 20:52:56 -05:00
legacy
Fix conflict
2021-09-12 20:23:30 -05:00
mod
Fix conflict
2021-09-12 20:23:30 -05:00
services
Fix conflict
2021-09-12 20:23:30 -05:00
testdata
Fix conflict
2021-07-25 18:34:28 -05:00
update
NOISSUE fix typo in FMLLibrariesTask.cpp
2021-10-03 21:46:10 +02:00
AssetsUtils.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
AssetsUtils.h
Fix conflict
2021-07-25 18:34:28 -05:00
Component.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Component.h
Fix conflict
2021-07-25 18:34:28 -05:00
ComponentUpdateTask_p.h
Fix conflict
2021-07-25 18:34:28 -05:00
ComponentUpdateTask.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ComponentUpdateTask.h
Fix conflict
2021-07-25 18:34:28 -05:00
GradleSpecifier_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
GradleSpecifier.h
Fix conflict
2021-07-25 18:34:28 -05:00
LaunchProfile.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
LaunchProfile.h
Fix conflict
2021-07-25 18:34:28 -05:00
Library_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Library.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Library.h
Fix conflict
2021-07-25 18:34:28 -05:00
MinecraftInstance.cpp
Merge branch 'MultiMC:develop' into develop
2021-09-24 16:25:17 -05:00
MinecraftInstance.h
Merge branch 'MultiMC:develop' into develop
2021-09-24 16:25:17 -05:00
MinecraftLoadAndCheck.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MinecraftLoadAndCheck.h
Fix conflict
2021-07-25 18:34:28 -05:00
MinecraftUpdate.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MinecraftUpdate.h
Fix conflict
2021-07-25 18:34:28 -05:00
MojangDownloadInfo.h
Fix conflict
2021-07-25 18:34:28 -05:00
MojangVersionFormat_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MojangVersionFormat.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MojangVersionFormat.h
Fix conflict
2021-07-25 18:34:28 -05:00
OneSixVersionFormat.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
OneSixVersionFormat.h
Fix conflict
2021-07-25 18:34:28 -05:00
OpSys.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
OpSys.h
Fix conflict
2021-07-25 18:34:28 -05:00
PackProfile_p.h
Fix conflict
2021-07-25 18:34:28 -05:00
PackProfile.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
PackProfile.h
Fix conflict
2021-07-25 18:34:28 -05:00
ParseUtils_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ParseUtils.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ParseUtils.h
Fix conflict
2021-07-25 18:34:28 -05:00
ProfileUtils.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ProfileUtils.h
Fix conflict
2021-07-25 18:34:28 -05:00
Rule.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Rule.h
Fix conflict
2021-07-25 18:34:28 -05:00
VersionFile.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
VersionFile.h
Fix conflict
2021-07-25 18:34:28 -05:00
VersionFilterData.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
VersionFilterData.h
Fix conflict
2021-07-25 18:34:28 -05:00
World.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
World.h
Fix conflict
2021-07-25 18:34:28 -05:00
WorldList.cpp
Fix conflict
2021-09-12 20:23:30 -05:00
WorldList.h
Fix conflict
2021-07-25 18:34:28 -05:00