GH-932 update version and changelog for 0.4.6

2 files changed, 66 insertions, 2 deletions

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 7ec96e5d..f0dc8460 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -6,7 +6,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	 4)
-set(MultiMC_VERSION_HOTFIX   5)
+set(MultiMC_VERSION_HOTFIX   6)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -109,7 +109,7 @@ if(UNIX AND APPLE)
 	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
 	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}.${MultiMC_VERSION_BUILD}")
 	set(MACOSX_BUNDLE_ICON_FILE MultiMC.icns)
-	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2014 MultiMC Contributors")
+	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2015 MultiMC Contributors")
 elseif(UNIX)
 	set(BINARY_DEST_DIR bin)
 	set(PLUGIN_DEST_DIR plugins)
diff --git a/changelog.md b/changelog.md
index 8e3d26bf..6b13f1b5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,69 @@
 #MultiMC Changelog
 
+##0.4.6
+- Improved handling of LWJGL on OSX
+- Downloads now always follow redirects
+- Changed default console font to Courier 10pt on Windows
+- Status icons now:
+  - Include a 'yellow' one
+  - Are clickable na link to [help.mojang.com](https://help.mojang.com/)
+  - Refresh when the icon theme does
+- Minecraft windows size is now always at least 1x1 pixel (prevents crash from bad settings)
+- Jar mods are now always put into a generated temporaty Minecraft jar instead of being put on the classpath
+- Better handling of Forge downloads (obviously invalid/broken files are redownloaded)
+- Mod lists are updated and sorted after adding mods
+- Log uploads now follow the maximum allowed paste sizes of paste.ee and are encoded properly
+- Icon themes can be changed without restarting
+- All download tasks now only start 6 downloads, using a queue (fixes issues with assets downloads)
+- Blocked various environment variables from affecting Minecraft:
+  - "JAVA_ARGS",
+  - "CLASSPATH",
+  - "CONFIGPATH",
+  - "JAVA_HOME",
+  - "JRE_HOME",
+  - "_JAVA_OPTIONS",
+  - "JAVA_OPTIONS",
+  - "JAVA_TOOL_OPTIONS"
+- Generally improved MultiMC logging:
+  - More error logging for network tasks
+  - Added timestamps relative to application start
+- Changed default PermGen value to 128M because of many issues from new users
+- MultiMC now doesn't use a proxy by default
+- Fixed bugs related to corrupted settings files (settings and patch order file saves are now atomic)
+- Added a workaround for icon themes broken in KDE Plasma 5 (only relevant for custom builds)
+- Updated zip manipulation library - files inside newly written zip/jar files should have proper access rights and timestamps
+- Implemented simple modpack import and export feature:
+  - Export allows selecting which files go into the resulting zip archive
+  - Only MultiMC instances for now, other pack formats are planned
+  - Import is either from local file or URL, URL can't have ad/click/pay gates
+- Made Minecraft resource downloads more resilient (throwing away invalid/broken index files)
+- MCEdit tool now recognizes MCEdit2.exe as a valid file to runtime
+- Massive internal restructuring
+- Inserted blatant self-promotion (Only Minecraft 1.8 and up)
+- Minecraft asset import from old format has been removed
+- Running profilers now works on Windows
+- Instance copy doesn't follow symlinks on Linux anymore
+  - Still does on Windows because copying symlinks requires Administrator level access
+- Instance delete doesn't follow symlinks anymore - anywhere
+- Fixed issue with the application getting stuck in a modal dialog when screenshot uploads fail
+- Description text in the main window status bar now updates when Minecraft version is changed
+- Instance profiles and patches are now loaded lazily (speeds up MultiMC start)
+- Groups are saved after copying an instance
+- MultiMC will warn you if you run it from WinRAR or temporary folders
+- Log page now has a button to scroll to bottom
+- Version lists:
+  - All version lists now include latest and recommended versions - recommended are pre-selected
+  - Java version list now sorts versions based on suitability - best on top
+  - Forge version list includes the development branch the version came from
+  - Minecraft list marks latest release as 'recommended' and latest snapshot as 'latest', if it is newer than the release
+- Improved wording of instance delete dialog
+- Errors are reported while updating the instance in the Version page
+- MultiMC launcher part will now exit cleanly when MultiMC crashes or is closed during instance launch
+- MultiMC now recognizes the Java version used and will not add PermGen settings to Java >= 1.8
+- Mod list browse buttons now properly open the central mods folder
+- Fixed typos (forge -> Forge)
+- Mod folder lists are no longer watching for updates when the user doesn't look at them
+
 ##0.4.5
 - Copies of FTB instances should work again (GH-619)
 - Fixed OSX version not including the hotfix number