From cc5340ca463656594c1de711c006a645f7c8f11e Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@github.com>
Date: Wed, 23 Apr 2014 15:15:38 -0500
Subject: [PATCH] Upon further research the estes nc data contained incorrect
 PNC-80FB part which does not exist.

---
 swing/resources-src/datafiles/presets/Estes.orc     | 13 -------------
 .../datafiles/rocksim_components/estes/NCDATA.CSV   |  3 +--
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/swing/resources-src/datafiles/presets/Estes.orc b/swing/resources-src/datafiles/presets/Estes.orc
index 47e793998..839719b71 100644
--- a/swing/resources-src/datafiles/presets/Estes.orc
+++ b/swing/resources-src/datafiles/presets/Estes.orc
@@ -1565,19 +1565,6 @@
             <PartNumber>PNC-80BB</PartNumber>
             <Description>Plastic Nose cone</Description>
             <Material Type="BULK">Polystyrene PS</Material>
-            <Mass Unit="kg">0.03685438003</Mass>
-            <Shape>PARABOLIC</Shape>
-            <OutsideDiameter Unit="m">0.06604</OutsideDiameter>
-            <ShoulderDiameter Unit="m">0.0649732</ShoulderDiameter>
-            <ShoulderLength Unit="m">0.044449999999999996</ShoulderLength>
-            <Length Unit="m">0.1016</Length>
-            <Thickness Unit="m">0.003175</Thickness>
-        </NoseCone>
-        <NoseCone>
-            <Manufacturer>Estes</Manufacturer>
-            <PartNumber>PNC-80FB</PartNumber>
-            <Description>Estes PNC-80 Fat Boy profile cone</Description>
-            <Material Type="BULK">Polystyrene PS</Material>
             <Mass Unit="kg">0.035892</Mass>
             <Shape>ELLIPSOID</Shape>
             <OutsideDiameter Unit="m">0.06604</OutsideDiameter>
diff --git a/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV
index 7b6204894..7b38bcd19 100644
--- a/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV
+++ b/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV
@@ -26,7 +26,6 @@ Estes,PNC-60L ,Plastic Nose cone,in,2.5,1.637,0,0.75,1.595,0.125,elliptical,holl
 Estes,PNC-60MS ,Plastic Nose cone,in,2.5,1.637,0,0.75,1.595,0.125,parabolic,hollow,Polystyrene PS,1.625,oz,0.5,0,,,,,,,,,,,,,
 Estes,PNC-60NA,Plastic Nose cone,in,4.75,1.637,0,0.75,1.595,0.125,ogive,hollow,Polystyrene PS,0,oz,0.6,0,,,,,,,,,,,,,
 Estes,BNC-70AJ ,Balsa Nose cone,in,4.4,2.217,0,0.75,2.18,0,parabolic,solid,Balsa,2.575,oz,0.85,0,,,,,,,,,,,,,
-Estes,PNC-80BB ,Plastic Nose cone,in,4,2.6,0,1.75,2.558,0.125,parabolic,hollow,Polystyrene PS,2.875,oz,1.3,0,,,,,,,,,,,,,
-Estes,PNC-80FB,Estes PNC-80 Fat Boy profile cone,mm,101.6,66.04,0,38.1,64.922,3.175,elliptical,hollow,Polystyrene PS,0,g,35.892,0,,,,,,,,,,,,,
+Estes,PNC-80BB,Plastic Nose cone,mm,101.6,66.04,0,38.1,64.922,3.175,elliptical,hollow,Polystyrene PS,0,g,35.892,0,,,,,,,,,,,,,
 Estes,PNC-80K ,Plastic Nose cone,in,8.15,2.6,0,1,2.558,0.125,ogive,hollow,Polystyrene PS,4.575,oz,1.68,0,,,,,,,,,,,,,
 Estes,PNC-55AO,Elliptical,mm,127,33.655,0,15.24,32.588,2.3876,elliptical,hollow,Polystyrene PS,100.99,g,12.19,0,,,,,,,,,,,,,