External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-25 04:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fae9ddd92576aa77399fe157a386f959b3e6237e
UltimMC_Launcher/launcher
History
Sebastían fae9ddd925 Merge branch 'MultiMC:develop' into develop
2021-08-10 20:32:15 -05:00
..
dialogs
Fix conflict
2021-07-25 18:34:28 -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
Fix conflict again
2021-07-26 17:27:04 -05:00
modplatform
Fix conflict
2021-07-25 18:34:28 -05: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
GH-3974 fix pinning to taskbar in various linux environments
2021-07-27 21:46:38 +02:00
pagedialog
Fix conflict
2021-07-25 18:34:28 -05:00
pages
Fix conflict
2021-07-25 18:34:28 -05:00
pathmatcher
Fix conflict
2021-07-25 18:34:28 -05:00
resources
Fix conflict
2021-07-25 18:34:28 -05: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-07-25 18:34:28 -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
Fix conflict
2021-07-25 18:34:28 -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-07-25 18:34:28 -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 set the required defs for main library
2021-07-26 14:03:59 +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-07-25 18:34:28 -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
Fix conflict
2021-07-25 18:34:28 -05: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
2021-07-25 18:34:28 -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 conflict
2021-07-25 18:34:28 -05:00
MainWindow.h
Fix conflict
2021-07-25 18:34:28 -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-07-25 18:34:28 -05:00
MultiMC.h
Fix conflict
2021-07-25 18:34:28 -05: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-07-25 18:34:28 -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