summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-28 00:21:36 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-28 00:21:36 +0200
commit7f4073840a9732d03c9f71f9baa08502f0bf2d94 (patch)
treee6d60e232bbed2c139f128616074ddcd6f5b3533
parentf0d850e1ee299ecdb19c2d02e24e83a2a167bcc1 (diff)
downloadMultiMC-7f4073840a9732d03c9f71f9baa08502f0bf2d94.tar
MultiMC-7f4073840a9732d03c9f71f9baa08502f0bf2d94.tar.gz
MultiMC-7f4073840a9732d03c9f71f9baa08502f0bf2d94.tar.lz
MultiMC-7f4073840a9732d03c9f71f9baa08502f0bf2d94.tar.xz
MultiMC-7f4073840a9732d03c9f71f9baa08502f0bf2d94.zip
Bump version, fix typo, update the changelog.
-rw-r--r--CMakeLists.txt2
-rw-r--r--changelog.yaml2
-rw-r--r--gui/MainWindow.cpp8
3 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2c85b09..d9ed396e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,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 7)
+set(MultiMC_VERSION_HOTFIX 8)
# 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 9a8b3e57..02aebf5e 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -84,3 +84,5 @@
- A crash handler implementation has been added.
0.3.7
- Fixed forge for 1.7.10-pre4 (and any future prereleases)
+0.3.8
+ - Workaround for performance issues with Intel integrated graphics chips
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 7d4d9697..3aa3fdbf 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -1563,9 +1563,9 @@ void MainWindow::checkSetDefaultJava()
CustomMessageBox::selectable(
this, tr("Java detection forced"),
tr("Because of graphics performance issues caused by Intel drivers on Windows, "
- "MultiMC java detection was forced. Please select a Minecraft version. If "
- "you have custom java versions set for your instances, make sure you use "
- "the 'javaw.exe' executable."),
+ "MultiMC java detection was forced. Please select a Java "
+ "version.<br/><br/>If you have custom java versions set for your instances, "
+ "make sure you use the 'javaw.exe' executable."),
QMessageBox::Warning)->exec();
askForJava = true;
break;
@@ -1629,3 +1629,5 @@ void MainWindow::on_actionScreenshots_triggered()
QMessageBox::Information)->exec();
}
}
+
+