Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / resources / datafiles / thrustcurves / Cesaroni_G69_2.eng

diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng b/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
index c5d5addc63370555deb61dbd9962e6ef0e97a643..06b0f47fd852841002f00b0543d19d050387de65 100644 (file)
--- a/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
@@ -1,25 +1,14 @@
-; Pro38 G69\r
-G69 38 127 5-7-9-12 0.066500 0.2045 Pro38\r
-   0.079 79.935\r
-   0.103 72.367\r
-   0.136 82.989\r
-   0.217 85.910\r
-   0.247 82.193\r
-   0.311 84.317\r
-   0.352 80.201\r
-   0.387 82.856\r
-   0.840 72.499\r
-   0.944 72.234\r
-   0.978 69.047\r
-   1.017 71.835\r
-   1.082 67.852\r
-   1.227 66.657\r
-   1.237 65.329\r
-   1.493 62.010\r
-   1.530 59.354\r
-   1.591 60.151\r
-   1.714 56.167\r
-   1.769 54.574\r
-   1.848 46.607\r
-   1.887 27.884\r
-   1.958 00.000  \r
+;\r
+133G69  38.0 127.00 3-5-7-9-12 0.08400 0.20510 CTI\r
+   0.06      80.77 \r
+   0.20      84.50 \r
+   0.41      82.74 \r
+   0.59      80.11 \r
+   0.81      76.82 \r
+   1.00      72.87 \r
+   1.20      68.92 \r
+   1.40      64.31 \r
+   1.61      59.48 \r
+   1.82      50.92 \r
+   1.90      21.40 \r
+   1.93       0.00 \r