From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 12 Sep 2012 01:53:50 +0000 (+0000)
Subject: Updated motor files from thrustcurve download.   Added correction files for Quest... 
X-Git-Tag: upstream/12.09^2~10
X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=commitdiff_plain;h=0fefd5fe265ebd30d2a05415153e98ff9d79c08a

Updated motor files from thrustcurve download.   Added correction files for Quest D5 and Micro_Maxx_II.

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

diff --git a/core/resources-src/datafiles/thrustcurves/Quest_D5_1.eng b/core/resources-src/datafiles/thrustcurves/Quest_D5_1.eng
new file mode 100644
index 00000000..d1226505
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/Quest_D5_1.eng
@@ -0,0 +1,35 @@
+; QUEST D5 RASP.ENG FILE
+; 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.
+D5 20 96 4-6 0.0240 0.0451 QUEST
+0.010 1.014
+0.122 2.652
+0.172 4.836
+0.273 7.723
+0.331 10.610
+0.390 13.809
+0.448 16.800
+0.480 12.403
+0.484 8.266
+0.517 5.221
+0.713 4.125
+0.974 4.121
+1.135 3.338
+1.324 3.101
+1.550 3.254
+1.971 3.169
+2.393 3.162
+2.752 3.391
+3.069 3.386
+3.547 3.301
+3.694 3.064
+3.948 3.294
+4.215 3.290
+4.412 3.287
+4.496 2.505
+4.586 1.801
+4.610 0.000
+;
diff --git a/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng b/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng
new file mode 100644
index 00000000..274c2319
--- /dev/null
+++ b/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng
@@ -0,0 +1,39 @@
+; Traced from NAR certification data dated 1-29-2009
+MicroMaxxII 6 26 1 5.0E-4 0.0010 Q
+   0.021 0.015
+   0.036 0.05
+   0.043 0.103
+   0.049 0.198
+   0.08 1.636
+   0.092 1.3
+   0.109 0.995
+   0.124 0.805
+   0.133 0.442
+   0.143 0.301
+   0.164 0.21
+   0.186 0.149
+   0.199 0.183
+   0.235 0.145
+   0.256 0.145
+   0.293 0.149
+   0.327 0.164
+   0.367 0.156
+   0.387 0.175
+   0.409 0.183
+   0.431 0.191
+   0.461 0.21
+   0.474 0.202
+   0.49 0.217
+   0.505 0.175
+   0.513 0.198
+   0.537 0.172
+   0.553 0.175
+   0.602 0.156
+   0.623 0.175
+   0.644 0.183
+   0.674 0.21
+   0.689 0.191
+   0.697 0.229
+   0.731 0.21
+   0.753 0.092
+   0.771 0.0
diff --git a/core/resources-src/datafiles/thrustcurves/README.txt b/core/resources-src/datafiles/thrustcurves/README.txt
index 3c6da043..7adea3ab 100644
--- a/core/resources-src/datafiles/thrustcurves/README.txt
+++ b/core/resources-src/datafiles/thrustcurves/README.txt
@@ -7,3 +7,6 @@ SF_*.eng - Thrust curves for Weco Feuerwerk motors, created by Sampo N.
 
 Loki_J175.rse - Corrected motor type from hybrid to reloadable
 
