Merge remote-tracking branch 'upstream/master' into kruland-integration
Conflicts: core/.classpath
This commit is contained in:
kruland2607
commit
3212beb27c
@ -20,8 +20,6 @@
|
||||
<classpathentry kind="lib" path="lib-test/uispec4j-2.3-jdk16.jar"/>
|
||||
<classpathentry kind="lib" path="resources"/>
|
||||
<classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jogl/jogl.all.jar"/>
|
||||
<classpathentry kind="lib" path="lib/OrangeExtensions-1.2.jar"/>
|
||||
<classpathentry kind="lib" path="lib/guice-3.0.jar"/>
|
||||
<classpathentry kind="lib" path="lib/guice-multibindings-3.0.jar"/>
|
||||
@ -29,6 +27,8 @@
|
||||
<classpathentry kind="lib" path="lib/aopalliance.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jcommon-1.0.17.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jfreechart-1.0.14.jar" sourcepath="reference/jfreechart-1.0.14-sources.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jogl/jogl-all.jar"/>
|
||||
<classpathentry kind="lib" path="lib-test/test-plugin.jar"/>
|
||||
<classpathentry kind="lib" path="lib/annotation-detector-3.0.2-SNAPSHOT.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="${main-class}" />
|
||||
<attribute name="SplashScreen-Image" value="pix/splashscreen.png" />
|
||||
<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl.all.jar" />
|
||||
<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl-all.jar" />
|
||||
</manifest>
|
||||
|
||||
<!-- Include, in the root of the JAR, the resources needed by OR -->
|
||||
@ -218,7 +218,7 @@
|
||||
<!-- CHECK TODOs -->
|
||||
<target name="todo" depends="checktodo"/>
|
||||
<target name="checktodo">
|
||||
<tempfile property="todo.file" prefix="${tmp.dir}/checktodo-"/>
|
||||
<tempfile property="todo.file" prefix="checktodo-" destDir="${tmp.dir}"/>
|
||||
<echo>Checking project for FIXMEs.</echo>
|
||||
<concat destfile="${todo.file}">
|
||||
<fileset dir="${src.dir}">
|
||||
@ -244,7 +244,7 @@ ${criticaltodos}</fail>
|
||||
<!-- CHECK ASCII -->
|
||||
<target name="ascii" depends="checkascii"/>
|
||||
<target name="checkascii">
|
||||
<tempfile property="ascii.file" prefix="${tmp.dir}/checkascii-"/>
|
||||
<tempfile property="ascii.file" prefix="checkascii-" destDir="${tmp.dir}"/>
|
||||
<echo>Checking project for non-ASCII characters.</echo>
|
||||
<concat destfile="${ascii.file}">
|
||||
<fileset dir="${src.dir}">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
Downloaded 2013/03/13
|
||||
Rocket motor simulation data downloaded from ThrustCurve.org.
|
||||
This ZIP file contains 1556 simulator data files.
|
||||
This ZIP file contains 1581 simulator data files.
|
||||
For more info, please see http://www.thrustcurve.org/
|
||||
|
||||
AMW_I195.eng
|
||||
@ -1864,6 +1865,13 @@ AeroTech_H128.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
AeroTech_H135.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: H135W
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Robert Belknap
|
||||
|
||||
AeroTech_H148.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: H148R
|
||||
@ -3434,12 +3442,19 @@ AeroTech_M1600.rse
|
||||
|
||||
AeroTech_M1780.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: M1780T
|
||||
Designation: M1780NT
|
||||
Data Format: RASP
|
||||
Data Source: mfr
|
||||
Contributor: Mark Koelsch
|
||||
|
||||
AeroTech_M1780_1.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: M1780T
|
||||
Data Format: RASP
|
||||
Data Source: mfr
|
||||
Contributor: Mark Koelsch
|
||||
|
||||
AeroTech_M1780_2.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: M1780T
|
||||
Data Format: RASP
|
||||
@ -3551,6 +3566,13 @@ AeroTech_M650.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
AeroTech_M685.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: M685W-PS
|
||||
Data Format: RASP
|
||||
Data Source: mfr
|
||||
Contributor: Mark Koelsch
|
||||
|
||||
AeroTech_M750.eng
|
||||
Manufacturer: AeroTech
|
||||
Designation: M750W
|
||||
@ -3796,6 +3818,13 @@ Apogee_F10.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
Cesaroni_E22.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: E22-SS-13A
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_E22.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: E22-SS-13A
|
||||
@ -3803,6 +3832,13 @@ Cesaroni_E22.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_E31.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: E31-WT-15A
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_E31.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: E31-WT-15A
|
||||
@ -3908,6 +3944,13 @@ Cesaroni_F36_1.rse
|
||||
Data Source: cert
|
||||
Contributor: Len Bryan
|
||||
|
||||
Cesaroni_F50.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: F50-SK-13A
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_F50.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: F50-SK-13A
|
||||
@ -3915,6 +3958,13 @@ Cesaroni_F50.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_F51.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: F51-CL-12A
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_F51.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: F51-CL-12A
|
||||
@ -4909,6 +4959,20 @@ Cesaroni_I120.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_I125.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 567-I125-WH/LB
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_I125.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 567-I125-WH/LB
|
||||
Data Format: RockSim
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_I140.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 396-I140-14A
|
||||
@ -5728,6 +5792,13 @@ Cesaroni_J449.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_J453.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: J453-WH-16A
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_J453.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: J453-WH-16A
|
||||
@ -5938,6 +6009,13 @@ Cesaroni_K1720.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
Cesaroni_K2000.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K2000-VM-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_K2000.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K2000-VM-P
|
||||
@ -6234,10 +6312,10 @@ Cesaroni_K635.rse
|
||||
|
||||
Cesaroni_K650.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 1750 K650SS-16A
|
||||
Designation: K650-PK-21A
|
||||
Data Format: RASP
|
||||
Data Source: mfr
|
||||
Contributor: Casey Hatch
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_K650.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
@ -6246,6 +6324,13 @@ Cesaroni_K650.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_K650_1.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 1750 K650SS-16A
|
||||
Data Format: RASP
|
||||
Data Source: mfr
|
||||
Contributor: Casey Hatch
|
||||
|
||||
Cesaroni_K650_1.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 1750 K650SS-16A
|
||||
@ -6267,6 +6352,13 @@ Cesaroni_K660.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
Cesaroni_K661.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K661-BS-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_K661.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K661-BS-P
|
||||
@ -6323,6 +6415,13 @@ Cesaroni_K710.rse
|
||||
Data Source: cert
|
||||
Contributor: Len Bryan
|
||||
|
||||
Cesaroni_K735.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K735-SK-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_K735.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: K735-SK-P
|
||||
@ -6428,6 +6527,13 @@ Cesaroni_L1030.rse
|
||||
Data Source: mfr
|
||||
Contributor: Thomas Raithby
|
||||
|
||||
Cesaroni_L1050.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L1050-BS-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L1050.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L1050-BS-P
|
||||
@ -6498,6 +6604,13 @@ Cesaroni_L1290.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L1350.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L1350-CS-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L1350.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L1350-CS-P
|
||||
@ -6582,6 +6695,13 @@ Cesaroni_L3150.rse
|
||||
Data Source: mfr
|
||||
Contributor: Thomas Raithby
|
||||
|
||||
Cesaroni_L3200.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L3200-VM-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L3200.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L3200-VM-P
|
||||
@ -6631,6 +6751,13 @@ Cesaroni_L640.rse
|
||||
Data Source: cert
|
||||
Contributor: Len Bryan
|
||||
|
||||
Cesaroni_L645.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L645-GR-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L645.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L645-GR-P
|
||||
@ -6673,6 +6800,13 @@ Cesaroni_L800_1.eng
|
||||
Data Source: mfr
|
||||
Contributor: Casey Hatch
|
||||
|
||||
Cesaroni_L805.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L805-WH-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L805.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L805-WH-P
|
||||
@ -6722,6 +6856,13 @@ Cesaroni_L890.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
Cesaroni_L910.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L910-CS-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_L910.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: L910-CS-P
|
||||
@ -7261,6 +7402,20 @@ Cesaroni_M520.rse
|
||||
Data Source: user
|
||||
Contributor: John Coker
|
||||
|
||||
Cesaroni_M6400.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 8634-M6400-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_M6400.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 8634-M6400-P
|
||||
Data Format: RockSim
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_M795.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 10133 M795-P
|
||||
@ -7513,6 +7668,13 @@ Cesaroni_N5800.rse
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_O25000.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 30795-O25000-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_O25000.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 30795-O25000-P
|
||||
@ -7520,6 +7682,20 @@ Cesaroni_O25000.rse
|
||||
Data Source: user
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_O3400.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 21062-O3400-P
|
||||
Data Format: RASP
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_O3400.rse
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 21062-O3400-P
|
||||
Data Format: RockSim
|
||||
Data Source: cert
|
||||
Contributor: Andre Choquette
|
||||
|
||||
Cesaroni_O3700.eng
|
||||
Manufacturer: Cesaroni Technology
|
||||
Designation: 29920-O3700-P
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
; AeroTech Pro-SU 29mm H135 14sec adjustable delay.
|
||||
; From Tripoli Data Sheet updated 2013/02/10
|
||||
; Created by Robert Belknap 2013/03/04
|
||||
H135W 29 216 6-8-10-12-14 0.082 0.212 AT
|
||||
0.014 159.806
|
||||
0.045 110.931
|
||||
0.104 144.43
|
||||
0.131 135.643
|
||||
0.252 154.315
|
||||
0.293 130.701
|
||||
0.387 149.921
|
||||
1.005 140.037
|
||||
1.261 119.168
|
||||
1.297 142.233
|
||||
1.324 109.833
|
||||
1.387 120.267
|
||||
1.518 110.382
|
||||
1.595 80.727
|
||||
1.685 60.408
|
||||
1.797 33.499
|
||||
1.896 14.278
|
||||
2.072 0.0
|
||||
@ -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
|
||||
@ -0,0 +1,24 @@
|
||||
; M685W-PS Moonburner
|
||||
M685W-PS 75 801 P 4.32 7.008 AT
|
||||
0.083 1333.469
|
||||
0.13 1368.376
|
||||
0.249 1361.395
|
||||
0.308 1380.012
|
||||
0.403 1359.068
|
||||
0.675 1184.53
|
||||
1.018 1072.826
|
||||
1.456 996.029
|
||||
1.977 958.794
|
||||
2.995 914.578
|
||||
3.99 856.399
|
||||
4.985 781.929
|
||||
5.494 730.732
|
||||
5.991 679.534
|
||||
7.258 542.231
|
||||
7.862 463.107
|
||||
8.015 456.125
|
||||
8.998 330.458
|
||||
9.993 207.118
|
||||
10.514 137.303
|
||||
11.496 34.908
|
||||
11.994 0.0
|
||||
@ -0,0 +1,18 @@
|
||||
;Smoky Sam 24mm 1G
|
||||
;24-E22-SS-13A
|
||||
24-E22-SS-13A 24 69 13-10-8-6-4 0.0203 0.0565 CTI
|
||||
0.008 18.292
|
||||
0.026 30
|
||||
0.038 30.792
|
||||
0.067 18.708
|
||||
0.101 21.875
|
||||
0.33 26.083
|
||||
0.528 28.042
|
||||
0.716 27.875
|
||||
0.841 23.542
|
||||
0.912 17.833
|
||||
0.987 7
|
||||
1.016 3.333
|
||||
1.065 1.083
|
||||
1.087 0
|
||||
;
|
||||
@ -0,0 +1,16 @@
|
||||
;White 24mm 1G
|
||||
;26-E31-WH-15A
|
||||
26-E31-WH-15A 24 69 15-12-10-8-6 0.0169 0.052 CTI
|
||||
0.02 43.824
|
||||
0.027 39.964
|
||||
0.049 26.781
|
||||
0.113 32.601
|
||||
0.193 34.739
|
||||
0.282 35.808
|
||||
0.5 34.442
|
||||
0.727 29.276
|
||||
0.771 22.743
|
||||
0.807 9.561
|
||||
0.84 3.563
|
||||
0.87 0
|
||||
;
|
||||
@ -0,0 +1,15 @@
|
||||
; Skidmark 24mm 3G
|
||||
; 60-F50-SK-13A
|
||||
60-F50-SK-13A 24 133 13-10-8-6-4 0.0382 0.0939 CTI
|
||||
0.015 64.982
|
||||
0.022 69.516
|
||||
0.064 55.537
|
||||
0.118 62.81
|
||||
0.342 62.149
|
||||
0.536 59.41
|
||||
0.743 53.837
|
||||
0.884 46.942
|
||||
0.976 40.047
|
||||
1.096 12.562
|
||||
1.246 2.078
|
||||
1.298 0.0
|
||||
@ -0,0 +1,12 @@
|
||||
; Classic 24mm 3G
|
||||
; 75-F51-CL-12A
|
||||
75-F51-CL-12A 24 133 12-9-7-5 0.040 0.095 CTI
|
||||
0.02 75.924
|
||||
0.031 84.148
|
||||
0.062 70.441
|
||||
0.117 73.659
|
||||
1.211 38.737
|
||||
1.376 14.779
|
||||
1.456 7.271
|
||||
1.532 3.337
|
||||
1.577 0.0
|
||||
@ -0,0 +1,17 @@
|
||||
; CTI Pro-38 5G
|
||||
; 567 I125 WH LB 10A
|
||||
567-I125-WH-LB-10 38 367 10-7-5-3 0.3556 0.647 CTI
|
||||
0.046 174.74
|
||||
0.089 267.82
|
||||
0.135 235.986
|
||||
0.258 193.772
|
||||
0.35 182.007
|
||||
0.553 174.74
|
||||
1.124 176.125
|
||||
1.502 173.01
|
||||
1.806 162.284
|
||||
2.439 135.986
|
||||
3.372 84.775
|
||||
4.005 36.678
|
||||
4.395 14.879
|
||||
4.585 0.0
|
||||
@ -0,0 +1,31 @@
|
||||
<engine-database>
|
||||
<engine-list>
|
||||
<engine mfg="CTI" code="567-I125-WH-LB-10" Type="reloadable" dia="38." len="367."
|
||||
initWt="647." propWt="355.6" delays="10,7,5,3" auto-calc-mass="1"
|
||||
auto-calc-cg="1" avgThrust="124.202" peakThrust="267.82" throatDia="0."
|
||||
exitDia="0." Itot="569.465" burn-time="4.58" massFrac="54.96" 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>CTI Pro-38 5G
|
||||
567 I125 WH LB 10A
|
||||
</comments>
|
||||
<data>
|
||||
<eng-data t="0." f="0." m="355.6" cg="183.5"/>
|
||||
<eng-data t="0.046" f="174.74" m="353.09" cg="183.5"/>
|
||||
<eng-data t="0.089" f="267.82" m="347.149" cg="183.5"/>
|
||||
<eng-data t="0.135" f="235.986" m="339.913" cg="183.5"/>
|
||||
<eng-data t="0.258" f="193.772" m="323.409" cg="183.5"/>
|
||||
<eng-data t="0.35" f="182.007" m="312.615" cg="183.5"/>
|
||||
<eng-data t="0.553" f="174.74" m="290.004" cg="183.5"/>
|
||||
<eng-data t="1.124" f="176.125" m="227.452" cg="183.5"/>
|
||||
<eng-data t="1.502" f="173.01" m="186.247" cg="183.5"/>
|
||||
<eng-data t="1.806" f="162.284" m="154.422" cg="183.5"/>
|
||||
<eng-data t="2.439" f="135.986" m="95.4728" cg="183.5"/>
|
||||
<eng-data t="3.372" f="84.775" m="31.1642" cg="183.5"/>
|
||||
<eng-data t="4.005" f="36.678" m="7.16059" cg="183.5"/>
|
||||
<eng-data t="4.395" f="14.879" m="0.882657" cg="183.5"/>
|
||||
<eng-data t="4.585" f="0." m="0." cg="183.5"/>
|
||||
</data>
|
||||
</engine>
|
||||
</engine-list>
|
||||
</engine-database>
|
||||
@ -0,0 +1,14 @@
|
||||
; White 38mm 6GXL
|
||||
; 1013-J453-WH-16A
|
||||
1013-J453-WH-16A 38 500 16-13-11-9-7 0.6132 0.9643 CTI
|
||||
0.018 663.789
|
||||
0.04 725.18
|
||||
0.105 630.216
|
||||
0.23 578.417
|
||||
0.451 543.885
|
||||
1.454 535.252
|
||||
1.797 291.607
|
||||
1.91 188.969
|
||||
2.088 128.537
|
||||
2.276 19.185
|
||||
2.364 0.0
|
||||
@ -0,0 +1,16 @@
|
||||
; VMax 75mm 2G
|
||||
; 2330-K2000-VM-P
|
||||
2330-K2000-VM-P 75 350 P 1.1642 2.4645 CTI
|
||||
0.01 1979.532
|
||||
0.029 1634.503
|
||||
0.161 1947.368
|
||||
0.321 2190.058
|
||||
0.457 2397.661
|
||||
0.548 2473.684
|
||||
0.678 2383.041
|
||||
0.768 2263.158
|
||||
0.977 1923.977
|
||||
1.027 1883.041
|
||||
1.104 859.649
|
||||
1.149 87.719
|
||||
1.191 0.0
|
||||
@ -1,17 +1,12 @@
|
||||
;Pink 54mm 5G
|
||||
;1997-K650-PK-21
|
||||
1997-K650-PK-21 54 488 21-19-17-15-13-11 1.0651 1.71 CTI
|
||||
0.011 1353.5
|
||||
0.028 793.832
|
||||
0.186 815.421
|
||||
2.578 601.186
|
||||
2.689 479.953
|
||||
2.855 189.324
|
||||
3.086 43.179
|
||||
3.451 0
|
||||
;
|
||||
;
|
||||
K650SS 54.0 488.00 6-16 1.28100 1.98990 CTI
|
||||
0.04 664.52
|
||||
0.12 645.90
|
||||
0.31 642.24
|
||||
0.60 664.78
|
||||
0.91 684.59
|
||||
1.22 712.82
|
||||
1.50 723.41
|
||||
1.80 728.70
|
||||
2.10 664.52
|
||||
2.40 614.68
|
||||
2.51 680.53
|
||||
2.55 534.62
|
||||
2.61 268.19
|
||||
2.66 0.00
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
;
|
||||
;
|
||||
K650SS 54.0 488.00 6-16 1.28100 1.98990 CTI
|
||||
0.04 664.52
|
||||
0.12 645.90
|
||||
0.31 642.24
|
||||
0.60 664.78
|
||||
0.91 684.59
|
||||
1.22 712.82
|
||||
1.50 723.41
|
||||
1.80 728.70
|
||||
2.10 664.52
|
||||
2.40 614.68
|
||||
2.51 680.53
|
||||
2.55 534.62
|
||||
2.61 268.19
|
||||
2.66 0.00
|
||||
@ -0,0 +1,19 @@
|
||||
; Blue Streak 75mm 2G
|
||||
; 2430-K661-BS-P
|
||||
2430-K661-BS-P 75 350 P 1.2625 2.5278 CTI
|
||||
0.041 588.591
|
||||
0.073 659.371
|
||||
0.122 635.157
|
||||
0.225 634.226
|
||||
0.679 713.388
|
||||
1.039 751.572
|
||||
1.241 758.091
|
||||
1.832 727.357
|
||||
2.298 687.311
|
||||
2.729 667.753
|
||||
3.195 645.402
|
||||
3.367 670.547
|
||||
3.584 182.538
|
||||
3.672 55.879
|
||||
3.72 18.626
|
||||
3.798 0.0
|
||||
@ -0,0 +1,17 @@
|
||||
; Skidmark 75mm 2G
|
||||
; 1955-K735-SK-P
|
||||
1955-K735-SK-P 75 350 P 1.2221 2.5088 CTI
|
||||
0.053 683.157
|
||||
0.142 593.64
|
||||
0.408 697.291
|
||||
0.893 848.057
|
||||
1.109 886.926
|
||||
1.24 882.214
|
||||
1.362 889.282
|
||||
2.0 783.274
|
||||
2.346 706.714
|
||||
2.439 648.999
|
||||
2.612 123.675
|
||||
2.676 36.514
|
||||
2.754 12.956
|
||||
2.831 0.0
|
||||
@ -0,0 +1,18 @@
|
||||
; Blue Streak 75mm 3G
|
||||
; 3727-L1050-BS-P
|
||||
3727-L1050-BS-P 75 486 P 1.8634 3.4477 CTI
|
||||
0.035 721.412
|
||||
0.081 1110.118
|
||||
0.131 1057.412
|
||||
0.249 1100.235
|
||||
0.913 1194.118
|
||||
1.125 1207.294
|
||||
2.271 1100.235
|
||||
2.797 1055.765
|
||||
3.076 1042.588
|
||||
3.122 996.471
|
||||
3.23 807.059
|
||||
3.452 289.882
|
||||
3.544 123.529
|
||||
3.685 36.235
|
||||
3.731 0.0
|
||||
@ -0,0 +1,18 @@
|
||||
; C-Star 75mm 3G
|
||||
; 4263-L1350-CS-P
|
||||
4263-L1350-CS-P 75 486 P 2.0245 3.5707 CTI
|
||||
0.016 1421.724
|
||||
0.034 1345.218
|
||||
0.049 1502.479
|
||||
0.081 1415.348
|
||||
0.21 1432.349
|
||||
0.453 1432.349
|
||||
0.809 1462.102
|
||||
1.07 1534.357
|
||||
1.28 1540.732
|
||||
2.661 1283.589
|
||||
2.843 1277.214
|
||||
2.932 1115.702
|
||||
3.037 488.784
|
||||
3.163 82.881
|
||||
3.284 0.0
|
||||
@ -0,0 +1,16 @@
|
||||
; VMax 75mm 3G
|
||||
; 3300-L3200-VM-P
|
||||
3300-L3200-VM-P 75 486 P 1.6584 3.2637 CTI
|
||||
0.008 3315.23
|
||||
0.024 2672.963
|
||||
0.108 2975.207
|
||||
0.415 3669.421
|
||||
0.524 3711.924
|
||||
0.644 3669.421
|
||||
0.819 3225.502
|
||||
0.911 3022.432
|
||||
0.937 3050.767
|
||||
0.957 2899.646
|
||||
1.022 288.076
|
||||
1.039 51.948
|
||||
1.055 0.0
|
||||
@ -0,0 +1,15 @@
|
||||
; Green 75mm 3G
|
||||
; 3419-L645-GR-P
|
||||
3419-L645-GR-P 75 486 P 2.1441 3.7518 CTI
|
||||
0.05 511.243
|
||||
0.12 647.574
|
||||
0.256 689.231
|
||||
0.425 684.497
|
||||
1.554 736.568
|
||||
2.043 764.97
|
||||
3.075 687.337
|
||||
4.557 601.183
|
||||
4.756 550.059
|
||||
4.985 412.781
|
||||
5.281 69.112
|
||||
5.39 0.0
|
||||
@ -0,0 +1,14 @@
|
||||
;White 54mm 6GXL
|
||||
;2833-L805-WH-P
|
||||
2833-L805-WH-P 54 649 0 1.6752 2.5025 CTI
|
||||
0.012 1618.1
|
||||
0.037 1171.8
|
||||
0.173 1027.97
|
||||
0.388 994.125
|
||||
0.626 985.664
|
||||
2.318 886.251
|
||||
3.054 448.414
|
||||
3.464 126.91
|
||||
3.608 40.188
|
||||
3.827 0
|
||||
;
|
||||
@ -0,0 +1,17 @@
|
||||
;C-Star 75mm 2G
|
||||
;2856-L910-CS-P
|
||||
2856-L910-CS-P 75 350 0 1.3643 2.6158 CTI
|
||||
0.034 858.741
|
||||
0.056 921.678
|
||||
0.305 952.448
|
||||
0.718 983.217
|
||||
1.221 1047.55
|
||||
1.642 1005.59
|
||||
1.842 973.427
|
||||
2.951 773.427
|
||||
3.035 584.615
|
||||
3.108 169.231
|
||||
3.152 72.727
|
||||
3.182 27.972
|
||||
3.262 0
|
||||
;
|
||||
@ -0,0 +1,15 @@
|
||||
; CTI Pro-98 4G
|
||||
; 8634 M6400-VM P
|
||||
8634-M6400-VM-P 98 702 P 4.308 7.9190000000000005 CTI
|
||||
0.011 6079.636
|
||||
0.135 6598.407
|
||||
0.354 7080.774
|
||||
0.503 7244.596
|
||||
0.713 7162.685
|
||||
0.954 6707.622
|
||||
1.183 5688.282
|
||||
1.233 5460.751
|
||||
1.26 4914.676
|
||||
1.288 3394.767
|
||||
1.331 800.91
|
||||
1.383 0.0
|
||||
@ -0,0 +1,29 @@
|
||||
<engine-database>
|
||||
<engine-list>
|
||||
<engine mfg="CTI" code="8634-M6400-VM-P" Type="reloadable" dia="98." len="702."
|
||||
initWt="7919." propWt="4308." delays="0" auto-calc-mass="1" auto-calc-cg="1"
|
||||
avgThrust="6243.1" peakThrust="7244.6" throatDia="0." exitDia="0." Itot="8634.21"
|
||||
burn-time="1.38" massFrac="54.4" Isp="204.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>CTI Pro-98 4G
|
||||
8634 M6400-VM P
|
||||
</comments>
|
||||
<data>
|
||||
<eng-data t="0." f="0." m="4308." cg="351."/>
|
||||
<eng-data t="0.011" f="6079.64" m="4291.32" cg="351."/>
|
||||
<eng-data t="0.135" f="6598.41" m="3899.13" cg="351."/>
|
||||
<eng-data t="0.354" f="7080.77" m="3151.77" cg="351."/>
|
||||
<eng-data t="0.503" f="7244.6" m="2619.28" cg="351."/>
|
||||
<eng-data t="0.713" f="7162.69" m="1864.49" cg="351."/>
|
||||
<eng-data t="0.954" f="6707.62" m="1030.57" cg="351."/>
|
||||
<eng-data t="1.183" f="5688.28" m="322.397" cg="351."/>
|
||||
<eng-data t="1.233" f="5460.75" m="183.328" cg="351."/>
|
||||
<eng-data t="1.26" f="4914.68" m="113.442" cg="351."/>
|
||||
<eng-data t="1.288" f="3394.77" m="55.3983" cg="351."/>
|
||||
<eng-data t="1.331" f="800.91" m="10.3899" cg="351."/>
|
||||
<eng-data t="1.383" f="0." m="0." cg="351."/>
|
||||
</data>
|
||||
</engine>
|
||||
</engine-list>
|
||||
</engine-database>
|
||||
@ -0,0 +1,14 @@
|
||||
; CTI 30,795-O25,000-VM-P
|
||||
; Single-Use
|
||||
O25,000-VM-P 132 1407 P 14.705 23.558 CTI
|
||||
0.0080 21113.445
|
||||
0.022 24705.882
|
||||
0.042 26281.513
|
||||
0.067 24390.756
|
||||
0.201 24044.118
|
||||
0.56 25052.521
|
||||
0.927 24075.63
|
||||
1.202 22815.126
|
||||
1.25 23602.941
|
||||
1.297 4852.941
|
||||
1.32 0.0
|
||||
@ -0,0 +1,18 @@
|
||||
; CTI Pro-98 6GXL
|
||||
; 21062 O3400-IM P
|
||||
21062-O3400-IM-P 98 1239 P 11.272 16.842 CTI
|
||||
0.04 3959.811
|
||||
0.052 4432.624
|
||||
0.101 4515.366
|
||||
0.19 4420.804
|
||||
0.38 4391.253
|
||||
0.965 4444.444
|
||||
2.176 4698.582
|
||||
2.887 4592.199
|
||||
3.658 4225.768
|
||||
4.17 2854.61
|
||||
4.493 2559.102
|
||||
4.881 1619.385
|
||||
5.483 868.794
|
||||
6.137 248.227
|
||||
6.322 0.0
|
||||
@ -0,0 +1,32 @@
|
||||
<engine-database>
|
||||
<engine-list>
|
||||
<engine mfg="CTI" code="21062-O3400-IM-P" Type="reloadable" dia="98." len="1239."
|
||||
initWt="16842." propWt="11272." delays="0" auto-calc-mass="1" auto-calc-cg="1"
|
||||
avgThrust="3328.22" peakThrust="4698.58" throatDia="0." exitDia="0."
|
||||
Itot="21041." burn-time="6.32" massFrac="66.93" Isp="190.35" 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 Pro-98 6GXL
|
||||
21062 O3400-IM P
|
||||
</comments>
|
||||
<data>
|
||||
<eng-data t="0." f="0." m="11272." cg="619.5"/>
|
||||
<eng-data t="0.04" f="3959.81" m="11229.6" cg="619.5"/>
|
||||
<eng-data t="0.052" f="4432.62" m="11202.6" cg="619.5"/>
|
||||
<eng-data t="0.101" f="4515.37" m="11085.2" cg="619.5"/>
|
||||
<eng-data t="0.19" f="4420.8" m="10872.1" cg="619.5"/>
|
||||
<eng-data t="0.38" f="4391.25" m="10423.7" cg="619.5"/>
|
||||
<eng-data t="0.965" f="4444.44" m="9039.12" cg="619.5"/>
|
||||
<eng-data t="2.176" f="4698.58" m="6073.35" cg="619.5"/>
|
||||
<eng-data t="2.887" f="4592.2" m="4303.95" cg="619.5"/>
|
||||
<eng-data t="3.658" f="4225.77" m="2482.87" cg="619.5"/>
|
||||
<eng-data t="4.17" f="2854.61" m="1511.85" cg="619.5"/>
|
||||
<eng-data t="4.493" f="2559.1" m="1043.46" cg="619.5"/>
|
||||
<eng-data t="4.881" f="1619.38" m="609.199" cg="619.5"/>
|
||||
<eng-data t="5.483" f="868.794" m="207.979" cg="619.5"/>
|
||||
<eng-data t="6.137" f="248.227" m="12.3006" cg="619.5"/>
|
||||
<eng-data t="6.322" f="0." m="0." cg="619.5"/>
|
||||
</data>
|
||||
</engine>
|
||||
</engine-list>
|
||||
</engine-database>
|
||||
@ -0,0 +1,27 @@
|
||||
<engine-database>
|
||||
<engine-list>
|
||||
<engine FDiv="10" FFix="1" FStep="-1." Isp="199.98" Itot="1157.08" Type="hybrid" auto-calc-cg="1" auto-calc-mass="1" avgThrust="178.012" burn-time="6.5" cgDiv="10" cgFix="1" cgStep="-1." code="J175" delays="1000" dia="54." exitDia="0." initWt="1264." len="327." mDiv="10" mFix="1" mStep="-1." massFrac="46.68" mfg="Loki Research" peakThrust="420.4" propWt="590." tDiv="10" tFix="1" tStep="-1." throatDia="0.">
|
||||
<data>
|
||||
<eng-data cg="163.5" f="0." m="590." t="0."/>
|
||||
<eng-data cg="163.5" f="4.8" m="589.988" t="0.01"/>
|
||||
<eng-data cg="163.5" f="420.4" m="580.231" t="0.1"/>
|
||||
<eng-data cg="163.5" f="347.5" m="560.653" t="0.2"/>
|
||||
<eng-data cg="163.5" f="349.9" m="542.873" t="0.3"/>
|
||||
<eng-data cg="163.5" f="364.5" m="524.659" t="0.4"/>
|
||||
<eng-data cg="163.5" f="320.7" m="507.19" t="0.5"/>
|
||||
<eng-data cg="163.5" f="296.4" m="428.524" t="1."/>
|
||||
<eng-data cg="163.5" f="279.4" m="355.123" t="1.5"/>
|
||||
<eng-data cg="163.5" f="260." m="286.363" t="2."/>
|
||||
<eng-data cg="163.5" f="238.1" m="222.867" t="2.5"/>
|
||||
<eng-data cg="163.5" f="209." m="165.872" t="3."/>
|
||||
<eng-data cg="163.5" f="172." m="117.304" t="3.5"/>
|
||||
<eng-data cg="163.5" f="133.6" m="78.3469" t="4."/>
|
||||
<eng-data cg="163.5" f="102." m="48.3135" t="4.5"/>
|
||||
<eng-data cg="163.5" f="75.3" m="25.712" t="5."/>
|
||||
<eng-data cg="163.5" f="46.2" m="10.2236" t="5.5"/>
|
||||
<eng-data cg="163.5" f="17." m="2.1671" t="6."/>
|
||||
<eng-data cg="163.5" f="0." m="0." t="6.5"/>
|
||||
</data>
|
||||
</engine>
|
||||
</engine-list>
|
||||
</engine-database>
|
||||
Binary file not shown.
Binary file not shown.
@ -220,6 +220,7 @@ MaterialModel.title.Defcustmat = D
|
||||
pref.dlg.but.add = Ajouter
|
||||
pref.dlg.but.reset = Réinitialiser
|
||||
pref.dlg.but.checknow = Vérifier maintenant
|
||||
pref.dlg.but.openlast = Ouvrir le dernier fichier de projet au démarrage
|
||||
pref.dlg.but.defaultmetric = Système métrique
|
||||
pref.dlg.but.defaultimperial = Système impérial
|
||||
pref.dlg.title.Preferences = Préférences
|
||||
@ -359,8 +360,10 @@ simedtdlg.IntensityDesc.High = Haute
|
||||
simedtdlg.IntensityDesc.Veryhigh = Très haute
|
||||
simedtdlg.IntensityDesc.Extreme = Extrême
|
||||
|
||||
GeodeticComputationStrategy.none.name = Aucune
|
||||
GeodeticComputationStrategy.none.desc = Ne pas faire de calculs geodetic.
|
||||
GeodeticComputationStrategy.flat.name = Flat Earth
|
||||
GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation. Sufficient for low-altitude flights.
|
||||
#GeodeticComputationStrategy.none.name = Aucune
|
||||
#GeodeticComputationStrategy.none.desc = Ne pas faire de calculs geodetic.
|
||||
GeodeticComputationStrategy.spherical.name = Approximation sphérique
|
||||
GeodeticComputationStrategy.spherical.desc = <html>Performe des calculs geodetic en assumant une terre sphérique.<br>Ceci est suffisamment précis dans la plupart des cas.
|
||||
GeodeticComputationStrategy.wgs84.name = ellipsoïde WGS84
|
||||
@ -631,6 +634,8 @@ componentanalysisdlg.lbl.reflenght = Longueur de r
|
||||
componentanalysisdlg.lbl.refarea = Aire de référence:
|
||||
!componentanalysisdlg.but.close =Fermer
|
||||
componentanalysisdlg.TabStability.Col.Component = Pièce
|
||||
componentanalysisdlg.TOTAL = Total
|
||||
componentanalysisdlg.noWarnings = <html><i><font color=\"gray\">Pas d'alertes.</font></i>
|
||||
|
||||
! Custom Material dialog
|
||||
custmatdlg.title.Custommaterial = Matériau personnalisé
|
||||
@ -1048,6 +1053,7 @@ TCMotorSelPan.lbl.Digest = Assimilation:
|
||||
TCMotorSelPan.title.Thrustcurve = Courbe de poussée:
|
||||
TCMotorSelPan.title.Thrust = Poussée
|
||||
TCMotorSelPan.delayBox.None = Aucun
|
||||
TCMotorSelPan.noDescription = Aucune description disponible
|
||||
|
||||
|
||||
! PlotDialog
|
||||
@ -1094,6 +1100,7 @@ main.menu.edit.paste = Coller
|
||||
main.menu.edit.delete = Effacer
|
||||
main.menu.edit.resize = Redimensionner...
|
||||
main.menu.edit.resize.desc = Redimensionner certaines parties de la fusée
|
||||
main.menu.edit.editpreset= Edit Component Preset File
|
||||
main.menu.edit.preferences = Préférences
|
||||
main.menu.edit.preferences.desc = Configure les préférences de l'application
|
||||
|
||||
@ -1331,6 +1338,15 @@ TCurveMotorCol.TYPE = Type
|
||||
TCurveMotorCol.DIAMETER = Diamètre
|
||||
TCurveMotorCol.LENGTH = Longueur
|
||||
|
||||
TCurveMotor.ttip.diameter = Diamètre:
|
||||
TCurveMotor.ttip.length = Longeur:
|
||||
TCurveMotor.ttip.maxThrust = Poussée Maximum:
|
||||
TCurveMotor.ttip.avgThrust = Poussée moyenne:
|
||||
TCurveMotor.ttip.burnTime = Durée de la combustion:
|
||||
TCurveMotor.ttip.totalImpulse = Impulsion Totale:
|
||||
TCurveMotor.ttip.launchMass = Masse au décolage:
|
||||
TCurveMotor.ttip.emptyMass = Masse à vide:
|
||||
|
||||
! RocketInfo
|
||||
RocketInfo.lengthLine.Length = Longueur
|
||||
RocketInfo.lengthLine.maxdiameter = , diamètre max.
|
||||
@ -1716,6 +1732,7 @@ ComponentPresetChooserDialog.menu.sortAsc = Trier par ordre croissant
|
||||
ComponentPresetChooserDialog.menu.sortDesc = Trier par ordre dé-croissant
|
||||
ComponentPresetChooserDialog.menu.units = Unités
|
||||
ComponentPresetChooserDialog.checkbox.showAllCompatible = Montrer tous ceux qui sont compatibles
|
||||
ComponentPresetChooserDialog.lbl.favorites = Select to add preset to drop-down menu
|
||||
table.column.Favorite = Préférée
|
||||
table.column.Manufacturer = Frabriquant
|
||||
table.column.PartNo = Réference de la pièce
|
||||
|
||||
1753
core/resources/l10n/messages_ja.properties
Normal file
1753
core/resources/l10n/messages_ja.properties
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user