summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-04-01 23:02:40 +0200
committerPetr Mrázek <peterix@gmail.com>2014-04-01 23:03:04 +0200
commitad9d082f5713df72fc18de957547b7ad47a60e46 (patch)
tree98ffde14deea26cc2759801e2fb211b0d50c791b
parent52ff6a4140caa7e16eb3adec4948251593d213a7 (diff)
downloadMultiMC-ad9d082f5713df72fc18de957547b7ad47a60e46.tar
MultiMC-ad9d082f5713df72fc18de957547b7ad47a60e46.tar.gz
MultiMC-ad9d082f5713df72fc18de957547b7ad47a60e46.tar.lz
MultiMC-ad9d082f5713df72fc18de957547b7ad47a60e46.tar.xz
MultiMC-ad9d082f5713df72fc18de957547b7ad47a60e46.zip
Do not spam logs too much, bump version and add to changelog.0.3.2
-rw-r--r--CMakeLists.txt2
-rw-r--r--changelog.yaml3
-rw-r--r--logic/VersionFile.cpp8
3 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91b45478..38f70b7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,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 3)
-SET(MultiMC_VERSION_HOTFIX 1)
+SET(MultiMC_VERSION_HOTFIX 2)
# Build number
SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
diff --git a/changelog.yaml b/changelog.yaml
index a56645ba..c1f36408 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -57,3 +57,6 @@
0.3.1:
- Fix copying of FTB instances (instance type is changed properly now)
- Customizing FTB pack versions will remove the FTB pack patch file
+0.3.2:
+ - Fix issues with libraries not getting replaced properly (fixes instance startup for new instances)
+ - Fix april fools \ No newline at end of file
diff --git a/logic/VersionFile.cpp b/logic/VersionFile.cpp
index 564229d7..cd2a4f9c 100644
--- a/logic/VersionFile.cpp
+++ b/logic/VersionFile.cpp
@@ -398,7 +398,7 @@ void VersionFile::applyTo(VersionFinal *version)
{
case RawLibrary::Apply:
{
- QLOG_INFO() << "Applying lib " << lib->name;
+ // QLOG_INFO() << "Applying lib " << lib->name;
int index = findLibrary(version->libraries, lib->name);
if (index >= 0)
{
@@ -442,7 +442,7 @@ void VersionFile::applyTo(VersionFinal *version)
case RawLibrary::Append:
case RawLibrary::Prepend:
{
- QLOG_INFO() << "Adding lib " << lib->name;
+ // QLOG_INFO() << "Adding lib " << lib->name;
const int startOfVersion = lib->name.lastIndexOf(':') + 1;
const int index = findLibrary(
version->libraries, QString(lib->name).replace(startOfVersion, INT_MAX, '*'));
@@ -519,7 +519,7 @@ void VersionFile::applyTo(VersionFinal *version)
}
else
toReplace = lib->insertData;
- QLOG_INFO() << "Replacing lib " << toReplace << " with " << lib->name;
+ // QLOG_INFO() << "Replacing lib " << toReplace << " with " << lib->name;
int index = findLibrary(version->libraries, toReplace);
if (index >= 0)
{
@@ -538,7 +538,7 @@ void VersionFile::applyTo(VersionFinal *version)
int index = findLibrary(version->libraries, lib);
if (index >= 0)
{
- QLOG_INFO() << "Removing lib " << lib;
+ // QLOG_INFO() << "Removing lib " << lib;
version->libraries.removeAt(index);
}
else