summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2020-03-29 03:12:57 +0200
committerPetr Mrázek <peterix@gmail.com>2020-03-29 03:12:57 +0200
commit3ad9ea507e945709b01a5fcc51a60f7c45ad4c38 (patch)
tree61c1a288901aefe8ada5ebe10ba7336e69333c6c
parentc9e851f12f501657629e41339ad604c3cfba82e1 (diff)
downloadMultiMC-3ad9ea507e945709b01a5fcc51a60f7c45ad4c38.tar
MultiMC-3ad9ea507e945709b01a5fcc51a60f7c45ad4c38.tar.gz
MultiMC-3ad9ea507e945709b01a5fcc51a60f7c45ad4c38.tar.lz
MultiMC-3ad9ea507e945709b01a5fcc51a60f7c45ad4c38.tar.xz
MultiMC-3ad9ea507e945709b01a5fcc51a60f7c45ad4c38.zip
NOISSUE update version number, changelog and credits in about dialog0.6.11
-rw-r--r--CMakeLists.txt2
-rw-r--r--application/dialogs/AboutDialog.cpp1
-rw-r--r--changelog.md21
3 files changed, 21 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ede71307..c4a7e52e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetc
######## Set version numbers ########
set(MultiMC_VERSION_MAJOR 0)
set(MultiMC_VERSION_MINOR 6)
-set(MultiMC_VERSION_HOTFIX 10)
+set(MultiMC_VERSION_HOTFIX 11)
# Build number
set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
diff --git a/application/dialogs/AboutDialog.cpp b/application/dialogs/AboutDialog.cpp
index a556ec05..c4e4ee24 100644
--- a/application/dialogs/AboutDialog.cpp
+++ b/application/dialogs/AboutDialog.cpp
@@ -46,6 +46,7 @@ QString getCreditsHtml(QStringList patrons)
stream << "<p>TakSuyu &lt;<a href='mailto:taksuyu@gmail.com'>taksuyu@gmail.com</a>&gt;</p>\n";
stream << "<p>Kilobyte &lt;<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>&gt;</p>\n";
stream << "<p>Rootbear75 &lt;<a href='https://twitter.com/rootbear75'>@rootbear75</a>&gt;</p>\n";
+ stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
stream << "<br />\n";
if(!patrons.isEmpty()) {
diff --git a/changelog.md b/changelog.md
index ef7c8dc6..e315950c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,22 @@
-# MultiMC 0.6.8
+# MultiMC 0.6.11
+
+This adds Forge 1.13+ support using [ForgeWrapper](https://github.com/ZekerZhayard/ForgeWrapper) by ZekerZhayard.
+
+### New or changed features
+
+- GH-2988: You can now import instances and curse modpacks from the command line with the `--import` option followed by either an URL or a local file path.
+
+- GH-2544: MultiMC now supports downloading library files without including them on the Java classpath.
+
+ This is done by adding them to the `mavenFiles` list instead of the `libraries` list.
+
+ Such downloads are not deduplicated or version upgraded like libraries are.
+
+ This enables ForgeWrapper to work - MultiMC downloads all the files, and ForgeWrapper runs the Forge installer during instance start when needed.
+
+# Previous releases
+
+## MultiMC 0.6.8
This is mostly about removal of the 'curse URL' related features, because they were of low quality and generally unreliable.
@@ -44,7 +62,6 @@ MultiMC also migrated to a new continuous deployment system, which makes everyth
- When a component is customized, the launcher will not try to update it in an infinite loop when something else requires a different version.
-# Previous releases
## MultiMC 0.6.7