diff --git a/api/logic/minecraft/MinecraftVersionList.cpp b/api/logic/minecraft/MinecraftVersionList.cpp index 67528fc5..6b26dd1d 100644 --- a/api/logic/minecraft/MinecraftVersionList.cpp +++ b/api/logic/minecraft/MinecraftVersionList.cpp @@ -30,6 +30,7 @@ #include "onesix/OneSixVersionFormat.h" #include "MojangVersionFormat.h" #include +#include 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 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."; continue; } } 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."; continue; } @@ -320,8 +321,6 @@ 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); if(source == VersionSource::Remote) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 90fa1aca..7386ee62 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -6,7 +6,7 @@ set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch ######## Set version numbers ######## set(MultiMC_VERSION_MAJOR 0) set(MultiMC_VERSION_MINOR 5) -set(MultiMC_VERSION_HOTFIX 0) +set(MultiMC_VERSION_HOTFIX 2) # Build number set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")