diff --git a/core/ChangeLog b/core/ChangeLog
index 569171ca8..0ae991aa1 100644
--- a/core/ChangeLog
+++ b/core/ChangeLog
@@ -1,4 +1,7 @@
-2013-05-21 Kevin Ruland
+2014-06-26 Kevin Ruland
+ * Released version 14.06 See Release Notes for changes.
+
+2014-05-21 Kevin Ruland
* Released version 14.05 See Release Notes for changes.
2013-11-07 Kevin Ruland
diff --git a/core/ReleaseNotes b/core/ReleaseNotes
index e853094f9..d710ddc28 100644
--- a/core/ReleaseNotes
+++ b/core/ReleaseNotes
@@ -1,3 +1,14 @@
+OpenRocket 14.06 (2014-06-25):
+------------------------------
+
+New Features:
+ * Klima motor textures
+ * Added knots to windspeed and velocity units
+ * Updated thrustcurves
+
+Bug Fixes:
+ * Fixed annoying IndexOutOfBounds bug in tables.
+
OpenRocket 14.05 (2014-05-21):
------------------------------
diff --git a/core/resources/build.properties b/core/resources/build.properties
index bb3a0d9cf..031f6c522 100644
--- a/core/resources/build.properties
+++ b/core/resources/build.properties
@@ -1,7 +1,7 @@
# The OpenRocket build version
-build.version=14.05dev
+build.version=14.06
# The source of the package. When building a package for a specific
diff --git a/core/web/html/actions/updates.php b/core/web/html/actions/updates.php
index f7f17c832..6536efe68 100644
--- a/core/web/html/actions/updates.php
+++ b/core/web/html/actions/updates.php
@@ -80,11 +80,18 @@ header("Content-type: text/plain");
$version = $_GET["version"];
$updates = "";
-$unstable = "14.05";
+$unstable = "14.06";
$stable = "1.0.0";
-if (preg_match("/^14.03$/", $version)) {
+if (preg_match("/^14.05$/", $version)) {
+ $updates = "Version: " . $unstable . "\n" .
+ "10: Added Knots to windspeed and velocity units\n" .
+ "6: Updated thrustcurves\n" .
+ "4: Added Klima motor texture\n" .
+ "4: Fixed annoying table bug\n" .
+ "";
+} else if (preg_match("/^14.03$/", $version)) {
$updates = "Version: " . $unstable . "\n" .
"10: Simulations will now compute the optimum delay for the sustainer\n" .
"10: CG and Mass overrides are now indicated in the component tree\n" .
diff --git a/core/web/html/download.html b/core/web/html/download.html
index 29a086df1..5fb1cd048 100644
--- a/core/web/html/download.html
+++ b/core/web/html/download.html
@@ -48,6 +48,9 @@
Recent news:
+
25.06.2014: Version 14.06 is
+ released! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
+
21.05.2014: Version 14.05 is
released! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern
@@ -96,20 +99,20 @@
OpenRocket can be started in most graphical environments (including
Windows) by double-clicking the package icon. No installation is
required.
From the command line OpenRocket can be started by
- java -jar OpenRocket-14.05.jar
+
java -jar OpenRocket-14.06.jar
Android version
The Android version allows opening OpenRocket files, viewing
simulations and motors. Later versions will allow running
diff --git a/core/web/html/index.html b/core/web/html/index.html
index e8c30b7ef..8c233ed63 100644
--- a/core/web/html/index.html
+++ b/core/web/html/index.html
@@ -49,12 +49,12 @@
Introduction
@@ -108,6 +108,9 @@ Profiler.
News
+
25.06.2014: Version 14.06 is
+ released! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
+
21.05.2014: Version 14.05 is
released! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern
diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def
index 2cb4022ec..6a69c77ef 100644
--- a/core/web/htp/htp.def
+++ b/core/web/htp/htp.def
@@ -1,4 +1,4 @@
-
+
diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp
index c7e047123..dabf9a4ac 100644
--- a/core/web/htp/news.htp
+++ b/core/web/htp/news.htp
@@ -9,6 +9,10 @@
+ 25.06.2014: Version 14.06 is
+ released! This release contains very minimal changes. It fixes an annoying bug in tables that many people experience. A texture is added for Klima motors.
+
+
21.05.2014: Version 14.05 is
released! This release contains some minor features,
bug fixes and updated thrust curves. New motor vendors Klima and Southern