version 1.1.4

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@112 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/ChangeLog b/ChangeLog
index a7fe5f9a918e3c1fe4e9faae5d0db19c7d79fd25..4bf0362ddf7ed564b7888df7e7a103e3aa9b0e72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-05  Sampo Niskanen
+
+       * Released version 1.1.4
+
 2011-01-20  Sampo Niskanen
 
        * Initial i18n support

diff --git a/ReleaseNotes b/ReleaseNotes
index 613117165ae332fbfe8638ee6c7d3ecc695f75de..ec48cb9184448cbfb4ac094eb7183f08a6eea0cf 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,9 @@
+OpenRocket 1.1.4  (2011-03-05):
+-------------------------------
+
+Initial printing support by Doug Pedrick, and various bug fixes.
+
+
 OpenRocket 1.1.3  (2010-10-06):
 -------------------------------
 

diff --git a/build.properties b/build.properties
index fd13d5a763b6d91d2d4d7f9406e9e708c5512163..e145237fe48634c73d1d5e2a55bba3449b1392f2 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 
 # The OpenRocket build version
 
-build.version=1.1.4pre
+build.version=1.1.4
 
 
 # The source of the package.  When building a package for a specific

diff --git a/web/html/actions/updates.php b/web/html/actions/updates.php
index ea686483385befd13350f799d0d41bee72fccb64..0fc0577d24e052fe0db766686f9d26ddec832960 100644 (file)
--- a/web/html/actions/updates.php
+++ b/web/html/actions/updates.php
@@ -80,15 +80,21 @@ header("Content-type: text/plain");
 $version = $_GET["version"];
 $updates = "";
 
-$unstable = "1.1.3";
+$unstable = "1.1.4";
 $stable = "1.0.0";
 
-if (preg_match("/^1\.1\.[12]/", $version)) {
+if (preg_match("/^1\.1\.3/", $version)) {
   $updates = "Version: " . $unstable . "\n" .
+    "5: Initial printing support\n" .
+    "4: Bug fixes\n";
+} else if (preg_match("/^1\.1\.[12]/", $version)) {
+  $updates = "Version: " . $unstable . "\n" .
+    "6: Initial printing support\n" .
     "5: Initial drag-and-drop support\n" .
     "4: Bug fixes\n";
 } else if (preg_match("/^1\.1\.0/", $version)) {
   $updates = "Version: " . $unstable . "\n" .
+    "6: Initial printing support\n" .
     "6: Enhanced motor selection\n" .
     "5: Rewritten simulation code\n" .
     "5: Drag-and-drop support\n" .

diff --git a/web/html/download.html b/web/html/download.html
index ddb2b5be3bead929bc9e683dde699f41782978c6..c4f1ba9ed461bebb154e43b69fbaaded427d304d 100644 (file)
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -45,6 +45,11 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
+  <p><span class="date">5.3.2011:</span> Version 1.1.4 is
+    <a href="download.html">released</a>!</p>
+  <p>This release includes initial printing support, thanks to Doug
+    Pedrick.  Printing still has a few issues on some platforms.
+    Various bugs have also been fixed.</p>
   <p><span class="date">6.10.2010:</span> Version 1.1.3 is
     <a href="download.html">released</a>!</p>
   <p>This release includes support for moving and copying components
@@ -64,12 +69,6 @@
     startup times than previous releases.</p>
   <p>Simulation listeners written for older versions of OpenRocket
     are not compatible with this release.</p>
-  <p><span class="date">21.3.2010:</span> Version 1.1.0 is
-    <a href="download.html">released</a>!</p>
-  <p>This release includes the first support for loading RockSim
-    rocket design files (.RKT), thanks to contributions by Doug
-    Pedrick.  It's also the kick-off of the 1.1 development branch of
-    OpenRocket.</p>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
@@ -88,13 +87,13 @@
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.3/OpenRocket-1.1.3.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/OpenRocket-1.1.4.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.3.jar</span>
+      <span>OpenRocket-1.1.4.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.3/ReleaseNotes/view">Release notes</a> |
-            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.3/OpenRocket-1.1.3-src.zip/download">Source code</a>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/OpenRocket-1.1.4-src.zip/download">Source code</a>
     </span>
   </div>
       <h3>Stable release</h3>
@@ -111,7 +110,7 @@
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
       <p>From the command line OpenRocket can be started by
-      <span class="command">java -jar OpenRocket-1.1.3.jar</span></p>
+      <span class="command">java -jar OpenRocket-1.1.4.jar</span></p>
        
     </div>
     <div class="clear"></div>

diff --git a/web/html/index.html b/web/html/index.html
index aa10d745a8342bac831c6d0a04ade368a986e602..9200573e91ec77ff9b47f895e6ce5c19c9421ef1 100644 (file)
--- a/web/html/index.html
+++ b/web/html/index.html
@@ -46,12 +46,12 @@
     <h2>Introduction</h2>
     <div class="rightpane">
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.3/OpenRocket-1.1.3.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/OpenRocket-1.1.4.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.1.3.jar</span>
+      <span>OpenRocket-1.1.4.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.3/ReleaseNotes/view">Release notes</a> |
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.4/ReleaseNotes/view">Release notes</a> |
             <a href="download.html">Other versions</a>
     </span>
   </div>
@@ -88,6 +88,11 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
+  <p><span class="date">5.3.2011:</span> Version 1.1.4 is
+    <a href="download.html">released</a>!</p>
+  <p>This release includes initial printing support, thanks to Doug
+    Pedrick.  Printing still has a few issues on some platforms.
+    Various bugs have also been fixed.</p>
   <p><span class="date">6.10.2010:</span> Version 1.1.3 is
     <a href="download.html">released</a>!</p>
   <p>This release includes support for moving and copying components

diff --git a/web/htp/htp.def b/web/htp/htp.def
index 8fd48dea324333f44d93f8f76881ac133e41ff6f..59f4a572c3d428edfa737a89458ecaba2237b807 100644 (file)
--- a/web/htp/htp.def
+++ b/web/htp/htp.def
@@ -1,5 +1,5 @@
 <set stableversion="1.0.0">
-<set developmentversion="1.1.3">
+<set developmentversion="1.1.4">
 <set version="${developmentversion}">
 
 <def name="downloadbox">

diff --git a/web/htp/news.htp b/web/htp/news.htp
index 03938a0d666045fe7742c4fa4aaa4988e32ca0cf..c718b532ee5290a5dc6a721d8585b5f00764eca9 100644 (file)
--- a/web/htp/news.htp
+++ b/web/htp/news.htp
@@ -9,6 +9,13 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
+  <p><span class="date">5.3.2011:</span> Version 1.1.4 is 
+    <a href="download.html">released</a>!</p>
+
+  <p>This release includes initial printing support, thanks to Doug
+    Pedrick.  Printing still has a few issues on some platforms.
+    Various bugs have also been fixed.</p>
+
   <p><span class="date">6.10.2010:</span> Version 1.1.3 is 
     <a href="download.html">released</a>!</p>
 
@@ -35,6 +42,10 @@
   <p>Simulation listeners written for older versions of OpenRocket
     are not compatible with this release.</p>
 
+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+
   <p><span class="date">21.3.2010:</span> Version 1.1.0 is 
     <a href="download.html">released</a>!</p>
 
@@ -43,10 +54,6 @@
     Pedrick.  It's also the kick-off of the 1.1 development branch of
     OpenRocket.</p>
 
-
-  <if not onlyrecent><!--- Older items not shown on download page:  --->
-
-
   <p><span class="date">10.3.2010:</span> Version 1.0.0 is 
     <a href="download.html">released</a>!</p>