From d0fb4736aa1b212dff7a33059767243f3e0224b1 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Thu, 21 Jul 2016 19:13:23 -0700
Subject: [PATCH] final tweaks for 1.2.

---
 desktop/build-zip.sh     |  6 +++---
 desktop/last-release     |  2 +-
 desktop/project.clj      |  2 +-
 desktop/release-notes.md | 13 +++++++++++++
 desktop/release.sh       |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 desktop/release-notes.md

diff --git a/desktop/build-zip.sh b/desktop/build-zip.sh
index 77a29e0a..08dd7771 100755
--- a/desktop/build-zip.sh
+++ b/desktop/build-zip.sh
@@ -8,9 +8,9 @@ cd target
 mv osx "Tick's Tales - OS X"
 mv linux "Tick's Tales - Linux"
 mv windows "Tick's Tales - Windows"
-zip -r linux-1.1.`cat ../last-release`.zip  "Tick's Tales - Linux"
-zip -r osx-1.1.`cat ../last-release`.zip "Tick's Tales - OS X"
-zip -r windows-1.1.`cat ../last-release`.zip  "Tick's Tales - Windows"
+zip -r linux-1.2.`cat ../last-release`.zip  "Tick's Tales - Linux"
+zip -r osx-1.2.`cat ../last-release`.zip "Tick's Tales - OS X"
+zip -r windows-1.2.`cat ../last-release`.zip  "Tick's Tales - Windows"
 popd
 rm ~/Dropbox/TicksTalesBuilds/*.zip
 cp target/*.zip ~/Dropbox/TicksTalesBuilds/
diff --git a/desktop/last-release b/desktop/last-release
index 45a4fb75..0cfbf088 100644
--- a/desktop/last-release
+++ b/desktop/last-release
@@ -1 +1 @@
-8
+2
diff --git a/desktop/project.clj b/desktop/project.clj
index 28516254..ad4ffdea 100644
--- a/desktop/project.clj
+++ b/desktop/project.clj
@@ -1,4 +1,4 @@
-(def version (str "1.1." (clojure.string/trim-newline (slurp "last-release"))))
+(def version (str "1.2." (clojure.string/trim-newline (slurp "last-release"))))
 
 (defproject advent version
   :description "FIXME: write description"
diff --git a/desktop/release-notes.md b/desktop/release-notes.md
new file mode 100644
index 00000000..91c53904
--- /dev/null
+++ b/desktop/release-notes.md
@@ -0,0 +1,13 @@
+1.1.6
+* Fixed issue with mints eaten count being reset
+* Added a music staff to correspond with the safe
+* Added an inventory item after spying on Gandarf twice
+* Improved the sheep's hitbox and rotated the carrot cursor
+* Made the bull and flies more interchangeable.
+* Added a warning about missing the cream if you try to add the slobber
+* Added a message about missing cream when looking at mushrooms in flask
+* Added a couple of cat hints
+* Tweaked dialogue when spying on Gandarf through window
+* Fixed "sheey's milk" typo
+* Won't face grandma on ladder
+* Drinking strength potion outside jail won't send you to jail
diff --git a/desktop/release.sh b/desktop/release.sh
index 69c6aaf2..fb8bd52e 100755
--- a/desktop/release.sh
+++ b/desktop/release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 gawk -i inplace '  { print $1+1; } ' last-release
-git tag -a v1.1.`cat last-release` -m "tagging version 1.1.`cat last-release`"
+git tag -a v1.2.`cat last-release` -m "tagging version 1.2.`cat last-release`"
 lein with-profile steam do clean, compile, uberjar
 java -jar packr.jar build-windows.json
 java -jar packr.jar build-osx.json