Merge pull request #1998 from SiboVG/unstable

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

View File

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

View File

@ -64,6 +64,19 @@
<ant dir="swing" target="unittest-no-junit-report" inheritAll="false" />
</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 -->
<target name="check" depends="checktodo,checkascii"/>

View File

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

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