+Quest_D5_1.eng - Corrected motor mass from .451 to .0451
+
+Quest_Micro_Maxx_II.eng - Removed "NE" from delays since OR cannot handle it.
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_H178.eng b/core/resources/datafiles/thrustcurves/AeroTech_H178.eng
new file mode 100644
index 00000000..c0564edb
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_H178.eng
@@ -0,0 +1,35 @@
+; H178-14 Dark Matter
+H178DM 38 191 14 0.177 0.324 AT
+   0.016 132.659
+   0.099 165.726
+   0.146 162.97
+   0.201 163.364
+   0.256 164.938
+   0.301 168.481
+   0.358 173.205
+   0.401 176.354
+   0.457 177.929
+   0.498 183.046
+   0.6 198.792
+   0.635 204.303
+   0.703 204.303
+   0.799 215.719
+   0.901 210.602
+   0.999 211.783
+   1.049 205.09
+   1.098 206.271
+   1.202 196.824
+   1.297 178.322
+   1.351 172.811
+   1.404 178.322
+   1.434 186.195
+   1.499 125.574
+   1.539 71.25
+   1.566 44.876
+   1.582 31.492
+   1.601 27.949
+   1.606 16.533
+   1.617 18.895
+   1.644 8.66
+   1.684 4.33
+   1.735 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_I327.eng b/core/resources/datafiles/thrustcurves/AeroTech_I327.eng
new file mode 100644
index 00000000..b768e069
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_I327.eng
@@ -0,0 +1,25 @@
+; I327-14 Dark Matter
+I327DM 38 337 14 0.354 0.628 AT
+   0.0090 393.741
+   0.026 432.602
+   0.161 387.142
+   0.245 382.742
+   0.303 371.011
+   0.601 372.477
+   0.702 371.011
+   0.798 375.41
+   0.983 371.744
+   1.04 370.278
+   1.104 371.744
+   1.199 343.148
+   1.3 335.816
+   1.335 357.813
+   1.365 327.751
+   1.399 265.427
+   1.428 185.505
+   1.451 156.91
+   1.493 112.183
+   1.553 68.19
+   1.601 32.262
+   1.656 11.732
+   1.723 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_I350.eng b/core/resources/datafiles/thrustcurves/AeroTech_I350.eng
new file mode 100644
index 00000000..224051dd
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_I350.eng
@@ -0,0 +1,30 @@
+; Aerotech I350-10R single use motor file created using Aerotech instruction
+; sheet data and thrust tracer utility.
+I350-10R 38 356 P 0.34800000000000003 0.616 AT
+   0.0040 2.809
+   0.0080 207.896
+   0.031 272.512
+   0.035 359.603
+   0.046 407.363
+   0.081 432.648
+   0.104 435.457
+   0.127 427.029
+   0.184 435.457
+   0.223 443.886
+   0.299 469.17
+   0.399 480.408
+   0.503 486.027
+   0.603 474.789
+   0.702 469.17
+   0.802 457.933
+   0.906 443.886
+   1.002 432.648
+   1.098 415.792
+   1.205 390.507
+   1.298 368.032
+   1.401 345.556
+   1.443 325.891
+   1.497 216.324
+   1.532 101.138
+   1.57 33.713
+   1.605 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_K1103.eng b/core/resources/datafiles/thrustcurves/AeroTech_K1103.eng
new file mode 100644
index 00000000..2a8d8fa7
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_K1103.eng
@@ -0,0 +1,26 @@
+; K1103X Propellant X
+K1103X 54 401 14 0.8300000000000001 1.459 AT
+   0.012 1335.712
+   0.016 1505.168
+   0.028 1619.8
+   0.045 1500.184
+   0.081 1393.028
+   0.151 1330.728
+   0.201 1305.808
+   0.399 1280.888
+   0.602 1243.508
+   0.803 1196.16
+   1.001 1143.828
+   1.203 1074.052
+   1.296 1041.656
+   1.384 1031.688
+   1.408 1004.276
+   1.423 961.912
+   1.438 839.804
+   1.46 737.632
+   1.49 510.86
+   1.505 446.068
+   1.603 176.932
+   1.608 209.328
+   1.638 97.188
+   1.688 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_K456.eng b/core/resources/datafiles/thrustcurves/AeroTech_K456.eng
new file mode 100644
index 00000000..10d1f294
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_K456.eng
@@ -0,0 +1,32 @@
+; K456 Dark Matter
+K456DM-14A 54 401 14 0.866 1.484 AT
+   0.027 444.074
+   0.038 519.582
+   0.066 482.95
+   0.129 461.269
+   0.302 467.998
+   0.389 468.745
+   0.499 476.969
+   0.655 476.221
+   0.798 483.697
+   0.946 488.93
+   1.096 499.397
+   1.401 500.892
+   1.603 503.882
+   1.801 501.64
+   1.905 498.649
+   2.1 485.94
+   2.302 456.036
+   2.404 435.851
+   2.505 420.151
+   2.574 398.471
+   2.607 373.052
+   2.645 356.605
+   2.703 289.321
+   2.768 178.676
+   2.804 123.354
+   2.837 88.964
+   2.875 50.837
+   2.908 24.671
+   2.957 10.466
+   3.037 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_L1040.eng b/core/resources/datafiles/thrustcurves/AeroTech_L1040.eng
new file mode 100644
index 00000000..77fe97ea
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_L1040.eng
@@ -0,0 +1,29 @@
+; L1040 Dark Matter
+L1040DM-P 75 681 P 2.602 4.7170000000000005 AT
+   0.018 1126.167
+   0.042 1036.413
+   0.053 1002.543
+   0.116 988.995
+   0.504 1049.961
+   0.794 1095.685
+   1.002 1146.489
+   1.252 1192.213
+   1.499 1237.937
+   1.753 1261.646
+   1.912 1268.42
+   2.095 1254.872
+   2.511 1134.635
+   2.772 1056.734
+   3.012 966.98
+   3.153 933.11
+   3.217 863.677
+   3.291 817.953
+   3.34 758.681
+   3.488 438.613
+   3.552 284.505
+   3.598 220.153
+   3.657 167.655
+   3.746 118.544
+   3.88 42.337
+   3.996 6.774
+   4.127 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_L339.eng b/core/resources/datafiles/thrustcurves/AeroTech_L339.eng
index 12ebe819..1fd9aea1 100644
--- a/core/resources/datafiles/thrustcurves/AeroTech_L339.eng
+++ b/core/resources/datafiles/thrustcurves/AeroTech_L339.eng
@@ -1,6 +1,6 @@
-; Entered by Tim Van Milligan. Used John Coker's ThrustCurve Tracer software and
-; data supplied by Aerotech thrust stand data. The total weight is a guess.
-L339N 98 309 4 1.796 4.5 Aerotech
+;This file is identical to Tim Van Milligan's L339 file except the motor and
+; propellant weights have been corrected.  Total weight was about 50% too high.
+L339N 98 309 4 1.355 3.15 Aerotech
    0.049 2.884
    0.074 373.449
    0.123 399.403
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_L339_1.eng b/core/resources/datafiles/thrustcurves/AeroTech_L339_1.eng
new file mode 100644
index 00000000..12ebe819
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_L339_1.eng
@@ -0,0 +1,69 @@
+; Entered by Tim Van Milligan. Used John Coker's ThrustCurve Tracer software and
+; data supplied by Aerotech thrust stand data. The total weight is a guess.
+L339N 98 309 4 1.796 4.5 Aerotech
+   0.049 2.884
+   0.074 373.449
+   0.123 399.403
+   0.156 408.054
+   0.279 415.984
+   0.427 417.426
+   0.476 421.031
+   0.509 416.705
+   0.632 415.984
+   0.837 414.542
+   0.894 418.868
+   0.943 405.17
+   1.026 400.124
+   1.124 402.286
+   1.255 397.961
+   1.362 392.914
+   1.51 391.472
+   1.575 394.356
+   1.592 385.705
+   1.657 387.147
+   1.838 384.984
+   2.026 382.821
+   2.174 379.937
+   2.404 377.053
+   2.478 378.495
+   2.552 377.053
+   2.617 378.495
+   2.683 366.96
+   2.773 359.751
+   2.806 363.355
+   2.937 359.751
+   3.232 351.099
+   3.314 355.425
+   3.356 351.099
+   3.815 345.332
+   3.979 340.285
+   4.233 336.681
+   4.414 333.797
+   4.668 330.913
+   4.996 329.471
+   5.39 323.704
+   5.686 320.099
+   5.989 314.331
+   6.178 310.727
+   6.325 306.401
+   6.514 302.075
+   6.621 302.075
+   6.851 297.75
+   7.195 290.54
+   7.277 293.424
+   7.326 287.656
+   7.441 283.331
+   7.49 286.214
+   7.54 283.331
+   7.696 275.4
+   7.81 273.958
+   7.884 276.842
+   7.942 278.284
+   8.015 276.121
+   8.073 270.354
+   8.188 155.003
+   8.212 118.956
+   8.278 54.071
+   8.311 26.675
+   8.352 7.93
+   8.426 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_L400.eng b/core/resources/datafiles/thrustcurves/AeroTech_L400.eng
new file mode 100644
index 00000000..8a82d78f
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_L400.eng
@@ -0,0 +1,35 @@
+; Aerotech L400W-PS created using TCtracer and AT thrustcurve
+L400W 98 443.2 P 2.6489656 5.0847439 AT
+   0.031 436.662
+   0.062 493.929
+   0.063 586.988
+   0.108 634.711
+   0.154 606.077
+   0.277 622.78
+   0.4 639.483
+   0.508 610.85
+   0.538 601.305
+   0.908 665.731
+   1.092 684.82
+   1.631 720.612
+   1.954 706.295
+   2.385 703.909
+   2.6 701.523
+   2.769 689.592
+   3.2 656.186
+   3.754 586.988
+   4.354 527.335
+   5.262 434.276
+   5.815 386.553
+   6.477 336.445
+   7.354 276.791
+   8.046 217.138
+   8.846 167.029
+   9.862 107.376
+   10.969 64.426
+   11.969 40.564
+   12.969 26.247
+   13.985 14.317
+   14.938 7.158
+   15.462 2.386
+   15.938 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_L900.eng b/core/resources/datafiles/thrustcurves/AeroTech_L900.eng
new file mode 100644
index 00000000..d643a687
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_L900.eng
@@ -0,0 +1,30 @@
+; L900 Dark Matter
+L900DM 75 665.5 P 2.472 4.724 AT
+   0.016 577.998
+   0.041 870.377
+   0.086 851.787
+   0.303 931.219
+   0.417 944.74
+   0.515 910.939
+   0.998 936.289
+   1.272 976.851
+   1.501 992.061
+   1.747 1019.102
+   2.0 1029.242
+   2.205 1054.593
+   2.495 1047.833
+   2.77 1034.313
+   3.003 998.821
+   3.166 981.921
+   3.498 909.249
+   3.592 880.518
+   3.702 890.658
+   3.768 856.857
+   3.862 672.641
+   3.964 442.794
+   4.021 353.221
+   4.111 285.619
+   4.242 104.783
+   4.3 50.702
+   4.369 21.971
+   4.484 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_M1075.eng b/core/resources/datafiles/thrustcurves/AeroTech_M1075.eng
new file mode 100644
index 00000000..60d04ee0
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_M1075.eng
@@ -0,0 +1,24 @@
+; M1075 Dark Matter
+M1075DM 98 597 P 3.846 6.971 AT
+   0.02 927.501
+   0.112 988.073
+   0.26 1033.501
+   0.53 1080.823
+   0.897 1124.359
+   1.509 1198.18
+   1.998 1239.823
+   2.355 1260.644
+   2.503 1264.43
+   2.773 1237.93
+   2.997 1222.787
+   3.502 1162.216
+   4.001 1063.787
+   4.501 906.68
+   4.741 834.751
+   4.878 742.001
+   4.96 664.394
+   5.062 448.608
+   5.164 223.357
+   5.26 79.5
+   5.352 30.286
+   5.5 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_M1305.eng b/core/resources/datafiles/thrustcurves/AeroTech_M1305.eng
new file mode 100644
index 00000000..f90657ff
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_M1305.eng
@@ -0,0 +1,31 @@
+; M1305 Metalstorm
+M1305M 98 597 P 4.08 7.098 AT
+   0.016 1288.076
+   0.043 1462.78
+   0.08 1370.986
+   0.407 1622.679
+   0.535 1640.446
+   0.787 1705.59
+   0.985 1693.745
+   1.13 1717.434
+   1.328 1693.745
+   1.349 1927.672
+   1.397 1726.317
+   1.751 1711.512
+   2.018 1687.823
+   2.275 1690.784
+   2.297 1892.139
+   2.318 1678.94
+   2.929 1412.441
+   3.748 1113.371
+   4.24 906.095
+   4.503 802.456
+   4.717 663.285
+   4.813 538.919
+   4.92 387.903
+   5.027 245.771
+   5.166 145.094
+   5.263 79.95
+   5.386 32.572
+   5.498 23.689
+   5.707 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_M1780.eng b/core/resources/datafiles/thrustcurves/AeroTech_M1780.eng
index 42b6beb7..6bc79404 100644
--- a/core/resources/datafiles/thrustcurves/AeroTech_M1780.eng
+++ b/core/resources/datafiles/thrustcurves/AeroTech_M1780.eng
@@ -1,23 +1,42 @@
-M1780 75 665 P 2.56 4.715 AT
-   0.028 2204.193
-   0.118 2566.025
-   0.173 2566.025
-   0.341 2214.151
-   0.44 2144.44
-   0.636 2114.564
-   1.34 2134.482
-   1.395 2204.193
-   1.648 2121.203
-   1.841 2041.534
-   1.874 1895.473
-   2.127 1643.186
-   2.353 1517.042
-   2.584 1460.61
-   2.672 1347.744
-   2.763 1068.901
-   2.829 723.666
-   2.939 438.183
-   2.999 292.122
-   3.101 172.617
-   3.272 36.515
-   3.5 0.0
+; AT M1780NT 1" Core Revised
+M1780NT 75 665 P 2.371 4.606 AT
+   0.0090 1337.154
+   0.026 2005.731
+   0.04 2106.521
+   0.046 2163.636
+   0.085 2156.916
+   0.108 2126.679
+   0.134 2113.24
+   0.168 2130.039
+   0.205 2126.679
+   0.259 2197.233
+   0.299 2156.916
+   0.347 2130.039
+   0.399 2123.32
+   0.495 2103.161
+   0.595 2089.723
+   0.697 2079.644
+   0.8 2083.003
+   0.9 2076.284
+   0.999 2069.565
+   1.201 2056.126
+   1.398 2029.248
+   1.603 2002.371
+   1.799 1965.414
+   1.998 1904.94
+   2.2 1817.588
+   2.3 1757.114
+   2.354 1723.517
+   2.405 1713.438
+   2.46 1629.446
+   2.502 1558.893
+   2.571 1333.794
+   2.622 1115.415
+   2.67 890.316
+   2.724 665.217
+   2.758 571.146
+   2.798 507.312
+   2.83 446.838
+   2.901 265.415
+   3.003 73.913
+   3.035 0.0
diff --git a/core/resources/datafiles/thrustcurves/AeroTech_M1780_1.eng b/core/resources/datafiles/thrustcurves/AeroTech_M1780_1.eng
new file mode 100644
index 00000000..42b6beb7
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/AeroTech_M1780_1.eng
@@ -0,0 +1,23 @@
+M1780 75 665 P 2.56 4.715 AT
+   0.028 2204.193
+   0.118 2566.025
+   0.173 2566.025
+   0.341 2214.151
+   0.44 2144.44
+   0.636 2114.564
+   1.34 2134.482
+   1.395 2204.193
+   1.648 2121.203
+   1.841 2041.534
+   1.874 1895.473
+   2.127 1643.186
+   2.353 1517.042
+   2.584 1460.61
+   2.672 1347.744
+   2.763 1068.901
+   2.829 723.666
+   2.939 438.183
+   2.999 292.122
+   3.101 172.617
+   3.272 36.515
+   3.5 0.0
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_E22.rse b/core/resources/datafiles/thrustcurves/Cesaroni_E22.rse
new file mode 100644
index 00000000..896ad0b7
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_E22.rse
@@ -0,0 +1,31 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="24-E22-SS-13A" Type="unspecified" dia="24." len="69."
+initWt="56.5" propWt="20.3" delays="13,10,8,6,4" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="22.327" peakThrust="30.792" throatDia="0."
+exitDia="0." Itot="24.27" burn-time="1.09" massFrac="35.93" Isp="121.91"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Smoky Sam 24mm 1G
+24-E22-SS-13A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="20.3" cg="34.5"/>
+      <eng-data  t="0.008" f="18.292" m="20.2388" cg="34.5"/>
+      <eng-data  t="0.026" f="30." m="19.8753" cg="34.5"/>
+      <eng-data  t="0.038" f="30.792" m="19.5702" cg="34.5"/>
+      <eng-data  t="0.067" f="18.708" m="18.9698" cg="34.5"/>
+      <eng-data  t="0.101" f="21.875" m="18.3927" cg="34.5"/>
+      <eng-data  t="0.33" f="26.083" m="13.7997" cg="34.5"/>
+      <eng-data  t="0.528" f="28.042" m="9.31773" cg="34.5"/>
+      <eng-data  t="0.716" f="27.875" m="4.92123" cg="34.5"/>
+      <eng-data  t="0.841" f="23.542" m="2.23328" cg="34.5"/>
+      <eng-data  t="0.912" f="17.833" m="1.00471" cg="34.5"/>
+      <eng-data  t="0.987" f="7." m="0.225783" cg="34.5"/>
+      <eng-data  t="1.016" f="3.333" m="0.100461" cg="34.5"/>
+      <eng-data  t="1.065" f="1.083" m="0.00996451" cg="34.5"/>
+      <eng-data  t="1.087" f="0." m="0." cg="34.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_E31.rse b/core/resources/datafiles/thrustcurves/Cesaroni_E31.rse
new file mode 100644
index 00000000..4cb1d8b4
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_E31.rse
@@ -0,0 +1,29 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="26-E31-WH-15A" Type="unspecified" dia="24." len="69."
+initWt="52." propWt="16.9" delays="15,12,10,8,6" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="29.982" peakThrust="43.824" throatDia="0."
+exitDia="0." Itot="26.084" burn-time="0.87" massFrac="32.5" Isp="157.39"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>White 24mm 1G
+26-E31-WH-15A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="16.9" cg="34.5"/>
+      <eng-data  t="0.02" f="43.824" m="16.6161" cg="34.5"/>
+      <eng-data  t="0.027" f="39.964" m="16.4261" cg="34.5"/>
+      <eng-data  t="0.049" f="26.781" m="15.9504" cg="34.5"/>
+      <eng-data  t="0.113" f="32.601" m="14.7192" cg="34.5"/>
+      <eng-data  t="0.193" f="34.739" m="12.974" cg="34.5"/>
+      <eng-data  t="0.282" f="35.808" m="10.94" cg="34.5"/>
+      <eng-data  t="0.5" f="34.442" m="5.97881" cg="34.5"/>
+      <eng-data  t="0.727" f="29.276" m="1.29315" cg="34.5"/>
+      <eng-data  t="0.771" f="22.743" m="0.551669" cg="34.5"/>
+      <eng-data  t="0.807" f="9.561" m="0.174929" cg="34.5"/>
+      <eng-data  t="0.84" f="3.563" m="0.0346274" cg="34.5"/>
+      <eng-data  t="0.87" f="0." m="0." cg="34.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_F50.rse b/core/resources/datafiles/thrustcurves/Cesaroni_F50.rse
new file mode 100644
index 00000000..0123dcac
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_F50.rse
@@ -0,0 +1,29 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="60-F50-SK-13A" Type="unspecified" dia="24." len="133."
+initWt="93.9" propWt="38.2" delays="13,10,8,6,4" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="45.996" peakThrust="69.516" throatDia="0."
+exitDia="0." Itot="59.702" burn-time="1.3" massFrac="40.68" Isp="159.37"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Skidmark 24mm 3G
+60-F50-SK-13A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="38.2" cg="66.5"/>
+      <eng-data  t="0.015" f="64.982" m="37.8882" cg="66.5"/>
+      <eng-data  t="0.022" f="69.516" m="37.587" cg="66.5"/>
+      <eng-data  t="0.064" f="55.537" m="35.9067" cg="66.5"/>
+      <eng-data  t="0.118" f="62.81" m="33.8621" cg="66.5"/>
+      <eng-data  t="0.342" f="62.149" m="24.9073" cg="66.5"/>
+      <eng-data  t="0.536" f="59.41" m="17.3628" cg="66.5"/>
+      <eng-data  t="0.743" f="53.837" m="9.86315" cg="66.5"/>
+      <eng-data  t="0.884" f="46.942" m="5.31712" cg="66.5"/>
+      <eng-data  t="0.976" f="40.047" m="2.7568" cg="66.5"/>
+      <eng-data  t="1.096" f="12.562" m="0.737116" cg="66.5"/>
+      <eng-data  t="1.246" f="2.078" m="0.0345694" cg="66.5"/>
+      <eng-data  t="1.298" f="0." m="0." cg="66.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_F51.rse b/core/resources/datafiles/thrustcurves/Cesaroni_F51.rse
new file mode 100644
index 00000000..737d1a9e
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_F51.rse
@@ -0,0 +1,26 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="75-F51-CL-12A" Type="unspecified" dia="24." len="133."
+initWt="95." propWt="40." delays="12,9,7,5" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="47.72" peakThrust="84.148" throatDia="0." exitDia="0." Itot="75.254"
+burn-time="1.58" massFrac="42.11" Isp="191.85" tDiv="10" tStep="-1." tFix="1"
+FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1." mFix="1" cgDiv="10"
+cgStep="-1." cgFix="1">
+    <comments>Classic 24mm 3G
+75-F51-CL-12A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="40." cg="66.5"/>
+      <eng-data  t="0.02" f="75.924" m="39.5964" cg="66.5"/>
+      <eng-data  t="0.031" f="84.148" m="39.1285" cg="66.5"/>
+      <eng-data  t="0.062" f="70.441" m="37.8549" cg="66.5"/>
+      <eng-data  t="0.117" f="73.659" m="35.7485" cg="66.5"/>
+      <eng-data  t="1.211" f="38.737" m="3.06972" cg="66.5"/>
+      <eng-data  t="1.376" f="14.779" m="0.722981" cg="66.5"/>
+      <eng-data  t="1.456" f="7.271" m="0.254171" cg="66.5"/>
+      <eng-data  t="1.532" f="3.337" m="0.0399086" cg="66.5"/>
+      <eng-data  t="1.577" f="0." m="0." cg="66.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_G69_1.eng b/core/resources/datafiles/thrustcurves/Cesaroni_G69_1.eng
index 2759237b..c5d5addc 100644
--- a/core/resources/datafiles/thrustcurves/Cesaroni_G69_1.eng
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_G69_1.eng
@@ -1,16 +1,25 @@
-; CTI Pro38 G69 Skidmark
-G69SK-14A 38 117 5-7-9-11-14 0.0615 0.197 CTI
-   0.025 102.515
-   0.058 97.371
-   0.069 77.862
-   0.088 59.593
-   0.22 72.541
-   0.359 81.054
-   1.036 81.586
-   1.289 75.201
-   1.384 71.831
-   1.488 76.443
-   1.551 64.205
-   1.613 34.053
-   1.696 9.932
-   1.814 0.0
+; Pro38 G69
+G69 38 127 5-7-9-12 0.066500 0.2045 Pro38
+   0.079 79.935
+   0.103 72.367
+   0.136 82.989
+   0.217 85.910
+   0.247 82.193
+   0.311 84.317
+   0.352 80.201
+   0.387 82.856
+   0.840 72.499
+   0.944 72.234
+   0.978 69.047
+   1.017 71.835
+   1.082 67.852
+   1.227 66.657
+   1.237 65.329
+   1.493 62.010
+   1.530 59.354
+   1.591 60.151
+   1.714 56.167
+   1.769 54.574
+   1.848 46.607
+   1.887 27.884
+   1.958 00.000  
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng b/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
index c5d5addc..06b0f47f 100644
--- a/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_G69_2.eng
@@ -1,25 +1,14 @@
-; Pro38 G69
-G69 38 127 5-7-9-12 0.066500 0.2045 Pro38
-   0.079 79.935
-   0.103 72.367
-   0.136 82.989
-   0.217 85.910
-   0.247 82.193
-   0.311 84.317
-   0.352 80.201
-   0.387 82.856
-   0.840 72.499
-   0.944 72.234
-   0.978 69.047
-   1.017 71.835
-   1.082 67.852
-   1.227 66.657
-   1.237 65.329
-   1.493 62.010
-   1.530 59.354
-   1.591 60.151
-   1.714 56.167
-   1.769 54.574
-   1.848 46.607
-   1.887 27.884
-   1.958 00.000  
+;
+133G69  38.0 127.00 3-5-7-9-12 0.08400 0.20510 CTI
+   0.06      80.77 
+   0.20      84.50 
+   0.41      82.74 
+   0.59      80.11 
+   0.81      76.82 
+   1.00      72.87 
+   1.20      68.92 
+   1.40      64.31 
+   1.61      59.48 
+   1.82      50.92 
+   1.90      21.40 
+   1.93       0.00 
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_I165.eng b/core/resources/datafiles/thrustcurves/Cesaroni_I165.eng
new file mode 100644
index 00000000..de68b102
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_I165.eng
@@ -0,0 +1,16 @@
+;Pro-54-1G C-Star 518-I165-17A
+;Ejection adjustable from 7 to 17
+518-I165-CS-17A 54 69 17-15-13-11-9-7 0.267 0.594 CTI 
+0.027 133.424
+0.056 174.831
+0.067 179.973
+0.497 188.633
+1.018 184.032
+1.704 169.959
+2.95 129.364
+3.05 130.717
+3.168 44.655
+3.213 17.862
+3.271 3.518
+3.5 0
+;
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_J316.eng b/core/resources/datafiles/thrustcurves/Cesaroni_J316.eng
new file mode 100644
index 00000000..372d6ae9
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_J316.eng
@@ -0,0 +1,16 @@
+; Pink 38mm 5G
+; 654-J316-PK-17A
+654-J316-PK-17A 38 367 17-14-12-10-8 0.3508 0.6071000000000001 CTI
+   0.017 393.07
+   0.026 443.25
+   0.064 381.123
+   0.223 393.07
+   0.503 379.331
+   1.029 354.241
+   1.52 320.789
+   1.672 313.023
+   1.695 296.296
+   1.816 145.759
+   1.901 88.411
+   2.043 32.855
+   2.184 0.0
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_J316.rse b/core/resources/datafiles/thrustcurves/Cesaroni_J316.rse
new file mode 100644
index 00000000..1a0a63f8
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_J316.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="654-J316-PK-17A" Type="unspecified" dia="38." len="367."
+initWt="607.1" propWt="350.8" delays="17,14,12,10,8" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="299.405" peakThrust="443.25" throatDia="0."
+exitDia="0." Itot="653.901" burn-time="2.18" massFrac="57.78" Isp="190.08"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Pink 38mm 5G
+654-J316-PK-17A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="350.8" cg="183.5"/>
+      <eng-data  t="0.017" f="393.07" m="349.008" cg="183.5"/>
+      <eng-data  t="0.026" f="443.25" m="346.989" cg="183.5"/>
+      <eng-data  t="0.064" f="381.123" m="338.586" cg="183.5"/>
+      <eng-data  t="0.223" f="393.07" m="305.567" cg="183.5"/>
+      <eng-data  t="0.503" f="379.331" m="247.555" cg="183.5"/>
+      <eng-data  t="1.029" f="354.241" m="144.053" cg="183.5"/>
+      <eng-data  t="1.52" f="320.789" m="55.1492" cg="183.5"/>
+      <eng-data  t="1.672" f="313.023" m="29.3074" cg="183.5"/>
+      <eng-data  t="1.695" f="296.296" m="25.5483" cg="183.5"/>
+      <eng-data  t="1.816" f="145.759" m="11.2007" cg="183.5"/>
+      <eng-data  t="1.901" f="88.411" m="5.86159" cg="183.5"/>
+      <eng-data  t="2.043" f="32.855" m="1.24262" cg="183.5"/>
+      <eng-data  t="2.184" f="0." m="0." cg="183.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng b/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
index c7da07b2..f220b24b 100644
--- a/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_J425.eng
@@ -1,24 +1,83 @@
-J425BS 38 421 16-13-11-9-7 0.405 0.7000000000000001 Cesaroni
-   0.028 141.739
-   0.053 133.043
-   0.079 126.957
-   0.126 123.478
-   0.574 116.957
-   1.014 110.0
-   1.3 105.652
-   1.34 102.609
-   1.374 95.217
-   1.414 77.826
-   1.437 73.478
-   1.472 72.174
-   1.519 64.783
-   1.547 54.783
-   1.595 36.087
-   1.658 18.261
-   1.695 13.913
-   1.747 10.87
-   1.821 9.13
-   1.898 6.087
-   1.935 4.783
-   1.944 3.478
-   1.945 0.0
+; Pro38 784J425-16A
+J425 38 409.2 16-13-11-9-7 0.405 0.7000000000000001 CTI
+   0.0060 4.399
+   0.01 92.386
+   0.011 272.759
+   0.012 434.068
+   0.013 507.39
+   0.016 589.511
+   0.02 668.699
+   0.021 720.025
+   0.027 659.901
+   0.037 632.038
+   0.053 589.511
+   0.069 566.048
+   0.098 554.317
+   0.135 552.85
+   0.167 548.451
+   0.206 546.984
+   0.251 542.585
+   0.289 542.585
+   0.326 538.186
+   0.369 533.786
+   0.41 526.454
+   0.455 527.921
+   0.489 523.521
+   0.508 520.588
+   0.524 520.588
+   0.561 517.655
+   0.589 522.055
+   0.62 517.655
+   0.656 513.256
+   0.687 510.323
+   0.72 505.924
+   0.75 507.39
+   0.787 505.924
+   0.818 504.457
+   0.856 500.058
+   0.887 495.659
+   0.919 494.192
+   0.952 492.726
+   0.987 489.793
+   1.017 489.793
+   1.05 485.394
+   1.078 482.461
+   1.113 482.461
+   1.146 479.528
+   1.18 479.528
+   1.217 472.196
+   1.252 473.662
+   1.288 470.729
+   1.321 464.863
+   1.348 451.665
+   1.366 431.135
+   1.382 401.806
+   1.395 378.343
+   1.407 357.813
+   1.421 338.749
+   1.445 325.551
+   1.476 313.819
+   1.498 300.621
+   1.521 278.625
+   1.541 249.296
+   1.556 224.366
+   1.568 206.769
+   1.58 184.772
+   1.596 161.309
+   1.607 140.779
+   1.625 117.316
+   1.641 93.853
+   1.67 73.322
+   1.69 63.057
+   1.717 52.792
+   1.745 48.393
+   1.772 45.46
+   1.796 42.527
+   1.821 42.527
+   1.849 38.128
+   1.884 29.329
+   1.906 26.396
+   1.929 19.064
+   1.955 16.131
+   1.978 10.265
+   1.996 0.0
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_J453.rse b/core/resources/datafiles/thrustcurves/Cesaroni_J453.rse
new file mode 100644
index 00000000..15216234
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_J453.rse
@@ -0,0 +1,28 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="1013-J453-WH-16A" Type="unspecified" dia="38." len="500."
+initWt="964.3" propWt="613.2" delays="16,13,11,9,7" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="430.622" peakThrust="725.18" throatDia="0."
+exitDia="0." Itot="1017.99" burn-time="2.36" massFrac="63.59" Isp="169.29"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>White 38mm 6GXL
+1013-J453-WH-16A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="613.2" cg="250."/>
+      <eng-data  t="0.018" f="663.789" m="609.601" cg="250."/>
+      <eng-data  t="0.04" f="725.18" m="600.398" cg="250."/>
+      <eng-data  t="0.105" f="630.216" m="573.864" cg="250."/>
+      <eng-data  t="0.23" f="578.417" m="528.362" cg="250."/>
+      <eng-data  t="0.451" f="543.885" m="453.66" cg="250."/>
+      <eng-data  t="1.454" f="535.252" m="127.669" cg="250."/>
+      <eng-data  t="1.797" f="291.607" m="42.2501" cg="250."/>
+      <eng-data  t="1.91" f="188.969" m="25.8944" cg="250."/>
+      <eng-data  t="2.088" f="128.537" m="8.87281" cg="250."/>
+      <eng-data  t="2.276" f="19.185" m="0.508479" cg="250."/>
+      <eng-data  t="2.364" f="0." m="0." cg="250."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K2000.rse b/core/resources/datafiles/thrustcurves/Cesaroni_K2000.rse
new file mode 100644
index 00000000..addbb82a
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K2000.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="2330-K2000-VM-P" Type="unspecified" dia="75." len="350."
+initWt="2464.5" propWt="1164.2" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="1957.59" peakThrust="2473.68" throatDia="0." exitDia="0."
+Itot="2331.49" burn-time="1.19" massFrac="47.24" Isp="204.21" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>VMax 75mm 2G
+2330-K2000-VM-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1164.2" cg="175."/>
+      <eng-data  t="0.01" f="1979.53" m="1159.26" cg="175."/>
+      <eng-data  t="0.029" f="1634.5" m="1142.11" cg="175."/>
+      <eng-data  t="0.161" f="1947.37" m="1024.07" cg="175."/>
+      <eng-data  t="0.321" f="2190.06" m="858.791" cg="175."/>
+      <eng-data  t="0.457" f="2397.66" m="703.015" cg="175."/>
+      <eng-data  t="0.548" f="2473.68" m="592.339" cg="175."/>
+      <eng-data  t="0.678" f="2383.04" m="434.704" cg="175."/>
+      <eng-data  t="0.768" f="2263.16" m="330.303" cg="175."/>
+      <eng-data  t="0.977" f="1923.98" m="111.815" cg="175."/>
+      <eng-data  t="1.027" f="1883.04" m="64.2905" cg="175."/>
+      <eng-data  t="1.104" f="859.649" m="11.5636" cg="175."/>
+      <eng-data  t="1.149" f="87.719" m="0.91983" cg="175."/>
+      <eng-data  t="1.191" f="0." m="0." cg="175."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K580.eng b/core/resources/datafiles/thrustcurves/Cesaroni_K580.eng
new file mode 100644
index 00000000..0d67f6e0
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K580.eng
@@ -0,0 +1,48 @@
+;Created by Jesus Manuel Recuenco Andres 2011
+;with Tctracer v1.0
+K580  54.0 491.00 1000 0.89500 1.82300 Cesaroni
+   0.02     624.92 
+   0.03    1076.60 
+   0.07     846.73 
+   0.12     884.56 
+   0.20     855.46 
+   0.29     840.91 
+   0.39     835.09 
+   0.48     822.58 
+   0.56     808.60 
+   0.66     800.62 
+   0.74     784.64 
+   0.83     776.66 
+   0.90     762.68 
+   0.96     760.68 
+   1.03     748.71 
+   1.10     734.32 
+   1.14     713.24 
+   1.18     720.75 
+   1.27     704.78 
+   1.35     682.82 
+   1.43     666.85 
+   1.51     650.87 
+   1.59     632.91 
+   1.67     622.92 
+   1.73     604.95 
+   1.79     598.96 
+   1.86     579.00 
+   1.94     561.03 
+   1.99     559.03 
+   2.03     539.07 
+   2.09     533.08 
+   2.16     517.11 
+   2.24     507.12 
+   2.31     491.15 
+   2.39     477.18 
+   2.45     463.20 
+   2.51     442.28 
+   2.55     407.36 
+   2.60     360.81 
+   2.65     320.07 
+   2.69     276.42 
+   2.76     232.78 
+   2.82     194.95 
+   2.96     122.21 
+   3.20       0.00 
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K650.rse b/core/resources/datafiles/thrustcurves/Cesaroni_K650.rse
index 190a5760..3bc2f6b6 100644
--- a/core/resources/datafiles/thrustcurves/Cesaroni_K650.rse
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K650.rse
@@ -1,28 +1,25 @@
 <engine-database>
   <engine-list>
