hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1998 from SiboVG/unstable

Browse Source 
Update thrust curves & parts database
This commit is contained in:
Sibo Van Gool 2023-01-26 19:48:05 +01:00 committed by GitHub
commit e97198a3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReleaseNotes.md
View File

@ -15,7 +15,7 @@ Release Notes
<div id="22.02.RC.01"> <div id="22.02.RC.01">
OpenRocket 22.02.RC.01 (2023-01-xx) OpenRocket 22.02.RC.01 (2023-01-27)
------------------------ ------------------------
(through PR1996) (through PR1996)

13
build.xml
View File

@ -64,6 +64,19 @@
<ant dir="swing" target="unittest-no-junit-report" inheritAll="false" /> <ant dir="swing" target="unittest-no-junit-report" inheritAll="false" />
</target> </target>
<target name="serialize-motors-core">
<ant dir="core" target="serialize-motors" inheritAll="false" />
</target>
<!-- UPDATE -->
<target name="update" depends="serialize-motors-core">
<exec dir="." executable="git">
<arg value="submodule"/>
<arg value="update"/>
<arg value="--remote"/>
</exec>
</target>
<!-- CHECK --> <!-- CHECK -->
<target name="check" depends="checktodo,checkascii"/> <target name="check" depends="checktodo,checkascii"/>

3
core/build.xml
View File

@ -76,7 +76,8 @@
<fileset dir="${basedir}/.." includes="LICENSE.TXT README.md ChangeLog ReleaseNotes.md fileformat.txt" /> <fileset dir="${basedir}/.." includes="LICENSE.TXT README.md ChangeLog ReleaseNotes.md fileformat.txt" />
</jar> </jar>
</target> </target>
<!-- Update thrust curves -->
<target name="serialize-motors" depends="build" description="Preprocess the motor files into serialized form"> <target name="serialize-motors" depends="build" description="Preprocess the motor files into serialized form">
<java classname="net.sf.openrocket.thrustcurve.SerializeThrustcurveMotors" <java classname="net.sf.openrocket.thrustcurve.SerializeThrustcurveMotors"
fork="true" fork="true"

BIN
core/resources/datafiles/thrustcurves/thrustcurves.ser
View File

Binary file not shown.

2
swing/resources-src/datafiles/components-dbcook

@ -1 +1 @@
Subproject commit 49a453dd1cb62f68dfbbbd56e69d7fbcdf4bd4a1 Subproject commit 1aa03bb4a44a145f459939f487159a202dbf0f9f