mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-10-04 17:09:25 +00:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
170bd677fd | ||
|
84e23e2e7a |
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <QObject>
|
||||
#include <functional>
|
||||
|
||||
namespace details
|
||||
{
|
||||
|
@@ -289,9 +289,21 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s
|
||||
// OneSix or Legacy. use filter to determine type
|
||||
if (versionTypeStr == "release")
|
||||
{
|
||||
if(versionID.startsWith("1.13"))
|
||||
{
|
||||
qCritical() << "Ignoring" << versionID
|
||||
<< "because it is too new and not compatible.";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (versionTypeStr == "snapshot") // It's a snapshot... yay
|
||||
{
|
||||
if(mcVersion->m_releaseTime.currentSecsSinceEpoch() >= 1508942630)
|
||||
{
|
||||
qCritical() << "Ignoring" << versionID
|
||||
<< "because it is too new and not compatible.";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (versionTypeStr == "old_alpha")
|
||||
{
|
||||
@@ -308,6 +320,7 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s
|
||||
mcVersion->m_type = versionTypeStr;
|
||||
qDebug() << "Loaded version" << versionID << "from"
|
||||
<< ((source == VersionSource::Remote) ? "remote" : "local") << "version list.";
|
||||
qDebug() << "Loaded version timestamp: " << mcVersion->m_releaseTime;
|
||||
tempList.append(mcVersion);
|
||||
}
|
||||
updateListData(tempList);
|
||||
|
17
changelog.md
17
changelog.md
@@ -1,6 +1,18 @@
|
||||
# MultiMC 0.5.1
|
||||
# MultiMC 0.5.2
|
||||
|
||||
## Improvements
|
||||
## Internals
|
||||
|
||||
- GH-2026: New Minecraft snapshots are not compatible.
|
||||
|
||||
The temporary solution is blocking of new Minecraft snapshots and versions.
|
||||
|
||||
A future release will add full compatibility.
|
||||
|
||||
# Previous releases
|
||||
|
||||
## MultiMC 0.5.1
|
||||
|
||||
### Improvements
|
||||
|
||||
- Log uploads now use HTTPS because the [paste.ee](https://paste.ee) site is switching to HTTPS only.
|
||||
|
||||
@@ -43,7 +55,6 @@
|
||||
|
||||
The instance type of the copy was not set, causing it to not be usable.
|
||||
|
||||
# Previous releases
|
||||
|
||||
## MultiMC 0.5.0
|
||||
|
||||
|
@@ -174,9 +174,14 @@ function(is_file_executable file result_var)
|
||||
|
||||
if(file_cmd)
|
||||
execute_process(COMMAND "${file_cmd}" "${file_full}"
|
||||
RESULT_VARIABLE file_rv
|
||||
OUTPUT_VARIABLE file_ov
|
||||
ERROR_VARIABLE file_ev
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
if(NOT file_rv STREQUAL "0")
|
||||
message(FATAL_ERROR "${file_cmd} failed: ${file_rv}\n${file_ev}")
|
||||
endif()
|
||||
|
||||
# Replace the name of the file in the output with a placeholder token
|
||||
# (the string " _file_full_ ") so that just in case the path name of
|
||||
@@ -205,6 +210,13 @@ function(is_file_executable file result_var)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# "file" version 5.22 does not print "(used shared libraries)"
|
||||
# but uses "interpreter"
|
||||
if("${file_ov}" MATCHES "shared object.*interpreter")
|
||||
set(${result_var} 1 PARENT_SCOPE)
|
||||
return()
|
||||
endif()
|
||||
|
||||
else()
|
||||
message(STATUS "warning: No 'file' command, skipping execute_process...")
|
||||
endif()
|
||||
|
Reference in New Issue
Block a user