From 121fb3c1b8756e9d85c23d839b31bedbfb99d2ce Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Sat, 16 Sep 2023 16:47:28 -0600
Subject: [PATCH 1/4] Add David Cain's 3d printed model rocket example

---
 swing/resources-src/datafiles/components-dbcook                 | 2 +-
 .../src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/swing/resources-src/datafiles/components-dbcook b/swing/resources-src/datafiles/components-dbcook
index f4e30ecd1..9da5f4e25 160000
--- a/swing/resources-src/datafiles/components-dbcook
+++ b/swing/resources-src/datafiles/components-dbcook
@@ -1 +1 @@
-Subproject commit f4e30ecd12c64803dce013c615bbe62f89785408
+Subproject commit 9da5f4e25f57e8ec476ea38cd91c78edff06003f
diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
index b70b47ad8..a02550ec3 100644
--- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
+++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
@@ -33,6 +33,7 @@ public final class ExampleDesignFileAction extends JMenu {
         "Three-stage rocket",
         "TARC payload rocket",
         "Tube fin rocket",
+		"A 3D printable model rocket",
         null,
         // Examples demonstrating complex rocket features
         "Airstart timing",

From d185be011ce84da5877322ef034492b6f07f5df4 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Sat, 16 Sep 2023 18:08:43 -0600
Subject: [PATCH 2/4] Include the actual .ork file

---
 .../examples/A 3D printable model rocket.ork     | Bin 0 -> 4292 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 swing/resources/datafiles/examples/A 3D printable model rocket.ork

diff --git a/swing/resources/datafiles/examples/A 3D printable model rocket.ork b/swing/resources/datafiles/examples/A 3D printable model rocket.ork
new file mode 100644
index 0000000000000000000000000000000000000000..4b3a2bbea7b847f49f1c3bf8989732d72abcbd31
GIT binary patch
literal 4292
zcmV;#5IgTsO9KQH00;;O03wGkR{#J20000000000015yA0CI0*Yh`pUZ*ptxT<eqD
zICB3!e+5dZ-0oHlCE~$XPS%y}olE6%mvyZtN!_Ou2!IkZ6shB5?76=_4N`oH<Va(W
zcYK+tvP*1sgFvHy-Hisw^&dX(BXqCQEKK4zKj5YL15&X_WEgMX{7~e9;r{T4&DA<N
zs5ni;oyr^L1zvg!BvQrmBz?2^1vq}KI0#*S{=C>+A+)Y!^iQ~m`Ce__BKk8rq+y(M
zKT>F)NEM-qZM`ZvD&|mbRA6J5_<<p$%ME4+p201p43krn3(Iu_PpntKSV{2DA&-(E
z$e;^*mG2VyX2Ja|iHck;Hs;b?uR1J8p+k~|ISdEo4+nL^U*A14i)6o7alX0Th1s#s
zXvZ^@e@b9fMmwqlPxI_w5Jy26Bf;Zq#A6AUagr${l2|R#&F4ds<|yB(nyKUo^9+ey
z7|B!tAw$56mcP9F6EH=6sirOTDTKimc`J*4<S2ug`GnMi`bjqft+%aQUHvsFe)mt*
z`+XE4E_KJ=-5QpO{6s#Wyztev9sw6S&;&|Sl;tqXdzD_dt(Kk5cAx|3Ln@)o4|?>y
z@#sD!fqo{}YAgE*&)S9Col0Sfq8zLY9g<281U~%v?Gk-V_6lv2M55%Nbq}3S75Z><
z`>*9Q-@f~}M7KL_Ibe72e*x0akphOTACTpmOLt=jmZ_hA;0Ki&f@exrLfJL)p=)uH
zBOVp|FfR7T+o_5YE;AU-ZD$<%UpcoK`lLW*U@cnJL6UyrsRX>p>uPMo{AU!#Fy81|
z&y0XUr=dVuaVTf4vH@!D_lO!1e*h);X}Cvu0&Qdkj1oHUhf$b6R6}g1I4q}7@$8}M
zN!<q@x_$ES<AX36J}4;XvVO#RRoioA-BM-YHdg88XMP__^qz;>ZY4kDpqU^|_ULzi
zE0X;8Z&4QR4+HF0w~+sUKJxt`LH`kEcRW_{det;rJtbB5q4pn}j|v*z`_MORT|@5)
zy+;34`4)sV_!`biu$($jMi6d`l$V&Tu0p`M<doPhwGGp=Jc9|38NQH~!91yy=@4ph
zwx}9{ra%W<&~Blh{$^n=5EprP5Ae^^LM>Lu2d++^curSL%k^yE;)a8{V=$Ks!*{qc
z6qm{;w&OXL|BbrhW2#)ii4j;#f>yX|cs`+qX$xC;&>QOTZ`2iqrEr+*8jd4OgPD{Y
zzQw?`n^^j$!+lPIZ`2h_dYm}6Wl+xotw>K8p6$2>b(NB)=eoinU#}~v3KaNqp>%-R
z>>&c}i@i4PF8QkB%?ckNc>utJuj%)ozN*9M#{$S9z^WTG>%eLGgxSot4QvT8L7Q7J
zLT-W`S^;R<Wv(Pu;B3W4pIto<ypVQ6U1Hsh4^7BxeATc+b*BWOrg9l{#c?SZV_+Mu
zDIG8fB7sC)-&bukZzTEQpdc23rusK@?B?1Nrb?FcvQ3qOtb~|sf&8d|8L}|UR&>~L
zpjuWvSDgm39cU0Dy}e#lKl_hfO+9-Jks-`>n=~o5yCSZxlw7Zl^gi>R=PHG~<CtRj
zMRd175<EUQVaTG01*yhjQwBH#VY6}LU{puRL4%QsxA_kGjn}K=?><Am3&mZmvP@?&
zCid2=mU1=F00hTPvIUFQI?xv*3_2Nrj0${s>6iz!!F&aI%4Jw&8(u(QgAQN<K*L`9
z2a0W&PK2vauF~UuEss5`6dBx_6m9fllAheCt~&SoY9oE&DGhd5gtiyC(T<@fdZZ5!
zkp)p$(gPl4+VUI1)nE#yka@JOENgBL?>63|OxtcAM!{JFlu-{mOb8twn85;D8a^|H
z;rPCbMF6hDbWZ^~nR@$4o+tY<k*0Jc_3lHtpN0=)`)T;V2SD~A+Zo4z<sNNHq_r=T
z)*@quRXK6E0iLApM!7Z^(58fBm?|-pYKf;}dO|lIbgTP^Zw#jWL6%KOG$v5S6KFkw
zb=t!Y@>9rBRVCWz85+`R#*zT@li^|2#)mFhuO;+SVl-;#j2ykwtBu>jpNtsHBpk9P
z&rpmC2-FreJZd|JNx>)ho}i9nk3@_^s<a(emh|qIpa1$lxBvO>W`XuRE&_<&kZ40B
zzsYiyEy|TzoB*F*0R8di8q#xW!Maw4Tb1RIx4>hR=SWHvBndVNY)hFImH-sr3#2oQ
zDrd$k9gmubrGHlutNeLZ$RhaCm=!|6k!q%UO2Uvcm<gU$ytQXKy)hK6$Q28$`bwV4
z4UXNJ(F=B+Mla>>N-yQlv-C2hmif`w0X<IAJ&&Fg$6b#tVTn<iHms8mVG5jgDTD#E
zjR0BDr)yLi9pd*}y#kHy&WP|91kcW&`)I_cOF&0Qg0RwcOogvbm^}^CwLiQh9yNu7
zsaW)(W|)gb0B@Ih0vom)Fr6&=2CVLcVOv~@z@gL^{DN4NCx<GSkP8D*SMY);#K`4Q
z$QyY47ZsF*EYrF5O32Xw)I&yAq~K>&2OL@@fQ=-2fC+g3ohbC<PVxJPpQa#itVkT9
z<U!r*c%=Tf>YOepwA3jX9_3+PfUhBDIl=*TN=&MVKWsV@6=8%uJSM;9lEO?im#3T&
z0AJ`L)dpf!doj+~SP-pvC#^@{9B5sWIx4426M(<i-0o6{p+|KavdFd0yW*#bKnKF7
zZZ;8jy5KjNX*MOnIe1&9!k&$pK?2MT<~z)AZ6Crr!!9F=1(v6t0B`$==(cCU-Bx{7
zr{alZ0<K)w5M!mJuHpF#@jM63RhK+|0H+&oVKrA~8KEd54xxc(D9lk%#G<NhCUNvo
zmS~Yqz)<5_hxNHxhhvex_pmPaKlaOVIH2NYcucDzogT|P63R8OyV%@77=~G>X75K>
zyT=ld{r(!^6}DlPW_*!ODjLIo(hBUqxzu|qv!KAXbO~XGR1SbbVQl!Aal<Ckv@Aw_
z$6}X*0^_HFLd#tc@#w_{hq3kY)?MYo|AK{9kMgXmtad$h_A0BX&HWKv(EH;C(_hMM
zlfUR7G_~#`LI%pSnBfTO87z>t;Y&pg=HNj2wo;}~zq3l+7bNyyQlK*(yPHw#oce{Q
z?-7T<w2O-Elq36d$$)@k&X<7!`HHB(@L2$c<4fP*w%|r!D+gBdOgU6e`Lanf`YNV$
zhB?ifRK4KM^{pzI!{z$2LzouG%ED>umqzF#Dv7s|8o2iqGE=<~vDjdz+}dt=&hUwq
z%;QdRF55C4>xubRDLLc8&j9VS0CxZ>lUgl^PE+tU_F3bw9;?MqLRp(!2YkbOdCCv!
z?@1^@8RNPx!FXG<fl~DLb*Az;m<r-CfTIH`2eAxBh%$WJvJE#dsVf8*KKloPDSaHK
zptFXz`8{PL16<V0-ZtT=SuTdOc?P1ByyHfitBY&%Pp{0sTnG;~a%M26R~l)OW!cdK
zma782lh>n;2yw8BQU~R)vGGTd%3EKeRnVbK3Cyd*c1vx%=c)7)p31t>Id7IEx!CD-
zi(Vz_4V;!TqPXzTXKo0myxAwE4xOzwy*TO8P9=6K-0t$@YT<Zs;sZ|{-H=0{s)5nQ
zTm5g!55BLNQ2NNK%NE%6gy$Q!O(0X@re(OyHw`7EgB1r0^zGM7<?Kvl#@QIU3TQpi
z-_*iq)@ej<{*kU-0!Tu^qv!$U{7z-%5wWBIE>u_V^kFegZH~dA`Y2f#$0K|dRWr`k
zYM#Z#wZJpyvX5`MfG(BU+52Cwx|A_PiwFE&%86qb;QpE2g69Z@J(C*_R}xmf1RJgl
zgyB)bEgYDxBiXB4_!@5E`Erm~hw%T|A(XPGwXxP2{98F&QwI>5s;m?waIkAwo~KWi
zVrlrU<rtQu9A*m07nu1yJAy}`X<APQr#T<5pBV<uON4<g)S0gJ7!n3W1J<h{diEm=
znyAR2@%~}dEYzz>0L|FV$u=_ZkE%NK*P~1d^jD=r;)o6CYV>|Q<Y@eD<8m^p&ECdo
z1KxT!=0rPNx_#1^kUliEgLQX(EUdX6W3FC6c;XrK;e_kGf_jd|HVzuhv}c$$<!KU)
zh7N69tUArKA%rVoV&Xcmuu;@^g&o+oPwYThf#SB_$SxTtS}9NRS5x`ctxxt(Ozm)+
z+{EtOKKT&5)7U+BMNc8EHtMHlvpSSLYaL(ZeS)uMv`;nL)#z}}GTMvYR`^YfR$$Bb
zeCT9g+REfU^p|?ffdrgW!5npg(Y|9Zz-ZaC8SR(M<#%PY7roc=+Ze6uFscF?aL-ei
zao2NQOZdu!xnPb@E->2n_CK_z{gS!-u8j7gH=tgP_A3~z^=wA_C3E>*8SO>y%Do!x
zS1?-V*^Kr}=JMql?NKAgHRQ-P)!cEH>b-|}8^+3y5^*;%fU-JtQ?j9wZ>nHa7mXYa
zcBtQ-3b@1uB&jYeA9N<>a_V89OUI$(MWZtcM_;XYbY=nR@gmaWM@1excRzbtWcKX+
zvz3xAsH#4>r1S-4rKeO_M`}xSww9zPeij}xM;7b%Zkj6W$&nVIiljJ1qvz(U<1D)7
z{=VXwE7JPHB_zPU;e#79824<$=dLm+gBU=3S9tQ`qqBO)5z~I<&3np$r-_DsyUJ*}
zRsSMOqr|ib>AmfAQJs{K+2d7{26yJc+eg@e+`g$l!lRE~RA0l<7g@M3qB5o(8|YB<
zM>_H%d$Wj>{76-@{Uky4qD9M%`_QNxf;8dRe`g=-3+PcpziN)LMB+$#$I~?V1bNr{
zhNcg<H1``32-;z%+cmLFGB)Sb&GgpTk^O3L?lev6^W$aBc}N^#FAqso<~E>>Ft?`Y
z^(97Zbp0ueCBIjxo>HQ@yM#U)q^W>W{WXW`4a5O$*pucpq)sPJUrnly;_~ASX0_Z6
z@q{}8Z#`_gCAREal}H5{T;=jM0kpVY4Tvo_&-Y1o*s1jR(U&)iFyq~%Vx5P3NV3(T
zJUOJ#4IM8VY@FK7I*9ZUAjxz6>dWU^18)|LEgfd-7j{42D~LO#*CY1Qby-Q|LMXs+
zY5d?0DPG#7ys_tESHADzE|Bg)p72AmRZ71NMG0g?)f4qCkYh_QN1Z$AGhe$fZ=c1M
z*oHfed9-&x$i`GVWBqoR-rwy>G1{VZ)ef(52@PhOFMd1~^W^1V{+zPoE9PG@KZ|(`
z_{JKdJ<v06X%Tx2^tQ9K>>lW`b{T!tTT8-NANAB)+6+&j-f_lJ?<}!rkE5P0P48QQ
zo<h2pCy9OwG0joAc78c-;G9D4s~dQA1G8>`I8-kK25!K^8e}70z_GwTu$~)$^z+mW
zFvsh=0moc=)u$%L+yJ3dZh(5ugd3pCPVm>p!P8iuOZxTrDHf2r4~6OoBc7MvLPXg?
zzd`(?18EQ1A9g>16&;1Yjay+a$BCR%SbudQuTEsviBQPW8KommggKL5<S{1#*e8Qr
z!X-=FV^dDV#TPpfjF%KrkZ%Ng>*c`yoUMsh*uTR55!ky+?*#Sc(q(uG^^`phd$7I%
z?Ag+E$rS9ZncTr0hrP3OZR>2*_phtU;$fHMNd{^NlZv57Sg+d8cW<u#4^T@72z{-E
zr9Kb<0P|Y_08mQ-0u%rg00;;O03wGkSADI8r9Kb<0P|Y_015yA000000000000000
m0001TZ)0m^bS`glYfwuC1^@s60096205|{u0Co@n0001avO(wo

literal 0
HcmV?d00001


From be773a3e9c0f38a92a601526231aaaee9e953fb2 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Sat, 16 Sep 2023 18:17:23 -0600
Subject: [PATCH 3/4] fix indentation

---
 .../src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
index a02550ec3..d3f745076 100644
--- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
+++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
@@ -33,7 +33,7 @@ public final class ExampleDesignFileAction extends JMenu {
         "Three-stage rocket",
         "TARC payload rocket",
         "Tube fin rocket",
-		"A 3D printable model rocket",
+        "A 3D printable model rocket",
         null,
         // Examples demonstrating complex rocket features
         "Airstart timing",

From c759a6a865b3c0dc4679c32a1fa839e03e9b5fb8 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Sat, 16 Sep 2023 18:34:35 -0600
Subject: [PATCH 4/4] update dbcook database

---
 swing/resources-src/datafiles/components-dbcook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swing/resources-src/datafiles/components-dbcook b/swing/resources-src/datafiles/components-dbcook
index 9da5f4e25..f4e30ecd1 160000
--- a/swing/resources-src/datafiles/components-dbcook
+++ b/swing/resources-src/datafiles/components-dbcook
@@ -1 +1 @@
-Subproject commit 9da5f4e25f57e8ec476ea38cd91c78edff06003f
+Subproject commit f4e30ecd12c64803dce013c615bbe62f89785408