External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-22 03:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GH-2026 blacklist new Minecraft snapshots and releases some more

Browse Source
This commit is contained in:
Petr Mrázek
2017-10-25 23:42:54 +02:00
parent 170bd677fd
commit 23d2a99619
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/logic/minecraft/MinecraftVersionList.cpp
View File

@@ -30,6 +30,7 @@
#include "onesix/OneSixVersionFormat.h" #include "onesix/OneSixVersionFormat.h"
#include "MojangVersionFormat.h" #include "MojangVersionFormat.h"
#include <FileSystem.h> #include <FileSystem.h>
#include <Version.h>
static const char * localVersionCache = "versions/versions.dat"; static const char * localVersionCache = "versions/versions.dat";
@@ -289,18 +290,18 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s
// OneSix or Legacy. use filter to determine type // OneSix or Legacy. use filter to determine type
if (versionTypeStr == "release") if (versionTypeStr == "release")
{ {
if(versionID.startsWith("1.13")) if(Version(versionID) >= Version("1.13"))
{ {
qCritical() << "Ignoring" << versionID qCritical() << "Ignoring release" << versionID
<< "because it is too new and not compatible."; << "because it is too new and not compatible.";
continue; continue;
} }
} }
else if (versionTypeStr == "snapshot") // It's a snapshot... yay else if (versionTypeStr == "snapshot") // It's a snapshot... yay
{ {
if(mcVersion->m_releaseTime.currentSecsSinceEpoch() >= 1508942630) if(mcVersion->m_releaseTime >= timeFromS3Time("2017-10-25T14:43:50+00:00"))
{ {
qCritical() << "Ignoring" << versionID qCritical() << "Ignoring snapshot" << versionID
<< "because it is too new and not compatible."; << "because it is too new and not compatible.";
continue; continue;
} }
@@ -320,8 +321,6 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s
mcVersion->m_type = versionTypeStr; mcVersion->m_type = versionTypeStr;
qDebug() << "Loaded version" << versionID << "from" qDebug() << "Loaded version" << versionID << "from"
<< ((source == VersionSource::Remote) ? "remote" : "local") << "version list."; << ((source == VersionSource::Remote) ? "remote" : "local") << "version list.";
qDebug() << "Loaded version timestamp: " << mcVersion->m_releaseTime;
tempList.append(mcVersion);
} }
updateListData(tempList); updateListData(tempList);
if(source == VersionSource::Remote) if(source == VersionSource::Remote)

2
application/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
######## Set version numbers ######## ######## Set version numbers ########
set(MultiMC_VERSION_MAJOR 0) set(MultiMC_VERSION_MAJOR 0)
set(MultiMC_VERSION_MINOR 5) set(MultiMC_VERSION_MINOR 5)
set(MultiMC_VERSION_HOTFIX 0) set(MultiMC_VERSION_HOTFIX 2)
# Build number # Build number
set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.") set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")