0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not spam logs too much, bump version and add to changelog.

Browse Source
This commit is contained in:
Petr Mrázek
2014-04-01 23:02:40 +02:00
parent 52ff6a4140
commit ad9d082f57
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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.")

3
changelog.yaml
View File

@@ -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

8
logic/VersionFile.cpp
View File

@@ -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