diff --git a/core/resources-src/datafiles/thrustcurves/manual/README.txt b/core/resources-src/datafiles/thrustcurves/manual/README.txt
index 118da962c..05e898409 100644
--- a/core/resources-src/datafiles/thrustcurves/manual/README.txt
+++ b/core/resources-src/datafiles/thrustcurves/manual/README.txt
@@ -9,6 +9,4 @@ Klima_*.eng - Thrust curves for Klima motors, created by Leo Nutz
Loki_J175.rse - Corrected motor type from hybrid to reloadable
-at130702.eng - preliminary thrustcurve for new AT C3
-at130721.eng - preliminary thrustcurve for new AT D2
diff --git a/core/resources-src/datafiles/thrustcurves/manual/at130702.eng b/core/resources-src/datafiles/thrustcurves/manual/at130702.eng
deleted file mode 100644
index 095ea4026..000000000
--- a/core/resources-src/datafiles/thrustcurves/manual/at130702.eng
+++ /dev/null
@@ -1,35 +0,0 @@
-; @File: at130702.asc, @Pts-I: 130, @Pts-O: 31, @Sm: 0, @CO: 5%
-; @TI: 8.95946, @TIa: 8.94558, @TIe: +0.07%, @ThMax: 8.26822, @ThAvg: 3.00451, @Tb: 2.982
-; Exported using ThrustCurveTool, www.ThrustGear.com
-C3 18 70 P 0.0052 0.0211 AT
- 0.024 0.121145
- 0.048 2.25634
- 0.072 6.61759
- 0.096 7.48075
- 0.12 8.11675
- 0.168 8.26822
- 0.288 7.61706
- 0.336 7.25359
- 0.36 6.84475
- 0.528 5.58781
- 0.6 5.17897
- 0.696 4.24012
- 0.72 4.11897
- 0.792 3.2255
- 0.864 2.57434
- 0.912 2.33203
- 1.176 2.01403
- 1.6559 2.02918
- 1.7999 1.908027
- 1.9199 1.968656
- 1.9439 1.862656
- 1.9679 1.968656
- 2.0879 1.968656
- 2.3999 1.802028
- 2.7359 1.908027
- 2.7839 1.756656
- 2.8079 1.847499
- 2.9279 1.544557
- 2.9759 0.802587
- 3.0239 0.287715
- 3.0959 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/manual/at130721.eng b/core/resources-src/datafiles/thrustcurves/manual/at130721.eng
deleted file mode 100644
index e50f8b645..000000000
--- a/core/resources-src/datafiles/thrustcurves/manual/at130721.eng
+++ /dev/null
@@ -1,35 +0,0 @@
-; @File: at130721.asc, @Pts-I: 538, @Pts-O: 31, @Sm: 0, @CO: 5%
-; @TI: 17.10047, @TIa: 17.06124, @TIe: +0.05%, @ThMax: 8.3068, @ThAvg: 2.05042, @Tb: 8.34
-; Exported using ThrustCurveTool, www.ThrustGear.com
-D2 18 70 P 0.0107 0.0266 AT
- 0.016 0.0453094
- 0.064 6.90221
- 0.08 7.73285
- 0.096 7.80834
- 0.112 8.2161
- 0.144 8.3068
- 0.16 8.0349
- 0.176 8.24634
- 0.192 8.00466
- 0.24 7.98954
- 0.48 6.41886
- 0.736 4.00232
- 0.784 3.20191
- 0.864 2.47688
- 1.024 2.12959
- 1.6159 2.03889
- 1.7439 1.827447
- 1.8719 1.872798
- 1.8879 2.08424
- 1.9359 1.827447
- 2.0639 1.933167
- 2.0959 1.751961
- 2.2879 1.721727
- 2.3199 1.872798
- 2.7999 1.661358
- 2.9439 1.827447
- 3.0559 1.676475
- 4.4638 1.70671
- 8.1437 1.162992
- 8.3677 0.362474
- 8.5916 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
index 434e6bb06..a7a5f5b4f 100644
--- a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt
@@ -1,5 +1,5 @@
Rocket motor simulation data downloaded from ThrustCurve.org.
-This ZIP file contains 1600 simulator data files.
+This ZIP file contains 1617 simulator data files.
For more info, please see http://www.thrustcurve.org/
AMW_I195.eng
@@ -856,6 +856,13 @@ AMW_N4000.rse
Data Source: user
Contributor: John Coker
+AeroTech_C3.eng
+ Manufacturer: AeroTech
+ Designation: C3.4
+ Data Format: RASP
+ Data Source: cert
+ Contributor: John Coker
+
AeroTech_D10.eng
Manufacturer: AeroTech
Designation: D10
@@ -891,6 +898,13 @@ AeroTech_D15.rse
Data Source: user
Contributor: John Coker
+AeroTech_D2.eng
+ Manufacturer: AeroTech
+ Designation: D2.3
+ Data Format: RASP
+ Data Source: cert
+ Contributor: John Coker
+
AeroTech_D21.eng
Manufacturer: AeroTech
Designation: D21
@@ -1367,6 +1381,13 @@ AeroTech_F42.rse
Data Source: user
Contributor: John Coker
+AeroTech_F44.eng
+ Manufacturer: AeroTech
+ Designation: F44W
+ Data Format: RASP
+ Data Source: mfr
+ Contributor: Mark Koelsch
+
AeroTech_F50.eng
Manufacturer: AeroTech
Designation: F50
@@ -1689,6 +1710,13 @@ AeroTech_G71_1.eng
Data Source: mfr
Contributor: Edward K. Chess
+AeroTech_G74.eng
+ Manufacturer: AeroTech
+ Designation: G74W
+ Data Format: RASP
+ Data Source: mfr
+ Contributor: Mark Koelsch
+
AeroTech_G75.eng
Manufacturer: AeroTech
Designation: G75J
@@ -1955,6 +1983,13 @@ AeroTech_H180.rse
Data Source: user
Contributor: John Coker
+AeroTech_H182.eng
+ Manufacturer: AeroTech
+ Designation: H182R-14A
+ Data Format: RASP
+ Data Source: user
+ Contributor: Mike Caplinger
+
AeroTech_H195.eng
Manufacturer: AeroTech
Designation: H195NT-10A
@@ -2055,10 +2090,10 @@ AeroTech_H268.rse
AeroTech_H45.eng
Manufacturer: AeroTech
- Designation: H45W
+ Designation: H45W-10A
Data Format: RASP
- Data Source: cert
- Contributor: John Coker
+ Data Source: user
+ Contributor: Mike Caplinger
AeroTech_H45.rse
Manufacturer: AeroTech
@@ -2067,6 +2102,13 @@ AeroTech_H45.rse
Data Source: user
Contributor: John Coker
+AeroTech_H45_1.eng
+ Manufacturer: AeroTech
+ Designation: H45W
+ Data Format: RASP
+ Data Source: cert
+ Contributor: John Coker
+
AeroTech_H55.eng
Manufacturer: AeroTech
Designation: H55W
@@ -2270,6 +2312,13 @@ AeroTech_I200.rse
Data Source: user
Contributor: John Coker
+AeroTech_I205.eng
+ Manufacturer: AeroTech
+ Designation: I205W-14A
+ Data Format: RASP
+ Data Source: user
+ Contributor: Mike Caplinger
+
AeroTech_I211.eng
Manufacturer: AeroTech
Designation: I211W
@@ -2545,10 +2594,10 @@ AeroTech_I600.rse
AeroTech_I65.eng
Manufacturer: AeroTech
- Designation: I65W
+ Designation: I65W-10A
Data Format: RASP
- Data Source: cert
- Contributor: John Coker
+ Data Source: user
+ Contributor: Mike Caplinger
AeroTech_I65.rse
Manufacturer: AeroTech
@@ -2557,6 +2606,13 @@ AeroTech_I65.rse
Data Source: user
Contributor: John Coker
+AeroTech_I65_1.eng
+ Manufacturer: AeroTech
+ Designation: I65W
+ Data Format: RASP
+ Data Source: cert
+ Contributor: John Coker
+
AeroTech_J125.eng
Manufacturer: AeroTech
Designation: J125W
@@ -2613,6 +2669,13 @@ AeroTech_J145.rse
Data Source: user
Contributor: John Coker
+AeroTech_J170.eng
+ Manufacturer: AeroTech
+ Designation: J170H 3-jet std.
+ Data Format: RASP
+ Data Source: user
+ Contributor: Jesus Manuel Recuenco
+
AeroTech_J180.eng
Manufacturer: AeroTech
Designation: J180T
@@ -2795,6 +2858,13 @@ AeroTech_J420.rse
Data Source: user
Contributor: John Coker
+AeroTech_J425.eng
+ Manufacturer: AeroTech
+ Designation: J425R-14A
+ Data Format: RASP
+ Data Source: user
+ Contributor: Mike Caplinger
+
AeroTech_J460.eng
Manufacturer: AeroTech
Designation: J460T
@@ -3117,6 +3187,13 @@ AeroTech_K513.eng
Data Source: user
Contributor: John Coker
+AeroTech_K535.eng
+ Manufacturer: AeroTech
+ Designation: K535W-14A
+ Data Format: RASP
+ Data Source: user
+ Contributor: Mike Caplinger
+
AeroTech_K540.rse
Manufacturer: AeroTech
Designation: K540M
@@ -3250,6 +3327,13 @@ AeroTech_K828.rse
Data Source: cert
Contributor: Victor Merle Barlow
+AeroTech_L1000.eng
+ Manufacturer: AeroTech
+ Designation: L1000W-18A
+ Data Format: RASP
+ Data Source: user
+ Contributor: Mike Caplinger
+
AeroTech_L1040.eng
Manufacturer: AeroTech
Designation: L1040DM
@@ -9571,6 +9655,13 @@ GR_M1665.eng
Data Source: mfr
Contributor: John Coker
+GR_O2700.eng
+ Manufacturer: Gorilla Rocket Motors
+ Designation: O2700BL
+ Data Format: RASP
+ Data Source: cert
+ Contributor: Mark Koelsch
+
Hypertek_I130.eng
Manufacturer: Hypertek
Designation: 300CC098J - I130
@@ -10719,6 +10810,13 @@ PP_J140.eng
Data Source: user
Contributor: John Coker
+Quest_A3.eng
+ Manufacturer: Quest Aerospace
+ Designation: A3T
+ Data Format: RASP
+ Data Source: cert
+ Contributor: Howard Smart
+
Quest_A6.eng
Manufacturer: Quest Aerospace
Designation: A6
@@ -10971,6 +11069,27 @@ Roadrunner_G80.rse
Data Source: mfr
Contributor: Roadrunner Rocketry
+SCR_A3.rse
+ Manufacturer: Southern Cross Rocketry
+ Designation: SCR-A8
+ Data Format: RockSim
+ Data Source: mfr
+ Contributor: John Coker
+
+SCR_B4.rse
+ Manufacturer: Southern Cross Rocketry
+ Designation: SCR-B6
+ Data Format: RockSim
+ Data Source: mfr
+ Contributor: John Coker
+
+SCR_C3.rse
+ Manufacturer: Southern Cross Rocketry
+ Designation: SCR-C6
+ Data Format: RockSim
+ Data Source: mfr
+ Contributor: John Coker
+
SkyR_G125.eng
Manufacturer: Sky Ripper Systems
Designation: G125
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_C3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_C3.eng
new file mode 100644
index 000000000..d7f6c7152
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_C3.eng
@@ -0,0 +1,31 @@
+; Aerotech C3.4-PT RASP.ENG file made from NAR published data
+; File produced, 2013
+; The total impulse, peak thrust, average thrust and burn time are
+; the same as the averaged static test data on the NAR web site in
+; the certification file. The curve drawn with these data points is as
+; close to the certification curve as can be with such a limited
+; number of points (32) allowed with wRASP up to v1.6.
+C3.4 18 72 0, .0052 .0239 A
+0.023 3.188
+0.028 5.669
+0.093 9.080
+0.235 8.208
+0.427 6.881
+0.513 6.188
+0.600 5.438
+0.666 4.803
+0.762 3.649
+0.838 2.668
+0.970 2.149
+1.228 1.918
+1.522 1.918
+1.800 1.860
+2.013 1.745
+2.068 2.034
+2.134 1.803
+2.326 1.803
+2.509 1.745
+2.645 1.687
+2.721 1.457
+2.807 0.879
+2.860 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D2.eng
new file mode 100644
index 000000000..7d6ad4e71
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D2.eng
@@ -0,0 +1,34 @@
+; Aerotech D2.3-PT RASP.ENG file made from NAR published data
+; File produced, 2013
+; The total impulse, peak thrust, average thrust and burn time are
+; the same as the averaged static test data on the NAR web site in
+; the certification file. The curve drawn with these data points is as
+; close to the certification curve as can be with such a limited
+; number of points (32) allowed with wRASP up to v1.6.
+D2.3 18 72 0, .0107 .0293 A
+0.020 5.071
+0.039 9.478
+0.093 10.140
+0.184 9.478
+0.275 8.429
+0.438 6.820
+0.657 4.372
+0.747 3.392
+0.838 2.413
+1.056 2.064
+1.365 1.923
+1.892 1.783
+2.528 1.713
+2.946 1.713
+3.219 1.643
+4.091 1.573
+4.727 1.573
+5.218 1.573
+5.636 1.573
+6.217 1.573
+6.726 1.433
+7.199 1.503
+7.635 1.363
+7.907 1.224
+8.016 0.734
+8.140 0.000
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H182.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H182.eng
new file mode 100644
index 000000000..bacab0f50
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H182.eng
@@ -0,0 +1,15 @@
+; From AT DMS announcement May 2014.
+H182 29 203.2 14 0.115 0.20700000000000002 AT
+ 0.007 82.404
+ 0.031 159.208
+ 0.091 158.408
+ 0.186 182.409
+ 0.5 192.009
+ 0.904 188.809
+ 1.054 175.209
+ 1.106 180.809
+ 1.144 200.81
+ 1.163 162.408
+ 1.201 36.802
+ 1.212 16.801
+ 1.235 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng
new file mode 100644
index 000000000..b8b3ad9cf
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45_1.eng
@@ -0,0 +1,13 @@
+; From AT DMS announcement May 2014.
+H45 38 202.7 10 0.18 0.364 AT
+ 0.04 84.004
+ 0.854 86.004
+ 1.377 84.804
+ 2.046 79.204
+ 2.69 66.003
+ 3.286 51.603
+ 4.414 28.401
+ 5.042 16.001
+ 5.429 9.2
+ 6.113 6.4
+ 6.186 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I205.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I205.eng
new file mode 100644
index 000000000..f1130bdd1
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I205.eng
@@ -0,0 +1,17 @@
+; From AT DMS announcement May 2014.
+I205 29 304.8 14 0.188 0.315 AT
+ 0.008 377.299
+ 0.028 241.932
+ 0.36 256.333
+ 0.711 246.252
+ 0.861 233.292
+ 1.121 230.411
+ 1.146 214.571
+ 1.242 211.69
+ 1.349 141.127
+ 1.404 125.286
+ 1.489 72.004
+ 1.602 41.762
+ 1.712 11.521
+ 1.787 12.961
+ 1.892 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng
new file mode 100644
index 000000000..4808b3e45
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65_1.eng
@@ -0,0 +1,15 @@
+; From AT DMS announcement May 2014.
+I65 54 218 10 0.377 0.752 AT
+ 0.023 148.274
+ 0.211 196.341
+ 0.398 167.827
+ 0.797 149.903
+ 1.395 135.239
+ 2.238 122.204
+ 3.199 99.392
+ 4.711 69.249
+ 5.367 48.882
+ 6.246 29.329
+ 6.926 15.479
+ 7.395 11.406
+ 8.496 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J425.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J425.eng
new file mode 100644
index 000000000..e2eb7c451
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J425.eng
@@ -0,0 +1,15 @@
+; From AT DMS announcement May 2014.
+J425 38 356.4 14 0.364 0.631 AT
+ 0.018 267.857
+ 0.062 368.062
+ 0.242 420.092
+ 0.524 443.216
+ 0.902 452.851
+ 1.225 448.997
+ 1.389 433.581
+ 1.502 452.851
+ 1.53 420.092
+ 1.542 356.5
+ 1.599 67.446
+ 1.618 28.905
+ 1.648 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K535.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K535.eng
new file mode 100644
index 000000000..ba6dc007f
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K535.eng
@@ -0,0 +1,21 @@
+; revised per AT post on TRF 5/19/14
+K535 54 358.1 14 0.745 1.264 AT
+ 0.015 467.288
+ 0.063 642.221
+ 0.104 613.465
+ 0.23 627.843
+ 0.419 620.654
+ 0.883 623.05
+ 1.335 599.087
+ 1.646 555.953
+ 1.843 500.837
+ 2.017 450.513
+ 2.258 404.983
+ 2.488 366.641
+ 2.6 230.049
+ 2.611 172.537
+ 2.648 124.61
+ 2.696 81.476
+ 2.789 40.738
+ 2.837 9.585
+ 2.952 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1000.eng
new file mode 100644
index 000000000..4ee0a57e9
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1000.eng
@@ -0,0 +1,26 @@
+; per AT announcement 5/8/14
+L1000 54 635 18 1.4000000000000001 2.194 AT
+ 0.004 10.664
+ 0.011 1268.961
+ 0.04 1322.279
+ 0.195 1226.307
+ 0.249 1268.961
+ 0.296 1242.303
+ 0.372 1252.966
+ 0.416 1215.644
+ 0.6 1226.307
+ 0.788 1215.644
+ 1.066 1183.653
+ 1.261 1167.658
+ 1.507 1125.004
+ 1.746 1087.681
+ 1.865 1050.359
+ 1.995 1045.027
+ 2.093 911.733
+ 2.158 746.448
+ 2.263 554.504
+ 2.389 405.215
+ 2.577 191.944
+ 2.693 85.308
+ 2.761 42.654
+ 3.0 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse
new file mode 100644
index 000000000..aef205f3a
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A3.eng
new file mode 100644
index 000000000..27b627e96
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A3.eng
@@ -0,0 +1,27 @@
+;Quest A3T
+;File produced by Howard Smart from NAR certification thrust curve
+;9 May 2014
+A3T 13 55 2-4 0.0036 0.009 Q
+0.0925926 0.494186
+0.123457 0.988372
+0.192901 2.73256
+0.243056 1.51163
+0.25463 1.2936
+0.281636 1.13372
+0.320216 1.03198
+0.37037 0.901163
+0.401235 0.799419
+0.455247 0.843023
+0.505401 0.799419
+0.748457 0.784884
+0.841049 0.799419
+0.914352 0.65407
+1.00309 0.712209
+1.25386 0.625
+1.50077 0.697674
+1.7554 0.741279
+2.00231 0.770349
+2.05633 0.741279
+2.07562 0.56686
+2.1 0
+;
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_A3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_A3.rse
new file mode 100644
index 000000000..5e4f94e06
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_A3.rse
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_B4.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_B4.rse
new file mode 100644
index 000000000..9680f7e5a
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_B4.rse
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_C3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_C3.rse
new file mode 100644
index 000000000..2e72864e5
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SCR_C3.rse
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/resources/datafiles/thrustcurves/thrustcurves.ser b/core/resources/datafiles/thrustcurves/thrustcurves.ser
index 06aa44c3c..ad93aa276 100644
Binary files a/core/resources/datafiles/thrustcurves/thrustcurves.ser and b/core/resources/datafiles/thrustcurves/thrustcurves.ser differ
diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 5b11d87b7..6f4be16fb 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1543,7 +1543,6 @@ Warning.SUPERSONIC = Body calculations may not be entirely accurate at supersoni
Warning.RECOVERY_LAUNCH_ROD = Recovery device device deployed while on the launch guide.
Warning.RECOVERY_HIGH_SPEED = Recovery device deployment at high speed
Warning.TUMBLE_UNDER_THRUST = Stage began to tumble under thrust.
-Warning.TUMBLE_BEFORE_APOGEE = Sustainer became unstable before apogee.
! Scale dialog
diff --git a/core/src/net/sf/openrocket/aerodynamics/Warning.java b/core/src/net/sf/openrocket/aerodynamics/Warning.java
index 44b0a3d85..fc0dcd6cd 100644
--- a/core/src/net/sf/openrocket/aerodynamics/Warning.java
+++ b/core/src/net/sf/openrocket/aerodynamics/Warning.java
@@ -329,6 +329,4 @@ public abstract class Warning {
public static final Warning TUMBLE_UNDER_THRUST =
new Other(trans.get("Warning.TUMBLE_UNDER_THRUST"));
- public static final Warning TUMBLE_BEFORE_APOGEE =
- new Other(trans.get("Warning.TUMBLE_BEFORE_APOGEE"));
}
diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index ab3e35435..23f8cf58c 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -223,12 +223,10 @@ public class BasicEventSimulationEngine implements SimulationEngine {
if (wantToTumble) {
final boolean tooMuchThrust = t > THRUST_TUMBLE_CONDITION;
final boolean isSustainer = status.getConfiguration().isStageActive(0);
- final boolean notUntilApogee = isSustainer && !status.isApogeeReached();
+ final boolean isApogee = status.isApogeeReached();
if (tooMuchThrust) {
status.getWarnings().add(Warning.TUMBLE_UNDER_THRUST);
- } else if (notUntilApogee) {
- status.getWarnings().add(Warning.TUMBLE_BEFORE_APOGEE);
- } else {
+ } else if (isApogee) {
addEvent(new FlightEvent(FlightEvent.Type.TUMBLE, status.getSimulationTime()));
status.setTumbling(true);
}