-<engine  mfg="Cesaroni Technology Inc." code="K650SS" Type="reloadable" dia="54."
-len="488." initWt="1989.9" propWt="1281." delays="16" auto-calc-mass="1"
-auto-calc-cg="1" avgThrust="657.68" peakThrust="728.7" throatDia="0."
-exitDia="0." Itot="1749.43" burn-time="2.66" massFrac="64.38" Isp="139.26"
+    <engine  mfg="CTI" code="1997-K650-PK-21" Type="unspecified" dia="54." len="488."
+initWt="1710." propWt="1065.1" delays="21,19,17,15,13,11" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="578.782" peakThrust="1353.5" throatDia="0."
+exitDia="0." Itot="1997.38" burn-time="3.45" massFrac="62.29" Isp="191.23"
 tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
 mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
-<data>
-<eng-data  t="0." f="0." m="1281." cg="244."/>
-<eng-data  t="0.04" f="664.52" m="1271.27" cg="244."/>
-<eng-data  t="0.12" f="645.9" m="1232.89" cg="244."/>
-<eng-data  t="0.31" f="642.24" m="1143.28" cg="244."/>
-<eng-data  t="0.6" f="664.78" m="1004.51" cg="244."/>
-<eng-data  t="0.91" f="684.59" m="851.358" cg="244."/>
-<eng-data  t="1.22" f="712.82" m="692.757" cg="244."/>
-<eng-data  t="1.5" f="723.41" m="545.524" cg="244."/>
-<eng-data  t="1.8" f="728.7" m="386.03" cg="244."/>
-<eng-data  t="2.1" f="664.52" m="233.005" cg="244."/>
-<eng-data  t="2.4" f="614.68" m="92.5027" cg="244."/>
-<eng-data  t="2.51" f="680.53" m="40.3405" cg="244."/>
-<eng-data  t="2.55" f="534.62" m="22.5449" cg="244."/>
-<eng-data  t="2.61" f="268.19" m="4.90948" cg="244."/>
-<eng-data  t="2.66" f="0." m="0." cg="244."/>
-</data>
-</engine>
+    <comments>Pink 54mm 5G
+1997-K650-PK-21
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1065.1" cg="244."/>
+      <eng-data  t="0.011" f="1353.5" m="1061.13" cg="244."/>
+      <eng-data  t="0.028" f="793.832" m="1051.4" cg="244."/>
+      <eng-data  t="0.186" f="815.421" m="983.605" cg="244."/>
+      <eng-data  t="2.578" f="601.186" m="80.1407" cg="244."/>
+      <eng-data  t="2.689" f="479.953" m="48.144" cg="244."/>
+      <eng-data  t="2.855" f="189.324" m="18.522" cg="244."/>
+      <eng-data  t="3.086" f="43.179" m="4.20209" cg="244."/>
+      <eng-data  t="3.451" f="0." m="0." cg="244."/>
+    </data>
+  </engine>
 </engine-list>
 </engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K650_1.rse b/core/resources/datafiles/thrustcurves/Cesaroni_K650_1.rse
