From 3a0cdf2d3dde6192694ca34429ab277608357c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 3 Jun 2014 01:44:19 +0200
Subject: [PATCH] Tagging 0.3.6

---
 CMakeLists.txt | 2 +-
 changelog.yaml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 531f73423..345bb366c 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   5)
+set(MultiMC_VERSION_HOTFIX   6)
 
 # 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 7fb75534e..40c344d2b 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -76,3 +76,9 @@
 0.3.5
     - More versions are now selectable when changing instance versions
     - Fix for Forge/FML changing its mcmod.info metadata format
+0.3.6
+    - New server status - now with more color
+    - Fix for FTB tracking issues
+    - Fix for translations on OSX not working
+    - Screenshot dialog should be harder to lose track of when used from the console window
+    - A crash handler implementation has been added.