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
83653565ed6245e1b3f9044b596ea8491ea93ded
UltimMC_Launcher/launcher
History
Sebastian 83653565ed Merge branch 'MultiMC:develop' into develop
2021-09-27 19:28:13 -05:00
..
dialogs
Use proper name
2021-09-13 22:09:22 -05:00
groupview
Fix conflict
2021-07-25 18:34:28 -05:00
icons
Fix conflict
2021-07-25 18:34:28 -05:00
java
GH-3996 Detect Adoptium JDK's
2021-08-09 18:43:55 +02:00
launch
Fix conflict
2021-07-25 18:34:28 -05:00
meta
Fix conflict
2021-07-25 18:34:28 -05:00
minecraft
Merge branch 'MultiMC:develop' into develop
2021-09-24 16:25:17 -05:00
modplatform
GH-4055 Don't download multiple files to the same path
2021-09-17 16:00:43 +01:00
mojang
Fix conflict
2021-07-25 18:34:28 -05:00
net
Fix conflict
2021-07-25 18:34:28 -05:00
news
Fix conflict
2021-07-25 18:34:28 -05:00
notifications
Fix conflict
2021-07-25 18:34:28 -05:00
package
NOISSUE bump deb package version
2021-09-24 15:39:21 +02:00
pagedialog
Fix conflict
2021-07-25 18:34:28 -05:00
pages
NOISSUE add shader pack page for instances
2021-09-23 21:26:56 +02:00
pathmatcher
Fix conflict
2021-07-25 18:34:28 -05:00
resources
NOISSUE add all missing shader packs icons
2021-09-26 02:54:52 +02:00
screenshots
Fix conflict
2021-07-25 18:34:28 -05:00
settings
Fix conflict
2021-07-25 18:34:28 -05:00
setupwizard
Fix conflict
2021-07-25 18:34:28 -05:00
status
Fix conflict
2021-07-25 18:34:28 -05:00
tasks
Fix conflict
2021-07-25 18:34:28 -05:00
testdata
Fix conflict
2021-07-25 18:34:28 -05:00
themes
Fix conflict
2021-07-25 18:34:28 -05:00
tools
Fix conflict
2021-07-25 18:34:28 -05:00
translations
Fix conflict
2021-07-25 18:34:28 -05:00
updater
Fix conflict
2021-09-12 20:23:30 -05:00
widgets
Fix conflict
2021-07-25 18:34:28 -05:00
AuthServer.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
AuthServer.h
Finish removing LOGIC_EXPORT
2021-09-13 09:12:27 -05:00
BaseInstaller.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
BaseInstaller.h
Fix conflict
2021-07-25 18:34:28 -05:00
BaseInstance.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
BaseInstance.h
Fix conflict
2021-09-12 20:23:30 -05:00
BaseVersion.h
Fix conflict
2021-07-25 18:34:28 -05:00
BaseVersionList.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
BaseVersionList.h
Fix conflict
2021-07-25 18:34:28 -05:00
CMakeLists.txt
NOISSUE add shader pack page for instances
2021-09-23 21:26:56 +02:00
ColorCache.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ColorCache.h
Fix conflict
2021-07-25 18:34:28 -05:00
ColumnResizer.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
ColumnResizer.h
Fix conflict
2021-07-25 18:34:28 -05:00
Commandline.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Commandline.h
Fix conflict
2021-07-25 18:34:28 -05:00
DefaultVariable.h
Fix conflict
2021-07-25 18:34:28 -05:00
DesktopServices.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
DesktopServices.h
Fix conflict
2021-07-25 18:34:28 -05:00
Env.cpp
Fix conflict
2021-09-12 20:23:30 -05:00
Env.h
Fix conflict
2021-07-25 18:34:28 -05:00
Exception.h
Fix conflict
2021-07-25 18:34:28 -05:00
ExponentialSeries.h
Fix conflict
2021-07-25 18:34:28 -05:00
FileSystem_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
FileSystem.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
FileSystem.h
Fix conflict
2021-07-25 18:34:28 -05:00
Filter.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Filter.h
Fix conflict
2021-07-25 18:34:28 -05:00
GuiUtil.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
GuiUtil.h
Fix conflict
2021-07-25 18:34:28 -05:00
GZip_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
GZip.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
GZip.h
Fix conflict
2021-07-25 18:34:28 -05:00
HoeDown.h
Fix conflict
2021-07-25 18:34:28 -05:00
install_prereqs.cmake.in
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceCopyTask.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceCopyTask.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceCreationTask.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceCreationTask.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceImportTask.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceImportTask.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceList.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceList.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstancePageProvider.h
NOISSUE add shader pack page for instances
2021-09-23 21:26:56 +02:00
InstanceProxyModel.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceProxyModel.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceTask.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceTask.h
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceWindow.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
InstanceWindow.h
Fix conflict
2021-07-25 18:34:28 -05:00
JavaCommon.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
JavaCommon.h
Fix conflict
2021-07-25 18:34:28 -05:00
Json.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Json.h
Fix conflict
2021-07-25 18:34:28 -05:00
KonamiCode.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
KonamiCode.h
Fix conflict
2021-07-25 18:34:28 -05:00
LaunchController.cpp
Fix conflict again
2021-09-12 20:52:56 -05:00
LaunchController.h
Fix conflict
2021-07-25 18:34:28 -05:00
LoggedProcess.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
LoggedProcess.h
Fix conflict
2021-07-25 18:34:28 -05:00
main.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MainWindow.cpp
Fix build
2021-09-12 21:06:38 -05:00
MainWindow.h
Fix conflict
2021-09-12 20:23:30 -05:00
MessageLevel.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MessageLevel.h
Fix conflict
2021-07-25 18:34:28 -05:00
MMCStrings.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MMCStrings.h
Fix conflict
2021-07-25 18:34:28 -05:00
MMCZip.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
MMCZip.h
Fix conflict
2021-07-25 18:34:28 -05:00
MultiMC.cpp
Fix conflict
2021-09-12 20:23:30 -05:00
MultiMC.h
GH-3392 dirty initial MSA support that shares logic with Mojang flows
2021-08-15 23:18:50 +02:00
NullInstance.h
Fix conflict
2021-07-25 18:34:28 -05:00
ProblemProvider.h
Fix conflict
2021-07-25 18:34:28 -05:00
QObjectPtr.h
Fix conflict
2021-07-25 18:34:28 -05:00
RecursiveFileSystemWatcher.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
RecursiveFileSystemWatcher.h
Fix conflict
2021-07-25 18:34:28 -05:00
RWStorage.h
Fix conflict
2021-07-25 18:34:28 -05:00
SeparatorPrefixTree.h
Fix conflict
2021-07-25 18:34:28 -05:00
SkinUtils.cpp
Fix conflict
2021-09-12 20:23:30 -05:00
SkinUtils.h
Fix conflict
2021-07-25 18:34:28 -05:00
UpdateController.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
UpdateController.h
Fix conflict
2021-07-25 18:34:28 -05:00
Usable.h
Fix conflict
2021-07-25 18:34:28 -05:00
Version_test.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Version.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
Version.h
Fix conflict
2021-07-25 18:34:28 -05:00
VersionProxyModel.cpp
Fix conflict
2021-07-25 18:34:28 -05:00
VersionProxyModel.h
Fix conflict
2021-07-25 18:34:28 -05:00
WatchLock.h
Fix conflict
2021-07-25 18:34:28 -05:00