new file mode 100644
index 00000000..190a5760
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K650_1.rse
@@ -0,0 +1,28 @@
+<engine-database>
+  <engine-list>
+<engine  mfg="Cesaroni Technology Inc." code="K650SS" Type="reloadable" dia="54."
+len="488." initWt="1989.9" propWt="1281." delays="16" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="657.68" peakThrust="728.7" throatDia="0."
+exitDia="0." Itot="1749.43" burn-time="2.66" massFrac="64.38" Isp="139.26"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+<data>
+<eng-data  t="0." f="0." m="1281." cg="244."/>
+<eng-data  t="0.04" f="664.52" m="1271.27" cg="244."/>
+<eng-data  t="0.12" f="645.9" m="1232.89" cg="244."/>
+<eng-data  t="0.31" f="642.24" m="1143.28" cg="244."/>
+<eng-data  t="0.6" f="664.78" m="1004.51" cg="244."/>
+<eng-data  t="0.91" f="684.59" m="851.358" cg="244."/>
+<eng-data  t="1.22" f="712.82" m="692.757" cg="244."/>
+<eng-data  t="1.5" f="723.41" m="545.524" cg="244."/>
+<eng-data  t="1.8" f="728.7" m="386.03" cg="244."/>
+<eng-data  t="2.1" f="664.52" m="233.005" cg="244."/>
+<eng-data  t="2.4" f="614.68" m="92.5027" cg="244."/>
+<eng-data  t="2.51" f="680.53" m="40.3405" cg="244."/>
+<eng-data  t="2.55" f="534.62" m="22.5449" cg="244."/>
+<eng-data  t="2.61" f="268.19" m="4.90948" cg="244."/>
+<eng-data  t="2.66" f="0." m="0." cg="244."/>
+</data>
+</engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K661.rse b/core/resources/datafiles/thrustcurves/Cesaroni_K661.rse
new file mode 100644
index 00000000..3d325976
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K661.rse
@@ -0,0 +1,33 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="2430-K661-BS-P" Type="unspecified" dia="75." len="350."
+initWt="2527.8" propWt="1262.5" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="641.518" peakThrust="758.091" throatDia="0." exitDia="0."
+Itot="2436.49" burn-time="3.8" massFrac="49.94" Isp="196.79" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Blue Streak 75mm 2G
+2430-K661-BS-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1262.5" cg="175."/>
+      <eng-data  t="0.041" f="588.591" m="1256.25" cg="175."/>
+      <eng-data  t="0.073" f="659.371" m="1245.9" cg="175."/>
+      <eng-data  t="0.122" f="635.157" m="1229.47" cg="175."/>
+      <eng-data  t="0.225" f="634.226" m="1195.59" cg="175."/>
+      <eng-data  t="0.679" f="713.388" m="1037.08" cg="175."/>
+      <eng-data  t="1.039" f="751.572" m="900.446" cg="175."/>
+      <eng-data  t="1.241" f="758.091" m="821.438" cg="175."/>
+      <eng-data  t="1.832" f="727.357" m="593.99" cg="175."/>
+      <eng-data  t="2.298" f="687.311" m="423.194" cg="175."/>
+      <eng-data  t="2.729" f="667.753" m="271.882" cg="175."/>
+      <eng-data  t="3.195" f="645.402" m="113.341" cg="175."/>
+      <eng-data  t="3.367" f="670.547" m="54.6998" cg="175."/>
+      <eng-data  t="3.584" f="182.538" m="6.73867" cg="175."/>
+      <eng-data  t="3.672" f="55.879" m="1.30294" cg="175."/>
+      <eng-data  t="3.72" f="18.626" m="0.376402" cg="175."/>
+      <eng-data  t="3.798" f="0." m="0." cg="175."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K735.rse b/core/resources/datafiles/thrustcurves/Cesaroni_K735.rse
new file mode 100644
index 00000000..5c648e89
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K735.rse
@@ -0,0 +1,31 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="1955-K735-SK-P" Type="unspecified" dia="75." len="350."
+initWt="2508.8" propWt="1222.1" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="692.838" peakThrust="889.282" throatDia="0." exitDia="0."
+Itot="1961.42" burn-time="2.83" massFrac="48.71" Isp="163.66" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Skidmark 75mm 2G
+1955-K735-SK-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1222.1" cg="175."/>
+      <eng-data  t="0.053" f="683.157" m="1210.82" cg="175."/>
+      <eng-data  t="0.142" f="593.64" m="1175.42" cg="175."/>
+      <eng-data  t="0.408" f="697.291" m="1068.44" cg="175."/>
+      <eng-data  t="0.893" f="848.057" m="834.95" cg="175."/>
+      <eng-data  t="1.109" f="886.926" m="718.2" cg="175."/>
+      <eng-data  t="1.24" f="882.214" m="646." cg="175."/>
+      <eng-data  t="1.362" f="889.282" m="578.671" cg="175."/>
+      <eng-data  t="2." f="783.274" m="246.236" cg="175."/>
+      <eng-data  t="2.346" f="706.714" m="85.6289" cg="175."/>
+      <eng-data  t="2.439" f="648.999" m="46.3503" cg="175."/>
+      <eng-data  t="2.612" f="123.675" m="4.70677" cg="175."/>
+      <eng-data  t="2.676" f="36.514" m="1.51289" cg="175."/>
+      <eng-data  t="2.754" f="12.956" m="0.31079" cg="175."/>
+      <eng-data  t="2.831" f="0." m="0." cg="175."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_K935.eng b/core/resources/datafiles/thrustcurves/Cesaroni_K935.eng
new file mode 100644
index 00000000..2595afbe
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_K935.eng
@@ -0,0 +1,48 @@
+;Created by Jesus Manuel Recuenco Andres 2011
+;with Tctracer v1.0
+K935  54.0 403.00 1000 0.73200 1.50800 Cesaroni
+   0.01    1072.70 
+   0.02    1043.71 
+   0.04     974.21 
+   0.07    1015.94 
+   0.10    1029.21 
+   0.14    1040.97 
+   0.17    1049.51 
+   0.22    1059.74 
+   0.25    1064.00 
+   0.29    1070.18 
+   0.34    1072.70 
+   0.39    1072.26 
+   0.42    1069.80 
+   0.45    1072.70 
+   0.49    1069.80 
+   0.52    1070.18 
+   0.58    1064.00 
+   0.64    1059.74 
+   0.70    1055.30 
+   0.76    1045.14 
+   0.81    1035.01 
+   0.85    1029.21 
+   0.88    1022.20 
+   0.91    1017.62 
+   0.94    1014.72 
+   0.97    1008.92 
+   1.00    1003.42 
+   1.06     985.72 
+   1.12     965.87 
+   1.16     950.93 
+   1.21     936.66 
+   1.26     919.04 
+   1.30     903.29 
+   1.34     890.05 
+   1.38     876.17 
+   1.43     861.06 
+   1.48     846.96 
+   1.51     719.71 
+   1.54     619.58 
+   1.56     510.26 
+   1.58     415.14 
+   1.60     295.72 
+   1.63     181.49 
+   1.66      66.76 
+   1.70       0.00 
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L1050.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L1050.rse
new file mode 100644
index 00000000..848390c7
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L1050.rse
@@ -0,0 +1,32 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="3727-L1050-BS-P" Type="unspecified" dia="75." len="486."
+initWt="3447.7" propWt="1863.4" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="1000.17" peakThrust="1207.29" throatDia="0." exitDia="0."
+Itot="3731.64" burn-time="3.73" massFrac="54.05" Isp="204.21" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Blue Streak 75mm 3G
+3727-L1050-BS-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1863.4" cg="243."/>
+      <eng-data  t="0.035" f="721.412" m="1857.1" cg="243."/>
+      <eng-data  t="0.081" f="1110.12" m="1836.06" cg="243."/>
+      <eng-data  t="0.131" f="1057.41" m="1809." cg="243."/>
+      <eng-data  t="0.249" f="1100.23" m="1745.43" cg="243."/>
+      <eng-data  t="0.913" f="1194.12" m="1365.06" cg="243."/>
+      <eng-data  t="1.125" f="1207.29" m="1237.96" cg="243."/>
+      <eng-data  t="2.271" f="1100.23" m="577.705" cg="243."/>
+      <eng-data  t="2.797" f="1055.77" m="294.559" cg="243."/>
+      <eng-data  t="3.076" f="1042.59" m="148.389" cg="243."/>
+      <eng-data  t="3.122" f="996.471" m="124.97" cg="243."/>
+      <eng-data  t="3.23" f="807.059" m="76.3379" cg="243."/>
+      <eng-data  t="3.452" f="289.882" m="15.5367" cg="243."/>
+      <eng-data  t="3.544" f="123.529" m="6.04054" cg="243."/>
+      <eng-data  t="3.685" f="36.235" m="0.416162" cg="243."/>
+      <eng-data  t="3.731" f="0." m="0." cg="243."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L1350.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L1350.rse
new file mode 100644
index 00000000..f43df579
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L1350.rse
@@ -0,0 +1,32 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="4263-L1350-CS-P" Type="unspecified" dia="75." len="486."
+initWt="3570.7" propWt="2024.5" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="1303.34" peakThrust="1540.73" throatDia="0." exitDia="0."
+Itot="4280.17" burn-time="3.28" massFrac="56.7" Isp="215.59" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>C-Star 75mm 3G
+4263-L1350-CS-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="2024.5" cg="243."/>
+      <eng-data  t="0.016" f="1421.72" m="2019.12" cg="243."/>
+      <eng-data  t="0.034" f="1345.22" m="2007.34" cg="243."/>
+      <eng-data  t="0.049" f="1502.48" m="1997.24" cg="243."/>
+      <eng-data  t="0.081" f="1415.35" m="1975.16" cg="243."/>
+      <eng-data  t="0.21" f="1432.35" m="1888.28" cg="243."/>
+      <eng-data  t="0.453" f="1432.35" m="1723.65" cg="243."/>
+      <eng-data  t="0.809" f="1462.1" m="1479.96" cg="243."/>
+      <eng-data  t="1.07" f="1534.36" m="1295." cg="243."/>
+      <eng-data  t="1.28" f="1540.73" m="1142.27" cg="243."/>
+      <eng-data  t="2.661" f="1283.59" m="219.84" cg="243."/>
+      <eng-data  t="2.843" f="1277.21" m="109.616" cg="243."/>
+      <eng-data  t="2.932" f="1115.7" m="59.2496" cg="243."/>
+      <eng-data  t="3.037" f="488.784" m="19.4066" cg="243."/>
+      <eng-data  t="3.163" f="82.881" m="2.37174" cg="243."/>
+      <eng-data  t="3.284" f="0." m="0." cg="243."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L3200.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L3200.rse
new file mode 100644
index 00000000..0b150ecb
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L3200.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="3300-L3200-VM-P" Type="unspecified" dia="75." len="486."
+initWt="3263.7" propWt="1658.4" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="3127.56" peakThrust="3711.92" throatDia="0." exitDia="0."
+Itot="3299.58" burn-time="1.05" massFrac="50.81" Isp="202.88" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>VMax 75mm 3G
+3300-L3200-VM-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1658.4" cg="243."/>
+      <eng-data  t="0.008" f="3315.23" m="1651.73" cg="243."/>
+      <eng-data  t="0.024" f="2672.96" m="1627.66" cg="243."/>
+      <eng-data  t="0.108" f="2975.21" m="1508.43" cg="243."/>
+      <eng-data  t="0.415" f="3669.42" m="995.789" cg="243."/>
+      <eng-data  t="0.524" f="3711.92" m="793.598" cg="243."/>
+      <eng-data  t="0.644" f="3669.42" m="571.002" cg="243."/>
+      <eng-data  t="0.819" f="3225.5" m="267.774" cg="243."/>
+      <eng-data  t="0.911" f="3022.43" m="123.322" cg="243."/>
+      <eng-data  t="0.937" f="3050.77" m="83.6397" cg="243."/>
+      <eng-data  t="0.957" f="2899.65" m="53.7324" cg="243."/>
+      <eng-data  t="1.022" f="288.076" m="1.66152" cg="243."/>
+      <eng-data  t="1.039" f="51.948" m="0.208877" cg="243."/>
+      <eng-data  t="1.055" f="0." m="0." cg="243."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L645.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L645.rse
new file mode 100644
index 00000000..2e34c772
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L645.rse
@@ -0,0 +1,29 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="3419-L645-GR-P" Type="unspecified" dia="75." len="486."
+initWt="3751.8" propWt="2144.1" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="637.051" peakThrust="764.97" throatDia="0." exitDia="0." Itot="3433.7"
+burn-time="5.39" massFrac="57.15" Isp="163.3" tDiv="10" tStep="-1." tFix="1"
+FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1." mFix="1" cgDiv="10"
+cgStep="-1." cgFix="1">
+    <comments>Green 75mm 3G
+3419-L645-GR-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="2144.1" cg="243."/>
+      <eng-data  t="0.05" f="511.243" m="2136.12" cg="243."/>
+      <eng-data  t="0.12" f="647.574" m="2110.79" cg="243."/>
+      <eng-data  t="0.256" f="689.231" m="2054.03" cg="243."/>
+      <eng-data  t="0.425" f="684.497" m="1981.55" cg="243."/>
+      <eng-data  t="1.554" f="736.568" m="1480.64" cg="243."/>
+      <eng-data  t="2.043" f="764.97" m="1251.39" cg="243."/>
+      <eng-data  t="3.075" f="687.337" m="783.453" cg="243."/>
+      <eng-data  t="4.557" f="601.183" m="187.254" cg="243."/>
+      <eng-data  t="4.756" f="550.059" m="115.726" cg="243."/>
+      <eng-data  t="4.985" f="412.781" m="46.8863" cg="243."/>
+      <eng-data  t="5.281" f="69.112" m="2.35197" cg="243."/>
+      <eng-data  t="5.39" f="0." m="0." cg="243."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L805.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L805.rse
new file mode 100644
index 00000000..92b4eb52
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L805.rse
@@ -0,0 +1,27 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="2833-L805-WH-P" Type="unspecified" dia="54." len="649."
+initWt="2502.5" propWt="1675.2" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="746.357" peakThrust="1618.1" throatDia="0." exitDia="0."
+Itot="2856.31" burn-time="3.83" massFrac="66.94" Isp="173.87" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>White 54mm 6GXL
+2833-L805-WH-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1675.2" cg="324.5"/>
+      <eng-data  t="0.012" f="1618.1" m="1669.51" cg="324.5"/>
+      <eng-data  t="0.037" f="1171.8" m="1649.05" cg="324.5"/>
+      <eng-data  t="0.173" f="1027.97" m="1561.32" cg="324.5"/>
+      <eng-data  t="0.388" f="994.125" m="1433.83" cg="324.5"/>
+      <eng-data  t="0.626" f="985.664" m="1295.66" cg="324.5"/>
+      <eng-data  t="2.318" f="886.251" m="366.868" cg="324.5"/>
+      <eng-data  t="3.054" f="448.414" m="78.8087" cg="324.5"/>
+      <eng-data  t="3.464" f="126.91" m="9.63702" cg="324.5"/>
+      <eng-data  t="3.608" f="40.188" m="2.58091" cg="324.5"/>
+      <eng-data  t="3.827" f="0." m="0." cg="324.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_L910.rse b/core/resources/datafiles/thrustcurves/Cesaroni_L910.rse
new file mode 100644
index 00000000..49baf2e3
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_L910.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="2856-L910-CS-P" Type="unspecified" dia="75." len="350."
+initWt="2615.8" propWt="1364.3" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="879.58" peakThrust="1047.55" throatDia="0." exitDia="0."
+Itot="2869.19" burn-time="3.26" massFrac="52.16" Isp="214.45" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>C-Star 75mm 2G
+2856-L910-CS-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="1364.3" cg="175."/>
+      <eng-data  t="0.034" f="858.741" m="1357.36" cg="175."/>
+      <eng-data  t="0.056" f="921.678" m="1348.05" cg="175."/>
+      <eng-data  t="0.305" f="952.448" m="1237.1" cg="175."/>
+      <eng-data  t="0.718" f="983.217" m="1047.03" cg="175."/>
+      <eng-data  t="1.221" f="1047.55" m="804.178" cg="175."/>
+      <eng-data  t="1.642" f="1005.59" m="598.673" cg="175."/>
+      <eng-data  t="1.842" f="973.427" m="504.57" cg="175."/>
+      <eng-data  t="2.951" f="773.427" m="43.9864" cg="175."/>
+      <eng-data  t="3.035" f="584.615" m="16.8649" cg="175."/>
+      <eng-data  t="3.108" f="169.231" m="3.78139" cg="175."/>
+      <eng-data  t="3.152" f="72.727" m="1.25026" cg="175."/>
+      <eng-data  t="3.182" f="27.972" m="0.532027" cg="175."/>
+      <eng-data  t="3.262" f="0." m="0." cg="175."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_M2245.eng b/core/resources/datafiles/thrustcurves/Cesaroni_M2245.eng
new file mode 100644
index 00000000..4db1b65d
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_M2245.eng
@@ -0,0 +1,13 @@
+; Imax Pro75 6GXL
+; 9977 M2245-IM-P
+9977-M2245-IM-P 75 1025 P 5.309 8.182 CTI
+   0.043 3045.655
+   0.136 2629.813
+   1.393 3003.3
+   2.168 3007.151
+   2.708 2972.497
+   2.837 2883.938
+   3.152 1955.996
+   3.397 1409.241
+   3.878 562.156
+   4.371 0.0
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_M2245.rse b/core/resources/datafiles/thrustcurves/Cesaroni_M2245.rse
new file mode 100644
index 00000000..4e1f7d6a
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_M2245.rse
@@ -0,0 +1,27 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="9977-M2245-IM-P" Type="unspecified" dia="75." len="1025."
+initWt="8182." propWt="5309." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="2282.85" peakThrust="3045.66" throatDia="0." exitDia="0."
+Itot="9978.32" burn-time="4.37" massFrac="64.89" Isp="191.66" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Imax Pro75 6GXL
+9977 M2245-IM-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="5309." cg="512.5"/>
+      <eng-data  t="0.043" f="3045.66" m="5274.16" cg="512.5"/>
+      <eng-data  t="0.136" f="2629.81" m="5133.75" cg="512.5"/>
+      <eng-data  t="1.393" f="3003.3" m="3250.06" cg="512.5"/>
+      <eng-data  t="2.168" f="3007.15" m="2010.88" cg="512.5"/>
+      <eng-data  t="2.708" f="2972.5" m="1151.88" cg="512.5"/>
+      <eng-data  t="2.837" f="2883.94" m="950.898" cg="512.5"/>
+      <eng-data  t="3.152" f="1956." m="545.32" cg="512.5"/>
+      <eng-data  t="3.397" f="1409.24" m="325.985" cg="512.5"/>
+      <eng-data  t="3.878" f="562.156" m="73.7274" cg="512.5"/>
+      <eng-data  t="4.371" f="0." m="0." cg="512.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_N2540.rse b/core/resources/datafiles/thrustcurves/Cesaroni_N2540.rse
new file mode 100644
index 00000000..07178179
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_N2540.rse
@@ -0,0 +1,30 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="17907-N2540-GR-P" Type="unspecified" dia="98." len="1239."
+initWt="16280.5" propWt="10704.2" delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="2479.42" peakThrust="2894.98" throatDia="0." exitDia="0."
+Itot="17906.4" burn-time="7.22" massFrac="65.75" Isp="170.58" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>Green 98mm 6GXL
+17907-N2540-GR-P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="10704.2" cg="619.5"/>
+      <eng-data  t="0.073" f="2586.93" m="10647.8" cg="619.5"/>
+      <eng-data  t="0.11" f="2789.97" m="10588.3" cg="619.5"/>
+      <eng-data  t="0.398" f="2761.96" m="10110.4" cg="619.5"/>
+      <eng-data  t="1.14" f="2761.96" m="8885.29" cg="619.5"/>
+      <eng-data  t="1.73" f="2828.47" m="7899.43" cg="619.5"/>
+      <eng-data  t="2.613" f="2894.98" m="6388.88" cg="619.5"/>
+      <eng-data  t="4.16" f="2747.96" m="3779.65" cg="619.5"/>
+      <eng-data  t="5.666" f="2565.93" m="1387.7" cg="619.5"/>
+      <eng-data  t="5.972" f="2415.4" m="932.099" cg="619.5"/>
+      <eng-data  t="6.338" f="1953.33" m="454.182" cg="619.5"/>
+      <eng-data  t="6.819" f="745.624" m="66.1607" cg="619.5"/>
+      <eng-data  t="7.061" f="101.517" m="4.88518" cg="619.5"/>
+      <eng-data  t="7.222" f="0." m="0." cg="619.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Cesaroni_O25000.rse b/core/resources/datafiles/thrustcurves/Cesaroni_O25000.rse
new file mode 100644
index 00000000..df73d78c
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Cesaroni_O25000.rse
@@ -0,0 +1,28 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="O25,000-VM-P" Type="unspecified" dia="132." len="1407."
+initWt="23558." propWt="14705." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="23414.8" peakThrust="26281.5" throatDia="0." exitDia="0."
+Itot="30907.5" burn-time="1.32" massFrac="62.42" Isp="214.33" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>CTI 30,795-O25,000-VM-P
+Single-Use
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="14705." cg="703.5"/>
+      <eng-data  t="0.008" f="21113.4" m="14664.8" cg="703.5"/>
+      <eng-data  t="0.022" f="24705.9" m="14512.2" cg="703.5"/>
+      <eng-data  t="0.042" f="26281.5" m="14269.6" cg="703.5"/>
+      <eng-data  t="0.067" f="24390.8" m="13968.3" cg="703.5"/>
+      <eng-data  t="0.201" f="24044.1" m="12424.3" cg="703.5"/>
+      <eng-data  t="0.56" f="25052.5" m="8231.4" cg="703.5"/>
+      <eng-data  t="0.927" f="24075.6" m="3942.28" cg="703.5"/>
+      <eng-data  t="1.202" f="22815.1" m="874.738" cg="703.5"/>
+      <eng-data  t="1.25" f="23602.9" m="344.709" cg="703.5"/>
+      <eng-data  t="1.297" f="4852.94" m="26.5524" cg="703.5"/>
+      <eng-data  t="1.32" f="0." m="0." cg="703.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Estes_E12.eng b/core/resources/datafiles/thrustcurves/Estes_E12.eng
new file mode 100644
index 00000000..0213b4b9
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_E12.eng
@@ -0,0 +1,33 @@
+; Based on NAR Published Data, 7/31/12, C. J. Kobel
+E12 24 95 0-4-6-8 0.0359 0.0599 Estes
+   0.052 5.045
+   0.096 9.910
+   0.196 24.144
+   0.251 31.351
+   0.287 32.973
+   0.300 29.910
+   0.344 17.117
+   0.370 14.414
+   0.400 12.973
+   0.500 11.712
+   0.600 11.171
+   0.700 10.631
+   0.800 10.09
+   0.900 9.73
+   1.000 9.55
+   1.101 9.91
+   1.200 9.55
+   1.300 9.73
+   1.400 9.73
+   1.500 9.73
+   1.600 9.73
+   1.700 9.55
+   1.800 9.73
+   1.900 9.73
+   2.000 9.55
+   2.100 9.55
+   2.200 9.73
+   2.300 9.19
+   2.375 9.37
+   2.400 5.95
+   2.440 0.0
diff --git a/core/resources/datafiles/thrustcurves/Estes_E30.eng b/core/resources/datafiles/thrustcurves/Estes_E30.eng
new file mode 100644
index 00000000..096896d4
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_E30.eng
@@ -0,0 +1,29 @@
+; Estes E30
+; from NAR data sheet updated 08/01/2010
+; created by David Moore  08/17/2012
+E30 24 70 4-7 .0178 .0470 ESTES
+   0.01 49
+   0.02 49
+   0.05 46
+   0.10 44
+   0.20 43
+   0.25 42
+   0.30 41
+   0.35 40
+   0.40 39
+   0.45 38
+   0.50 37
+   0.55 35
+   0.60 33
+   0.65 32
+   0.70 31
+   0.75 30
+   0.80 27
+   0.85 25
+   0.90 20
+   0.91 19
+   0.93 12
+   0.95  5
+   0.97  1
+   1.00  0
+;
diff --git a/core/resources/datafiles/thrustcurves/Estes_F26.eng b/core/resources/datafiles/thrustcurves/Estes_F26.eng
new file mode 100644
index 00000000..e005837a
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_F26.eng
@@ -0,0 +1,36 @@
+;
+;ESTES G80
+;From NAR Certification 11/28/2007
+;File created 08/17/2012 by David Moore
+;Blue Thunder propellant [Relabeled Aerotech]
+G80 29 128 7 0.0625 0.128 Estes
+   0.006    1.2
+   0.008    7.5
+   0.010   33.8
+   0.012   64.6
+   0.014   62.9
+   0.016   58.8
+   0.018   74.9
+   0.020   85.0
+   0.022   91.1
+   0.026   94.0
+   0.028   98.4
+   0.032   97.7
+   0.074   97.3
+   0.124   95.4
+   0.376   99.3
+   0.680   99.4
+   0.994   91.6
+   1.246   83.0
+   1.282   77.4
+   1.316   62.0
+   1.360   44.6
+   1.424   29.1
+   1.504   21.2
+   1.598   19.3
+   1.656   16.3 
+   1.676   13.9
+   1.678   11.8
+   1.714    5.1
+   1.734    1.4
+   1.808    0.0
diff --git a/core/resources/datafiles/thrustcurves/Estes_F50.eng b/core/resources/datafiles/thrustcurves/Estes_F50.eng
new file mode 100644
index 00000000..ba929661
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_F50.eng
@@ -0,0 +1,37 @@
+; Estes F50 Blue thunder Porpellant [Relabeled Aerotech]
+; File produced July 4, 2000
+; 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.
+F50 29 98 6 .0379 .0836 Estes
+  0.012 51.377
+  0.023 61.197
+  0.026 66.117
+  0.044 66.564
+  0.082 69.685
+  0.152 73.264
+  0.208 75.053
+  0.237 77.279
+  0.254 76.832
+  0.272 77.726
+  0.307 77.726
+  0.330 76.832
+  0.336 78.621
+  0.342 76.832
+  0.354 79.590
+  0.363 76.385
+  0.371 77.756
+  0.395 76.385
+  0.447 75.937
+  0.523 73.711
+  0.652 68.344
+  0.810 60.302
+  0.828 62.539
+  0.836 58.076
+  0.901 53.603
+  1.079 37.074
+  1.158 29.480
+  1.196 25.464
+  1.246 16.976
+  1.301  9.380
+  1.430  0.000
diff --git a/core/resources/datafiles/thrustcurves/Estes_G40.eng b/core/resources/datafiles/thrustcurves/Estes_G40.eng
new file mode 100644
index 00000000..006dbba3
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_G40.eng
@@ -0,0 +1,16 @@
+;ESTES G40W [Relabeled Aerotech]
+;Entered for ESTES on 8/18/2012 by David Moore
+;Original file by Tim VanMilligan
+G40W 29 124 7 0.0538 0.123 AeroTech
+   0.024 74.325
+   0.057 67.005
+   0.252 65.879
+   0.500 63.063
+   0.765 60.248
+   1.000 54.054
+   1.250 47.298
+   1.502 36.599
+   1.751 25.338
+   1.999 12.951
+   2.121  3.941
+   2.300      0
diff --git a/core/resources/datafiles/thrustcurves/Estes_G40_1.eng b/core/resources/datafiles/thrustcurves/Estes_G40_1.eng
new file mode 100644
index 00000000..c845b316
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Estes_G40_1.eng
@@ -0,0 +1,16 @@
+;ESTES G40W [Relabeled Aerotech]
+;Entered for ESTES on 8/18/2012 by David Moore
+;Original file by Tim VanMilligan
+G40W 29 124 4-7-10 0.0538 0.123 AeroTech
+   0.024 74.325
+   0.057 67.005
+   0.252 65.879
+   0.500 63.063
+   0.765 60.248
+   1.000 54.054
+   1.250 47.298
+   1.502 36.599
+   1.751 25.338
+   1.999 12.951
+   2.121  3.941
+   2.300      0
diff --git a/core/resources/datafiles/thrustcurves/GR_M1025.rse b/core/resources/datafiles/thrustcurves/GR_M1025.rse
new file mode 100644
index 00000000..10cb9998
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/GR_M1025.rse
@@ -0,0 +1,19 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="Gorilla_Rocket_Motors" code="M1025WC" Type="reloadable" dia="98."
+len="869.95" initWt="10138." propWt="5329." delays="1000" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="1024.39" peakThrust="1780." throatDia="0."
+exitDia="0." Itot="9590.88" burn-time="9.36" massFrac="52.56" Isp="183.52"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <data>
+      <eng-data  t="0." f="0." m="5329." cg="434.975"/>
+      <eng-data  t="0.1" f="1780." m="5279.55" cg="434.975"/>
+      <eng-data  t="0.5" f="1558." m="4908.61" cg="434.975"/>
+      <eng-data  t="3.25641" f="1500." m="2566.87" cg="434.975"/>
+      <eng-data  t="6.17949" f="795.082" m="703.085" cg="434.975"/>
+      <eng-data  t="9.3625" f="0." m="0." cg="434.975"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/GR_M1465.rse b/core/resources/datafiles/thrustcurves/GR_M1465.rse
new file mode 100644
index 00000000..3db24a48
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/GR_M1465.rse
@@ -0,0 +1,22 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="Gorilla_Rocket_Motors" code="M1465BL" Type="reloadable" dia="98."
+len="869.95" initWt="9801." propWt="4992." delays="1000" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="1449.69" peakThrust="2219." throatDia="0."
+exitDia="0." Itot="7538.4" burn-time="5.2" massFrac="50.93" Isp="153.99"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <data>
+      <eng-data  t="0." f="0." m="4992." cg="434.975"/>
+      <eng-data  t="0.33" f="1113." m="4870.39" cg="434.975"/>
+      <eng-data  t="1.64957" f="1752.05" m="3618.6" cg="434.975"/>
+      <eng-data  t="3." f="2219." m="1843.01" cg="434.975"/>
+      <eng-data  t="3.51282" f="2100.41" m="1109.59" cg="434.975"/>
+      <eng-data  t="3.98291" f="1823.77" m="498.8" cg="434.975"/>
+      <eng-data  t="4.3" f="1335." m="167.156" cg="434.975"/>
+      <eng-data  t="4.45299" f="334." m="82.6109" cg="434.975"/>
+      <eng-data  t="5.2" f="0." m="0." cg="434.975"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>
diff --git a/core/resources/datafiles/thrustcurves/Quest_D5_1.eng b/core/resources/datafiles/thrustcurves/Quest_D5_1.eng
index 397d8b34..d1226505 100644
--- a/core/resources/datafiles/thrustcurves/Quest_D5_1.eng
+++ b/core/resources/datafiles/thrustcurves/Quest_D5_1.eng
@@ -4,7 +4,7 @@
 ; 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.
