summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--changelog.yaml14
-rw-r--r--gui/MainWindow.cpp6
-rw-r--r--logic/icons/IconList.cpp17
-rw-r--r--logic/icons/IconList.h1
5 files changed, 36 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9efb4cd2..0b276cf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,8 +92,8 @@ 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 1)
-SET(MultiMC_VERSION_HOTFIX 1)
+SET(MultiMC_VERSION_MINOR 2)
+SET(MultiMC_VERSION_HOTFIX 0)
# 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 82dccd69..01e11f52 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -16,4 +16,16 @@
- Added additional information to the about dialog.
0.1.1:
- Hotfix - Changed the issue tracker URL to [GitHub issues](https://github.com/MultiMC/MultiMC5/issues).
-
+0.2:
+ - Java memory settings have MB added to the number to make the units obvious.
+ - Complete rework of the launcher part. No more sensitive information in the process arguments.
+ - Cached downloads now do not destroy files on failure.
+ - Mojang service status is now on the MultiMC status bar.
+ - Java checker is no longer needed/used on instance launch.
+ - Support for private FTB packs.
+ - Fixed instance ID issues related to copying FTB packs without changing the instance name.
+ - Forge versions are better sorted (build numbers above 999 were sorted wrong).
+ - Fixed crash related to the MultiMC update channel picker in offline mode.
+ - Started using icon themes for the application icons, fixing many OSX graphical glitches.
+ - Icon sources have been located, along with icon licenses.
+ - Update to the German translation.
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 7c8562cd..ee9c3fad 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -830,7 +830,7 @@ void MainWindow::on_actionChangeInstIcon_triggered()
if (dlg.result() == QDialog::Accepted)
{
m_selectedInstance->setIconKey(dlg.selectedIconKey);
- auto ico = MMC->icons()->getIcon(dlg.selectedIconKey);
+ auto ico = MMC->icons()->getBigIcon(dlg.selectedIconKey);
ui->actionChangeInstIcon->setIcon(ico);
}
}
@@ -839,14 +839,14 @@ void MainWindow::iconUpdated(QString icon)
{
if(icon == m_currentInstIcon)
{
- ui->actionChangeInstIcon->setIcon(MMC->icons()->getIcon(m_currentInstIcon));
+ ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon));
}
}
void MainWindow::updateInstanceToolIcon(QString new_icon)
{
m_currentInstIcon = new_icon;
- ui->actionChangeInstIcon->setIcon(MMC->icons()->getIcon(m_currentInstIcon));
+ ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon));
}
void MainWindow::setSelectedInstanceById(const QString &id)
diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp
index cda2db7b..d76e6fbb 100644
--- a/logic/icons/IconList.cpp
+++ b/logic/icons/IconList.cpp
@@ -336,6 +336,23 @@ QIcon IconList::getIcon(QString key)
return QIcon();
}
+QIcon IconList::getBigIcon(QString key)
+{
+ int icon_index = getIconIndex(key);
+
+ if (icon_index == -1)
+ key = "infinity";
+
+ // Fallback for icons that don't exist.
+ icon_index = getIconIndex(key);
+
+ if (icon_index == -1)
+ return QIcon();
+
+ QPixmap bigone = icons[icon_index].icon().pixmap(256,256).scaled(256,256);
+ return QIcon(bigone);
+}
+
int IconList::getIconIndex(QString key)
{
if (key == "default")
diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h
index 322411d1..4ee3f782 100644
--- a/logic/icons/IconList.h
+++ b/logic/icons/IconList.h
@@ -34,6 +34,7 @@ public:
virtual ~IconList() {};
QIcon getIcon(QString key);
+ QIcon getBigIcon(QString key);
int getIconIndex(QString key);
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;