diff --git a/ChangeLog b/ChangeLog
index 9b5e1dbe2..e7d7cb769 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-03 Sampo Niskanen
+
+ * Released version 1.1.1
+
2010-09-01 Sampo Niskanen
* [BUG] Fixed rocket config dialog being too large
diff --git a/ReleaseNotes b/ReleaseNotes
index a72db2e66..67a353ae2 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,12 @@
+OpenRocket 1.1.1 (2010-09-03):
+-------------------------------
+
+Major rewrite of the simulation code, enhanced support for thrust
+curve loading and selection, faster startup time and bug fixes.
+
+Old simulation listeners are incompatible with this release.
+
+
OpenRocket 1.1.0 (2010-03-21):
-------------------------------
diff --git a/build.properties b/build.properties
index d6f02cc79..d57884761 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
# The OpenRocket build version
-build.version=1.1.1pre
+build.version=1.1.1
# The source of the package. When building a package for a specific
diff --git a/releasing.txt b/releasing.txt
index a0b2744a7..68934ed2d 100644
--- a/releasing.txt
+++ b/releasing.txt
@@ -20,13 +20,14 @@ Steps for making a release:
- select ReleaseNotes properties, set as release notes
- select JAR properties, set release note file and default downloads
- select ZIP properties, set release note file
-11. Update HTML: index.html (release notes) download.html (version number)
-12. Update HTML to web server:
+11. Update HTML: htp/htp.def (version number) htp/news.htp (release info)
+12. Run "htp @" and check the web pages locally
+13. Update HTML to web server:
scp * plaa,openrocket@web.sourceforge.net:htdocs/
-13. Test downloading from Sourceforge and web site
-14. Update update.php to web server:
+14. Test downloading from Sourceforge and web site
+15. Update update.php to web server:
scp updates.php plaa,openrocket@web.sourceforge.net:htdocs/actions/
-15. Test update checking without specific options
-16. Update build.properties to "pre" version + commit
-17. Send email about new release to openrocket-announce@lists.sourceforge.net
+16. Test update checking without specific options
+17. Update build.properties to "pre" version + commit
+18. Send email about new release to openrocket-announce@lists.sourceforge.net
diff --git a/web/html/actions/updates.php b/web/html/actions/updates.php
index 5a8d9994a..d1936eccc 100644
--- a/web/html/actions/updates.php
+++ b/web/html/actions/updates.php
@@ -79,7 +79,7 @@ $updates = "";
if (preg_match("/^1\.1\.0/", $version)) {
$updates = "Version: 1.1.1\n" .
"6: Enhanced motor selection\n" .
- "5: Rewritten simulation code" .
+ "5: Rewritten simulation code\n" .
"4: Bug fixes";
} else if (preg_match("/^0\.9\.6/", $version)) {
$updates = "Version: 1.0.0\n" .
diff --git a/web/html/documentation.html b/web/html/documentation.html
index a686d0a6b..2ddaba523 100644
--- a/web/html/documentation.html
+++ b/web/html/documentation.html
@@ -63,12 +63,12 @@
The technical documentation is licensed under a
diff --git a/web/html/download.html b/web/html/download.html
index 3eab23121..cc5e575dc 100644
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -45,6 +45,15 @@
Recent news:
+
3.9.2010: Version 1.1.1 is
+ released!
+
For this release a major part of the simulator code has been
+ rewritten for better flexibility in future development. It also
+ includes a vastly improved thrust curve selection dialog, the
+ possibility to loading user-defined thrust curves and better
+ startup times than previous releases.
+
Simulation listeners written for older versions of OpenRocket
+ are not compatible with this release.
21.3.2010: Version 1.1.0 is
released!
This release includes the first support for loading RockSim
@@ -58,11 +67,6 @@
bug fixes. It is also a stable milestone, after which development
on larger features will be started in a 1.1 branch. Look out
for it! :-)
-
17.2.2010: Version 0.9.6 is
- released!
-
This release updates the aerodynamic calculation methods to be
- more in line with the Barrowman method and enhances the simulation
- time step selection, in addition to fixing numerous bugs.
Ready packages
@@ -81,13 +85,13 @@
Stable release
@@ -104,7 +108,7 @@
Windows) by double-clicking the package icon. No installation is
required.
From the command line OpenRocket can be started by
- java -jar OpenRocket-1.1.0.jar
+
java -jar OpenRocket-1.1.1.jar
@@ -88,6 +88,15 @@
News
+
3.9.2010: Version 1.1.1 is
+ released!
+
For this release a major part of the simulator code has been
+ rewritten for better flexibility in future development. It also
+ includes a vastly improved thrust curve selection dialog, the
+ possibility to loading user-defined thrust curves and better
+ startup times than previous releases.
+
Simulation listeners written for older versions of OpenRocket
+ are not compatible with this release.
21.3.2010: Version 1.1.0 is
released!
This release includes the first support for loading RockSim
diff --git a/web/html/update-html.sh b/web/html/update-html.sh
deleted file mode 100755
index 913a8b3c0..000000000
--- a/web/html/update-html.sh
+++ /dev/null
@@ -1 +0,0 @@
-scp *.html plaa,openrocket@web.sourceforge.net:htdocs/
diff --git a/web/htp/htp.def b/web/htp/htp.def
index a5811fa80..c432d3508 100644
--- a/web/htp/htp.def
+++ b/web/htp/htp.def
@@ -1,5 +1,5 @@
-
+
diff --git a/web/htp/news.htp b/web/htp/news.htp
index 0ba2e6760..5257bbcf6 100644
--- a/web/htp/news.htp
+++ b/web/htp/news.htp
@@ -9,6 +9,18 @@
+ 3.9.2010: Version 1.1.1 is
+ released!
+
+ For this release a major part of the simulator code has been
+ rewritten for better flexibility in future development. It also
+ includes a vastly improved thrust curve selection dialog, the
+ possibility to loading user-defined thrust curves and better
+ startup times than previous releases.
+
+ Simulation listeners written for older versions of OpenRocket
+ are not compatible with this release.
+
21.3.2010: Version 1.1.0 is
released!
@@ -26,6 +38,10 @@
on larger features will be started in a 1.1 branch. Look out
for it! :-)
+
+
+
+
17.2.2010: Version 0.9.6 is
released!
@@ -33,10 +49,6 @@
more in line with the Barrowman method and enhances the simulation
time step selection, in addition to fixing numerous bugs.
-
-
-
-
28.11.2009: Version 0.9.5 is
released!
diff --git a/web/update-html.sh b/web/update-html.sh
new file mode 100755
index 000000000..ea98bd71d
--- /dev/null
+++ b/web/update-html.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+htp @ || exit 1
+scp html/*.html plaa,openrocket@web.sourceforge.net:htdocs/