-D5 20 96 4-6 0.0240 0.451 QUEST
+D5 20 96 4-6 0.0240 0.0451 QUEST
 0.010 1.014
 0.122 2.652
 0.172 4.836
diff --git a/core/resources/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng b/core/resources/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng
new file mode 100644
index 00000000..274c2319
--- /dev/null
+++ b/core/resources/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng
@@ -0,0 +1,39 @@
+; Traced from NAR certification data dated 1-29-2009
+MicroMaxxII 6 26 1 5.0E-4 0.0010 Q
+   0.021 0.015
+   0.036 0.05
+   0.043 0.103
+   0.049 0.198
+   0.08 1.636
+   0.092 1.3
+   0.109 0.995
+   0.124 0.805
+   0.133 0.442
+   0.143 0.301
+   0.164 0.21
+   0.186 0.149
+   0.199 0.183
+   0.235 0.145
+   0.256 0.145
+   0.293 0.149
+   0.327 0.164
+   0.367 0.156
+   0.387 0.175
+   0.409 0.183
+   0.431 0.191
+   0.461 0.21
+   0.474 0.202
+   0.49 0.217
+   0.505 0.175
+   0.513 0.198
+   0.537 0.172
+   0.553 0.175
+   0.602 0.156
+   0.623 0.175
+   0.644 0.183
+   0.674 0.21
+   0.689 0.191
+   0.697 0.229
+   0.731 0.21
+   0.753 0.092
+   0.771 0.0