sneedmc/launcher/minecraft
sneedium 2a1dcd6a38
fix conflicts
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-06-14 22:36:08 -04:00
..
auth Merge remote-tracking branch 'upstream/develop' into develop 2022-06-14 21:29:00 -04:00
gameoptions NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
launch Merge remote-tracking branch 'upstream/develop' into develop 2022-06-14 21:29:00 -04:00
mod Merge pull request #716 from flowln/mod_perma_2 2022-06-14 23:58:35 +10:00
services GH-4071 Heavily refactor and rearchitect account system 2021-12-04 01:18:05 +01:00
testdata NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
update Allow components to specify Java agents and JVM arguments (#175) 2022-04-06 08:22:24 +02:00
Agent.h Allow components to specify Java agents and JVM arguments (#175) 2022-04-06 08:22:24 +02:00
AssetsUtils.cpp chore: add license header to remaining files 2022-05-12 18:11:55 -03:00
AssetsUtils.h NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Component.cpp NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Component.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ComponentUpdateTask_p.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ComponentUpdateTask.cpp fix: remove unused code 2022-04-14 16:50:04 +02:00
ComponentUpdateTask.h fix: remove unused code 2022-04-14 16:50:04 +02:00
GradleSpecifier_test.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
GradleSpecifier.h fix: support split natives 2022-05-18 22:51:15 +02:00
LaunchProfile.cpp Allow components to specify Java agents and JVM arguments (#175) 2022-04-06 08:22:24 +02:00
LaunchProfile.h Allow components to specify Java agents and JVM arguments (#175) 2022-04-06 08:22:24 +02:00
Library_test.cpp NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Library.cpp NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Library.h more rebranding 2022-02-20 18:18:50 -05:00
MinecraftInstance.cpp fix conflicts 2022-06-14 22:36:08 -04:00
MinecraftInstance.h NOISSE add a shortcut to the loaders mods to main window 2021-12-12 22:39:25 +01:00
MinecraftLoadAndCheck.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
MinecraftLoadAndCheck.h refactor: simpler includes for quazip 2022-01-31 21:40:59 +01:00
MinecraftUpdate.cpp NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
MinecraftUpdate.h refactor: simpler includes for quazip 2022-01-31 21:40:59 +01:00
MojangDownloadInfo.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
MojangVersionFormat_test.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
MojangVersionFormat.cpp chore: add license header 2022-03-24 16:10:43 +01:00
MojangVersionFormat.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
OneSixVersionFormat.cpp Allow components to specify Java agents and JVM arguments (#175) 2022-04-06 08:22:24 +02:00
OneSixVersionFormat.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
OpSys.cpp Changes required to support FreeBSD 2021-12-12 11:39:36 +00:00
OpSys.h NOISSUE fix some OS ifdefs 2021-12-31 00:36:25 +01:00
PackProfile_p.h refactor: drop migration for pre-component instances 2022-02-21 22:11:10 +01:00
PackProfile.cpp refactor: allow tracking multiple mod loaders 2022-05-19 08:49:27 +02:00
PackProfile.h refactor: allow tracking multiple mod loaders 2022-05-19 08:49:27 +02:00
ParseUtils_test.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ParseUtils.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ParseUtils.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ProfileUtils.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
ProfileUtils.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
Rule.cpp NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
Rule.h NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00
VersionFile.cpp Launch: Apply the Minecraft version correctly 2022-05-20 18:47:11 +01:00
VersionFile.h Merge remote-tracking branch 'upstream/develop' into develop 2022-06-14 21:29:00 -04:00
VersionFilterData.cpp NOISSUE Error on launch when launching 1.18 with < Java 17 2021-11-16 18:25:16 +00:00
VersionFilterData.h NOISSUE Error on launch when launching 1.18 with < Java 17 2021-11-16 18:25:16 +00:00
World.cpp fix: calculate world sizes individually 2022-04-02 13:29:37 +02:00
World.h fix: remove redundant include 2022-04-01 13:14:04 +02:00
WorldList.cpp fix: use size in bytes to sort by world size 2022-04-19 15:07:14 +02:00
WorldList.h feat: track and display world size 2022-03-31 18:45:17 +02:00