From e6aef72c08887ab90a3e4db869807a6397a8eaae Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Wed, 22 Feb 2023 08:26:48 -0700
Subject: [PATCH 01/14] Fix interstices area calculation Update tube pressure
 drag calculation

---
 .../aerodynamics/barrowman/TubeCalc.java      | 26 ++++---
 .../barrowman/TubeFinSetCalc.java             | 71 ++++++++++---------
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
index cce711b4d..b4b8fd093 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
@@ -22,11 +22,12 @@ public abstract class TubeCalc extends RocketComponentCalc {
 	protected final double innerArea;
 	private final double totalArea;
 	private final double frontalArea;
+	private final Tube tube;
 	
 	public TubeCalc(RocketComponent component) {
 		super(component);
 
-		Tube tube = (Tube)component;
+		tube = (Tube)component;
 		
 		length = tube.getLength();
 		diameter = 2 * tube.getInnerRadius();
@@ -55,32 +56,41 @@ public abstract class TubeCalc extends RocketComponentCalc {
 
 		// Need to check for tube inner area 0 in case of rockets using launch lugs with
 		// an inner radius of 0 to emulate rail buttons (or just weird rockets, of course)
+
 		double deltap;
 		if (innerArea > MathUtil.EPSILON) {
-			// Temperature
+			// Temperature and Pressure
 			final double T = conditions.getAtmosphericConditions().getTemperature();
+			final double P = conditions.getAtmosphericConditions().getPressure();
 			
 			// Volume flow rate (t)
 			final double Q = conditions.getVelocity() * innerArea;
+
+			// Air viscosity
+			final double mu = conditions.getAtmosphericConditions().getKinematicViscosity();
+
+			// Air density
+			final double rho = 1.225; // at standard temperature and pressure
 			
 			// Reynolds number (note Reynolds number for the interior of a pipe is based on diameter,
 			// not length (t))
-			final double Re = conditions.getVelocity() * diameter /
-				conditions.getAtmosphericConditions().getKinematicViscosity();
+			final double Re = (4.0 * rho * Q) / (Math.PI * diameter * mu);
 			
 			// friction coefficient (for smooth tube interior) (e)
 			final double lambda = 1/MathUtil.pow2(2 * Math.log(0.5625 * Math.pow(Re, 0.875)) - 0.8);
 			
 			// pressure drop (e)
-			final double P0 = 100; // standard pressure
+			final double P0 = 101325; // standard pressure
 			final double T0 = 273.15; // standard temperature
-			deltap = (lambda * 8 * length * rho * MathUtil.pow2(Q) * T * P0) /
-				(MathUtil.pow2(Math.PI) * Math.pow(diameter, 5) * T0 * conditions.getAtmosphericConditions().getPressure());
+			deltap = ((lambda * 8 * length * rho * MathUtil.pow2(Q)) / (MathUtil.pow2(Math.PI) * Math.pow(diameter, 5)) * (T/T0) * (P0/P));
 		} else {
 			deltap = 0.0;
 		}
 		   
 		// convert to CD and return
-		return (deltap * innerArea + 0.7 * stagnationCD * frontalArea) / conditions.getRefArea();
+		final double cdpress = 2.0 * deltap / (conditions.getAtmosphericConditions().getDensity() * MathUtil.pow2(conditions.getVelocity()));
+		final double cd =   (cdpress * innerArea + 0.43*(stagnationCD + baseCD) * frontalArea)/conditions.getRefArea();
+		
+		return cd;
 	}
 }
diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
index 88e402f1d..87b655c52 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
@@ -82,37 +82,52 @@ public class TubeFinSetCalc extends TubeCalc {
 
 		// aspect ratio.
 		ar = 2 * innerRadius / chord;
+
+
+		// Some trigonometry...
+		// We need a triangle with the following three sides:
+		// d is from the center of the body tube to a tangent point on the tube fin
+		// outerRadius is from the center of the tube fin to the tangent point.  Note that
+		//     d and outerRadius are at right angles
+		// bodyRadius + outerRadius is from the center of the body tube to the center of the tube fin.
+		//     This is the hypotenuse of the right triangle.
+		
+		// Find length of d
+		final double d = Math.sqrt(MathUtil.pow2(bodyRadius + outerRadius) - MathUtil.pow2(outerRadius));
+
+		// Area of diamond consisting of triangle reflected on its hypotenuse
+		double a = d * outerRadius;
+		
+		// angle between outerRadius and bodyRadius+outerRadius
+		final double theta1 = Math.acos(outerRadius/(outerRadius + bodyRadius));
+		
+		// area of arc from tube fin, doubled so we have area to remove from diamond
+		final double a1 = MathUtil.pow2(outerRadius) * theta1;
+
+		// angle between bodyRadius+outerRadius and d
+		final double theta2 = Math.PI/2.0 - theta1;
+		
+		// area of arc from body tube.  Doubled so we have area to remove from diamond
+		final double a2 = MathUtil.pow2(bodyRadius) * theta2;
+		
+		// area of interstice for one tube fin
+		intersticeArea = (a - a1 - a2);
+
+		// for comparison, what's the area of a tube fin?
+		double tubeArea = MathUtil.pow2(outerRadius) * Math.PI;
 		
 		// wetted area for friction drag calculation.  We don't consider the inner surface of the tube;
 		// that affects the pressure drop through the tube and so (indirecctly) affects the pressure drag.
 			
-		// Area of the outer surface of tubes.  Since roughly half
-		// of the area is "masked" by the interstices between the tubes and the
-		// body tube, only consider the other half of the area (so only multiplying by pi instead of 2*pi)
-		final double outerArea = chord * Math.PI * outerRadius;
+		// Area of the outer surface of a tube, not including portion masked by interstice
+		final double outerArea = chord * 2 * (Math.PI - theta1) * outerRadius;
 			
 		// Surface area of the portion of the body tube masked by the tube fins, per tube
 		final BodyTube parent = (BodyTube) tubes.getParent();
 		final double maskedArea = chord * 2.0 * Math.PI * bodyRadius / tubeCount;
 		
 		wettedArea = outerArea - maskedArea;
-		log.debug("wetted area of tube fins " + wettedArea);
-
-		// frontal area of interstices between tubes for pressure drag calculation.
-		// We'll treat them as a closed blunt object.
-
-		// area of disk passing through tube fin centers
-		final double tubeDiskArea = Math.PI * MathUtil.pow2(bodyRadius + outerRadius);
-
-		// half of combined area of tube fin exteriors.  Deliberately using the outer radius here since we
-		// calculate pressure drag from the tube walls in TubeCalc
-		final double tubeOuterArea = tubeCount * Math.PI * MathUtil.pow2(outerRadius) / 2.0;
-
-		// body tube area
-		final double bodyTubeArea = Math.PI * MathUtil.pow2(bodyRadius);
-
-		// area of an interstice
-		intersticeArea = (tubeDiskArea - tubeOuterArea - bodyTubeArea) / tubeCount;
+		log.debug("wetted area of tube fin " + wettedArea);
 
 		// Precompute most of CNa.  Equation comes from Ribner, "The ring airfoil in nonaxial
 		// flow", Journal of the Aeronautical Sciences 14(9) pp 529-530 (1947) equation (5).
@@ -253,9 +268,7 @@ public class TubeFinSetCalc extends TubeCalc {
 
 	@Override
 	public double calculateFrictionCD(FlightConditions conditions, double componentCf, WarningSet warnings) {
-		warnings.addAll(geometryWarnings);
-
-		final double frictionCD =  componentCf * wettedArea / conditions.getRefArea();
+		final double frictionCD = componentCf * wettedArea / conditions.getRefArea();
 		
 		return frictionCD;
 	}
@@ -265,18 +278,10 @@ public class TubeFinSetCalc extends TubeCalc {
 					  double stagnationCD, double baseCD, WarningSet warnings) {
 		
 	    warnings.addAll(geometryWarnings);
+						    
 		final double cd = super.calculatePressureCD(conditions, stagnationCD, baseCD, warnings) +
 			(stagnationCD + baseCD) * intersticeArea / conditions.getRefArea();
 	    
 	    return cd;
-		}
-	
-	private static int calculateInterferenceFinCount(TubeFinSet component) {
-		RocketComponent parent = component.getParent();
-		if (parent == null) {
-			throw new IllegalStateException("fin set without parent component");
-		}
-		
-		return 3 * component.getFinCount();
 	}
 }

From a18b10746c761857dd94b1972520b4e5bf7ed471 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 25 Jun 2023 00:37:06 +0200
Subject: [PATCH 02/14] Improve formatting of component analysis tables

---
 .../gui/dialogs/ComponentAnalysisDialog.java  | 173 ++++++++++--------
 .../FlightConfigurablePanel.java              |   8 +-
 2 files changed, 105 insertions(+), 76 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index ddb80fffb..a1290ea7f 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -11,6 +11,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.EventObject;
 import java.util.List;
@@ -31,9 +32,10 @@ import javax.swing.JToggleButton;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.table.TableCellRenderer;
+import javax.swing.table.DefaultTableCellRenderer;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.aerodynamics.AerodynamicCalculator;
@@ -213,7 +215,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 					@Override
 					public Object getValueAt(int row) {
-						return unit.toString(stabData.get(row).eachMass);
+						return unit.toUnit(stabData.get(row).eachMass);
 					}
 				},
 				new Column(trans.get("componentanalysisdlg.TabStability.Col.AllMass") + " (" + UnitGroup.UNITS_MASS.getDefaultUnit().getUnit() + ")") {
@@ -221,7 +223,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 					@Override
 					public Object getValueAt(int row) {
-						return unit.toString(stabData.get(row).cm.weight);
+						return unit.toUnit(stabData.get(row).cm.weight);
 					}
 				},
 				new Column(trans.get("componentanalysisdlg.TabStability.Col.CG") + " (" + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit() + ")") {
@@ -229,7 +231,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 					
 					@Override
 					public Object getValueAt(int row) {
-						return unit.toString(stabData.get(row).cm.x);
+						return unit.toUnit(stabData.get(row).cm.x);
 					}
 				},
 				new Column(trans.get("componentanalysisdlg.TabStability.Col.CP") + " (" + UnitGroup.UNITS_LENGTH.getDefaultUnit().getUnit() + ")") {
@@ -237,13 +239,13 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 					
 					@Override
 					public Object getValueAt(int row) {
-						return unit.toString(stabData.get(row).cpx);
+						return unit.toUnit(stabData.get(row).cpx);
 					}
 				},
 				new Column("<html>C<sub>N<sub>" + ALPHA + "</sub></sub>") {
 					@Override
 					public Object getValueAt(int row) {
-						return NOUNIT.toString(stabData.get(row).cna);
+						return NOUNIT.toUnit(stabData.get(row).cna);
 					}
 				}
 	
@@ -261,14 +263,10 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 		};
 
 		table = new ColumnTable(longitudeStabilityTableModel);
-		table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		table.setSelectionBackground(Color.LIGHT_GRAY);
-		table.setSelectionForeground(Color.BLACK);
+		table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 		longitudeStabilityTableModel.setColumnWidths(table.getColumnModel());
 
-		table.setDefaultRenderer(Object.class, new CustomCellRenderer());
-		//		table.setShowHorizontalLines(false);
-		//		table.setShowVerticalLines(true);
+		table.setDefaultRenderer(Object.class, new StabilityCellRenderer());
 
 		JScrollPane scrollpane = new JScrollPane(table);
 		scrollpane.setPreferredSize(new Dimension(600, 200));
@@ -339,14 +337,10 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 
 		table = new JTable(dragTableModel);
-		table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		table.setSelectionBackground(Color.LIGHT_GRAY);
-		table.setSelectionForeground(Color.BLACK);
+		table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 		dragTableModel.setColumnWidths(table.getColumnModel());
 
-		table.setDefaultRenderer(Object.class, new DragCellRenderer(new Color(0.5f, 1.0f, 0.5f)));
-		//		table.setShowHorizontalLines(false);
-		//		table.setShowVerticalLines(true);
+		table.setDefaultRenderer(Object.class, new DragCellRenderer());
 
 		scrollpane = new JScrollPane(table);
 		scrollpane.setPreferredSize(new Dimension(600, 200));
@@ -406,10 +400,8 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 
 		table = new JTable(rollTableModel);
-		table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		table.setSelectionBackground(Color.LIGHT_GRAY);
-		table.setSelectionForeground(Color.BLACK);
-		table.setDefaultRenderer(Object.class, new CustomCellRenderer());
+		table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+		table.setDefaultRenderer(Object.class, new RollDynamicsCellRenderer());
 
 		scrollpane = new JScrollPane(table);
 		scrollpane.setPreferredSize(new Dimension(600, 200));
@@ -622,94 +614,131 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 		rollTableModel.fireTableDataChanged();
 	}
 
-	private class CustomCellRenderer extends JLabel implements TableCellRenderer {
-		/**
-		 * 
-		 */
+	/**
+	 * Default cell renderer for the tables.
+	 */
+	private class CustomCellRenderer extends DefaultTableCellRenderer {
 		private static final long serialVersionUID = 1L;
-		private final Font normalFont;
-		private final Font boldFont;
+		protected final Font normalFont;
+		protected final Font boldFont;
 
-		public CustomCellRenderer() {
+		private final List<?> data;
+		protected final int decimalPlaces;
+
+		public CustomCellRenderer(List<?> data, int decimalPlaces) {
 			super();
-			normalFont = getFont();
-			boldFont = normalFont.deriveFont(Font.BOLD);
+			this.decimalPlaces = decimalPlaces;
+			this.data = data;
+			this.normalFont = getFont();
+			this.boldFont = normalFont.deriveFont(Font.BOLD);
 		}
 
 		@Override
 		public Component getTableCellRendererComponent(JTable table, Object value,
-				boolean isSelected, boolean hasFocus, int row, int column) {
+													   boolean isSelected, boolean hasFocus, int row, int column) {
+			JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 
-			this.setText(value == null ? null : value.toString());
-
-			if ((row < 0) || (row >= stabData.size()))
-				return this;
-
-			if ( 0 == row ) {
-				this.setFont(boldFont);
+			if (value instanceof Double) {
+				label.setText(formatDouble((Double) value));
 			} else {
-				this.setFont(normalFont);
+				// Other
+				label.setText(value != null ? value.toString() : null);
 			}
-			return this;
+
+			label.setOpaque(true);
+			label.setBackground(Color.WHITE);
+			label.setHorizontalAlignment(SwingConstants.LEFT);
+
+			if ((row < 0) || (row >= data.size()))
+				return label;
+
+			// Set selected color
+			if (isSelected) {
+				label.setBackground(table.getSelectionBackground());
+				label.setForeground((Color) UIManager.get("Table.selectionForeground"));
+			} else {
+				label.setForeground(table.getForeground());
+			}
+
+			return label;
+		}
+
+		protected String formatDouble(Double value) {
+			DecimalFormat df = new DecimalFormat("0." + "#".repeat(Math.max(0, decimalPlaces)));
+			return df.format(value);
 		}
 	}
 
 
+	private class StabilityCellRenderer extends CustomCellRenderer {
+		public StabilityCellRenderer() {
+			super(stabData, 3);
+		}
 
-	private class DragCellRenderer extends JLabel implements TableCellRenderer {
-		/**
-		 * 
-		 */
+		@Override
+		public Component getTableCellRendererComponent(JTable table, Object value,
+													   boolean isSelected, boolean hasFocus, int row, int column) {
+			JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+
+			if (row == 0) {
+				this.setFont(boldFont);
+			} else {
+				this.setFont(normalFont);
+			}
+
+			return label;
+		}
+	}
+
+	private class DragCellRenderer extends CustomCellRenderer {
 		private static final long serialVersionUID = 1L;
-		private final Font normalFont;
-		private final Font boldFont;
 
 
-		public DragCellRenderer(Color baseColor) {
-			super();
-			normalFont = getFont();
-			boldFont = normalFont.deriveFont(Font.BOLD);
+		public DragCellRenderer() {
+			super(dragData, 3);
 		}
 
 		@Override
 		public Component getTableCellRendererComponent(JTable table, Object value,
 				boolean isSelected, boolean hasFocus, int row, int column) {
+			JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 
-			if (value instanceof Double) {
-				final double totalCD = dragData.get(0).getCD();
-
-				// A drag coefficient
+			if (!isSelected && (value instanceof Double)) {
 				double cd = (Double) value;
-				this.setText(String.format("%.3f (%.0f%%)", cd, 100 * cd / totalCD));
-
 				float r = (float) (cd / 1.5);
 
 				float hue = MathUtil.clamp(0.3333f * (1 - 2.0f * r), 0, 0.3333f);
 				float sat = MathUtil.clamp(0.8f * r + 0.1f * (1 - r), 0, 1);
 				float val = 1.0f;
 
-				this.setBackground(Color.getHSBColor(hue, sat, val));
-				this.setOpaque(true);
-				this.setHorizontalAlignment(SwingConstants.CENTER);
-
-			} else {
-
-				// Other
-				this.setText(value.toString());
-				this.setOpaque(false);
-				this.setHorizontalAlignment(SwingConstants.LEFT);
-
+				label.setBackground(Color.getHSBColor(hue, sat, val));
 			}
 
 			if ((row < 0) || (row >= dragData.size()))
-				return this;
+				return label;
 
 			if ((dragData.get(row).getComponent() instanceof Rocket) || (column == 4)) {
-				this.setFont(boldFont);
+				label.setFont(boldFont);
 			} else {
-				this.setFont(normalFont);
+				label.setFont(normalFont);
 			}
-			return this;
+
+			return label;
+		}
+
+		@Override
+		protected String formatDouble(Double cd) {
+			final double totalCD = dragData.get(0).getCD();
+
+			DecimalFormat df = new DecimalFormat("0." + "#".repeat(Math.max(0, decimalPlaces)));
+			String cdFormatted = df.format(cd);
+			return String.format(cdFormatted + "  (%.0f%%)", cd, 100 * cd / totalCD);
+		}
+	}
+
+	private class RollDynamicsCellRenderer extends CustomCellRenderer {
+		public RollDynamicsCellRenderer() {
+			super(rollData, 3);
 		}
 	}
 
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
index 2d3ef491d..5baec6802 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -363,9 +363,9 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 			}	
 		}
 
-		private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) {
+		private void setSelected(JComponent c, JTable table, boolean isSelected, boolean hasFocus) {
 			c.setOpaque(true);
-			if ( isSelected) {
+			if (isSelected) {
 				c.setBackground(table.getSelectionBackground());
 				c.setForeground((Color)UIManager.get("Table.selectionForeground"));
 			} else {
@@ -373,11 +373,11 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 				c.setForeground(c.getForeground());
 			}
 			Border b = null;
-			if ( hasFocus ) {
+			if (hasFocus) {
 				if (isSelected) {
 					b = UIManager.getBorder("Table.focusSelectedCellHighlightBorder");
 				} else {
-					b = UIManager.getBorder("Table.focusCellHighligtBorder");
+					b = UIManager.getBorder("Table.focusCellHighlightBorder");
 				}
 			} else {
 				b = new EmptyBorder(1,1,1,1);

From bb2ad98d989d6489cb6b89dafa4878d03d3a2638 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 25 Jun 2023 02:19:51 +0200
Subject: [PATCH 03/14] [#1629] Show calculated mass & CG for non-overridden
 components

---
 .../rocketcomponent/RocketComponent.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index 01b5b6820..a800a53df 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -562,6 +562,9 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	public final double getOverrideMass() {
 		mutex.verify();
+		if (!isMassOverridden()) {
+			overrideMass = getComponentMass();
+		}
 		return overrideMass;
 	}
 	
@@ -612,6 +615,12 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 		}
 		checkState();
 		massOverridden = o;
+
+		// If mass not overridden, set override mass to the component mass
+		if (!massOverridden) {
+			overrideMass = getComponentMass();
+		}
+
 		updateChildrenMassOverriddenBy();
 		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
 	}
@@ -627,6 +636,9 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	public final Coordinate getOverrideCG() {
 		mutex.verify();
+		if (!isCGOverridden()) {
+			overrideCGX = getComponentCG().x;
+		}
 		return getComponentCG().setX(overrideCGX);
 	}
 	
@@ -637,6 +649,9 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	public final double getOverrideCGX() {
 		mutex.verify();
+		if (!isCGOverridden()) {
+			overrideCGX = getComponentCG().x;
+		}
 		return overrideCGX;
 	}
 	
@@ -687,6 +702,12 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 		}
 		checkState();
 		cgOverridden = o;
+
+		// If CG not overridden, set override CG to the component CG
+		if (!cgOverridden) {
+			overrideCGX = getComponentCG().x;
+		}
+
 		updateChildrenCGOverriddenBy();
 		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
 	}

From 9c14e0ce84c7d1f79eb3207d46585467f092b6d0 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 27 Jun 2023 23:06:20 +0200
Subject: [PATCH 04/14] [#1629] Show calculated CD in override tab if not
 overridden

---
 .../rocketcomponent/RocketComponent.java      | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index a800a53df..389c9e283 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -7,8 +7,16 @@ import java.util.EventObject;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
+import net.sf.openrocket.aerodynamics.AerodynamicCalculator;
+import net.sf.openrocket.aerodynamics.AerodynamicForces;
+import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
+import net.sf.openrocket.aerodynamics.FlightConditions;
+import net.sf.openrocket.logging.WarningSet;
+import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.startup.Preferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -712,6 +720,43 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
 	}
 
+	/**
+	 * Calculates and returns the CD of the component.
+	 * TODO: LOW: should this value be cached instead of recalculated every time?
+	 * @param AOA angle of attack to use in the calculations (in radians)
+	 * @param theta wind direction to use in the calculations (in radians)
+	 * @param mach mach number to use in the calculations
+	 * @param rollRate roll rate to use in the calculations (in radians per second)
+	 * @return the CD of the component
+	 */
+	public double getComponentCD(double AOA, double theta, double mach, double rollRate) {
+		Rocket rocket;
+		try {
+			rocket = getRocket();
+		} catch (IllegalStateException e) {
+			// This can happen due to a race condition when a loadFrom() action is performed of the rocket (after
+			// an undo operation) but the rocket is not yet fully loaded (the sustainer does not yet have the rocket as
+			// its parent => getRocket() will not return the rocket, but the sustainer). In that case, just return 0 and
+			// hope that a future call of this method will succeed 🤞.
+			return 0;
+		}
+		final FlightConfiguration configuration = rocket.getSelectedConfiguration();
+		FlightConditions conditions = new FlightConditions(configuration);
+		WarningSet warnings = new WarningSet();
+		AerodynamicCalculator aerodynamicCalculator = new BarrowmanCalculator();
+
+		conditions.setAOA(AOA);
+		conditions.setTheta(theta);
+		conditions.setMach(mach);
+		conditions.setRollRate(rollRate);
+
+		Map<RocketComponent, AerodynamicForces> aeroData = aerodynamicCalculator.getForceAnalysis(configuration, conditions, warnings);
+		AerodynamicForces forces = aeroData.get(this);
+		if (forces != null) {
+			return forces.getCD();
+		}
+		return 0;
+	}
 
 	/** Return the current override CD. The CD is not necessarily overridden.
 	 * 
@@ -719,6 +764,10 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	public final double getOverrideCD() {
 		mutex.verify();
+		if (!isCDOverridden()) {
+			Preferences preferences = Application.getPreferences();
+			overrideCD = getComponentCD(0, 0, preferences.getDefaultMach(), 0);
+		}
 		return overrideCD;
 	}
 
@@ -770,7 +819,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 			listener.setCDOverridden(o);
 		}
 
-		if(cdOverridden == o) {
+		if (cdOverridden == o) {
 			return;
 		}
 		checkState();
@@ -784,6 +833,11 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 		if (isSubcomponentsOverriddenCD()) {
 			overrideSubcomponentsCD(o);
 		}
+
+		if (!cdOverridden) {
+			Preferences preferences = Application.getPreferences();
+			overrideCD = getComponentCD(0, 0, preferences.getDefaultMach(), 0);
+		}
 		
 		fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE);
 	}
@@ -2634,7 +2688,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	protected List<RocketComponent> copyFrom(RocketComponent src) {
 		checkState();
-		List<RocketComponent> toInvalidate = new ArrayList<RocketComponent>();
+		List<RocketComponent> toInvalidate = new ArrayList<>();
 		
 		if (this.parent != null) {
 			throw new UnsupportedOperationException("copyFrom called for non-root component, parent=" +

From 02f723cbdc63d4c6e64cdd62da73c84f5fa488e6 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 27 Jun 2023 23:08:31 +0200
Subject: [PATCH 05/14] Clarify that total is for the rocket

---
 core/resources/l10n/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index d2ea4caed..49e18edd8 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -860,7 +860,7 @@ componentanalysisdlg.lbl.reflenght = Reference length:
 componentanalysisdlg.lbl.refarea = Reference area:
 !componentanalysisdlg.But.close =Close
 componentanalysisdlg.TabStability.Col.Component = Component
-componentanalysisdlg.TOTAL = Total
+componentanalysisdlg.TOTAL = Total (Rocket)
 componentanalysisdlg.noWarnings = <html><i><font color=\"gray\">No warnings.</font></i>
 
 ! Custom Material dialog

From 0ce1eab5adf3bdaea3b45d7fe8abd0ba3719a8e2 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 27 Jun 2023 23:22:57 +0200
Subject: [PATCH 06/14] Non-ASCII characters aren't allowed :(

---
 core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index 389c9e283..94b70faa0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -737,7 +737,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 			// This can happen due to a race condition when a loadFrom() action is performed of the rocket (after
 			// an undo operation) but the rocket is not yet fully loaded (the sustainer does not yet have the rocket as
 			// its parent => getRocket() will not return the rocket, but the sustainer). In that case, just return 0 and
-			// hope that a future call of this method will succeed 🤞.
+			// hope that a future call of this method will succeed.
 			return 0;
 		}
 		final FlightConfiguration configuration = rocket.getSelectedConfiguration();

From a3aebadcff02ae97cf38c4936432556b78a5dcd4 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Wed, 28 Jun 2023 15:20:09 -0600
Subject: [PATCH 07/14] Commit so I can grab latest changes from unstable

---
 .../aerodynamics/barrowman/TubeCalc.java      | 74 ++++++++-----------
 .../barrowman/TubeFinSetCalc.java             | 39 ++++++----
 2 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
index 82e6e4662..ed34e7476 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
@@ -14,15 +14,13 @@ public abstract class TubeCalc extends RocketComponentCalc {
 	
 	private final static Logger log = LoggerFactory.getLogger(TubeFinSetCalc.class);
 
-	// air density (standard conditions)
-	private final double rho = 1.225; // kg/m^3
-	
+	private final Tube tube;
 	private final double diameter;
 	private final double length;
 	protected final double innerArea;
 	private final double totalArea;
 	private final double frontalArea;
-	private final Tube tube;
+	private final double epsilon;
 	
 	public TubeCalc(RocketComponent component) {
 		super(component);
@@ -34,63 +32,49 @@ public abstract class TubeCalc extends RocketComponentCalc {
 		innerArea = Math.PI * MathUtil.pow2(tube.getInnerRadius());
 		totalArea = Math.PI * MathUtil.pow2(tube.getOuterRadius());
 		frontalArea = totalArea - innerArea;
+		epsilon = tube.getFinish().getRoughnessSize(); // roughness; note we don't maintain surface roughness of
+		                              // interior separately from exterior.
 	}
 
 	@Override
 	public double calculatePressureCD(FlightConditions conditions,
 			double stagnationCD, double baseCD, WarningSet warnings) {
-		
-		// These calculations come from a mix of theoretical and empirical
-		// results, and are marked with (t) for theoretical and (e) for empirical.
-		// The theoretical results should not be modified; the empirical can be adjusted
-		// to better simulate real rockets as we get data.
-
-		// For the sources of the empirical formulas, see Carello, Ivanov, and Mazza,
-		// "Pressure drop in pipe lines for compressed air: comparison between experimental
-		// and theoretical analysis", Transactions on Engineering Sciences vol 18,
-		// ISSN 1743-35331998, 1998.
-		
-		// For the rockets for which we have data, the effect of the stagnation CD appears to be
-		// overstated.  This code multiplies it be a factor of 0.7 to better match experimental
-		// data
 
 		// Need to check for tube inner area 0 in case of rockets using launch lugs with
-		// an inner radius of 0 to emulate rail buttons (or just weird rockets, of course)
-
+		// an inner radius of 0 to emulate rail guides (or just weird rockets, of course)
+		double tubeCD = 0.0;
 		double deltap;
 		if (innerArea > MathUtil.EPSILON) {
-			// Temperature and Pressure
-			final double T = conditions.getAtmosphericConditions().getTemperature();
-			final double P = conditions.getAtmosphericConditions().getPressure();
-			
-			// Volume flow rate (t)
-			final double Q = conditions.getVelocity() * innerArea;
-
-			// Air viscosity
-			final double mu = conditions.getAtmosphericConditions().getKinematicViscosity();
-
-			// Air density
-			final double rho = 1.225; // at standard temperature and pressure
+			// Current atmospheric conditions
+			final double p = conditions.getAtmosphericConditions().getPressure();
+			final double t = conditions.getAtmosphericConditions().getTemperature();
+			final double rho = conditions.getAtmosphericConditions().getDensity();
+			final double v = conditions.getVelocity();
 			
 			// Reynolds number (note Reynolds number for the interior of a pipe is based on diameter,
 			// not length (t))
-			final double Re = (4.0 * rho * Q) / (Math.PI * diameter * mu);
+			final double Re = v * diameter / conditions.getAtmosphericConditions().getKinematicViscosity();
 			
-			// friction coefficient (for smooth tube interior) (e)
-			final double lambda = 1/MathUtil.pow2(2 * Math.log(0.5625 * Math.pow(Re, 0.875)) - 0.8);
-			
-			// pressure drop (e)
-			final double P0 = 101325; // standard pressure
-			final double T0 = 273.15; // standard temperature
-			deltap = ((lambda * 8 * length * rho * MathUtil.pow2(Q)) / (MathUtil.pow2(Math.PI) * Math.pow(diameter, 5)) * (T/T0) * (P0/P));
-		} else {
-			deltap = 0.0;
+			// friction coefficient using Swamee-Jain equation
+			double f = 0.25/MathUtil.pow2(Math.log10((epsilon / (3.7 * diameter) + 5.74/Math.pow(Re, 0.9))));
+
+			// If we're supersonic, apply a correction
+			// if (conditions.getMach() > 1) {
+			// 	f = f / conditions.getBeta();
+			// }
+
+			// pressure drop using Darcy-Weissbach equation
+			deltap = f * (length * rho * MathUtil.pow2(v)) / (2 * diameter);
+			System.out.println(tube + ", v " + v + ", Re " + Re + ", p " + p + ": " + "deltap " + deltap);
+
+			// drag coefficient of tube interior from pressure drop
+			tubeCD = 2 * (deltap * innerArea) / (rho * MathUtil.pow2(v) * innerArea);
 		}
 		   
 		// convert to CD and return
-		final double cdpress = 2.0 * deltap / (conditions.getAtmosphericConditions().getDensity() * MathUtil.pow2(conditions.getVelocity()));
-		final double cd =   (cdpress * innerArea + 0.43*(stagnationCD + baseCD) * frontalArea)/conditions.getRefArea();
-		
+		System.out.println(tube + " tube CD " + tubeCD + ", stagnationCD " + stagnationCD + ", baseCD " + baseCD + ", inner area " + innerArea + ", frontal area " + frontalArea);
+		final double cd = (tubeCD * innerArea + (stagnationCD + baseCD) * frontalArea) / conditions.getRefArea();
+		System.out.println(tube + " cd " + cd);
 		return cd;
 	}
 }
diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
index d0baed225..1a2e8f97e 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
@@ -25,6 +25,8 @@ public class TubeFinSetCalc extends TubeCalc {
 	
 	private static final double STALL_ANGLE = (20 * Math.PI / 180);
 	private final double[] poly = new double[6];
+
+	private final TubeFinSet tubes;
 	
 	// parameters straight from configuration; we'll be grabbing them once
 	// so code is a bit shorter elsewhere
@@ -44,14 +46,14 @@ public class TubeFinSetCalc extends TubeCalc {
 	private final double cnaconst;
 		
 	protected final WarningSet geometryWarnings = new WarningSet();
-	
+
 	public TubeFinSetCalc(RocketComponent component) {
 		super(component);
 		if (!(component instanceof TubeFinSet)) {
 			throw new IllegalArgumentException("Illegal component type " + component);
 		}
 		
-		final TubeFinSet tubes = (TubeFinSet) component;
+		tubes = (TubeFinSet) component;
 
 		if (tubes.getTubeSeparation() > MathUtil.EPSILON) {
 			geometryWarnings.add(Warning.TUBE_SEPARATION);
@@ -88,24 +90,26 @@ public class TubeFinSetCalc extends TubeCalc {
 		// Find length of d
 		final double d = Math.sqrt(MathUtil.pow2(bodyRadius + outerRadius) - MathUtil.pow2(outerRadius));
 
-		// Area of diamond consisting of triangle reflected on its hypotenuse
+		// Area of diamond formed by mirroring triangle on its hypotenuse (same area as rectangle
+		// formed by d and outerarea, but it *isn't* that rectangle)
 		double a = d * outerRadius;
-		
+
 		// angle between outerRadius and bodyRadius+outerRadius
 		final double theta1 = Math.acos(outerRadius/(outerRadius + bodyRadius));
 		
-		// area of arc from tube fin, doubled so we have area to remove from diamond
+		// area of arc from tube fin, doubled to get both halves of diamond
 		final double a1 = MathUtil.pow2(outerRadius) * theta1;
-
+		
 		// angle between bodyRadius+outerRadius and d
 		final double theta2 = Math.PI/2.0 - theta1;
+		System.out.println("theta2 " + theta2);
 		
 		// area of arc from body tube.  Doubled so we have area to remove from diamond
 		final double a2 = MathUtil.pow2(bodyRadius) * theta2;
-		
+
 		// area of interstice for one tube fin
 		intersticeArea = (a - a1 - a2);
-
+		
 		// for comparison, what's the area of a tube fin?
 		double tubeArea = MathUtil.pow2(outerRadius) * Math.PI;
 		
@@ -113,13 +117,18 @@ public class TubeFinSetCalc extends TubeCalc {
 		// that affects the pressure drop through the tube and so (indirecctly) affects the pressure drag.
 			
 		// Area of the outer surface of a tube, not including portion masked by interstice
-		final double outerArea = chord * 2 * (Math.PI - theta1) * outerRadius;
+		final double outerArea = chord * 2.0 * (Math.PI - theta1) * outerRadius;
+
+		// Area of inner surface of a tube
+		final double innerArea = chord * 2.0 * Math.PI * innerRadius;
 			
-		// Surface area of the portion of the body tube masked by the tube fins, per tube
-		final BodyTube parent = (BodyTube) tubes.getParent();
-		final double maskedArea = chord * 2.0 * Math.PI * bodyRadius / tubeCount;
+		// Surface area of the portion of the body tube masked by the tube fin.  We'll subtract it from
+		// the tube fin area rather than go in and change the body tube surface area calculation. If tube
+		// fin and body tube roughness aren't the same this will result in an inaccuracy.
+		final double maskedArea = chord * 2.0 * theta2 * bodyRadius;
 		
-		wettedArea = outerArea - maskedArea;
+		wettedArea = innerArea + outerArea - maskedArea;
+		System.out.println(tubes + " outer " + outerArea + ", masked " + maskedArea);
 		log.debug("wetted area of tube fin " + wettedArea);
 
 		// Precompute most of CNa.  Equation comes from Ribner, "The ring airfoil in nonaxial
@@ -261,6 +270,7 @@ public class TubeFinSetCalc extends TubeCalc {
 
 	@Override
 	public double calculateFrictionCD(FlightConditions conditions, double componentCf, WarningSet warnings) {
+		System.out.println(tubes + "wetted area " + wettedArea);
 		final double frictionCD = componentCf * wettedArea / conditions.getRefArea();
 		
 		return frictionCD;
@@ -271,9 +281,10 @@ public class TubeFinSetCalc extends TubeCalc {
 					  double stagnationCD, double baseCD, WarningSet warnings) {
 		
 	    warnings.addAll(geometryWarnings);
+		System.out.println(tubes + " stag CD " + stagnationCD + ",  base CD " + baseCD);
 						    
 		final double cd = super.calculatePressureCD(conditions, stagnationCD, baseCD, warnings) +
-			(stagnationCD + baseCD) * intersticeArea / conditions.getRefArea();
+		    (stagnationCD + baseCD) * intersticeArea / conditions.getRefArea();
 	    
 	    return cd;
 	}

From d5291d7b5245d75b3daa7c20333cf247a941c035 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Fri, 30 Jun 2023 10:09:00 -0600
Subject: [PATCH 08/14] Refinements to calculation of tube drag

---
 .../aerodynamics/barrowman/TubeCalc.java         | 11 ++++-------
 .../aerodynamics/barrowman/TubeFinSetCalc.java   | 16 ++++------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
index ed34e7476..3abd7aa30 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java
@@ -59,22 +59,19 @@ public abstract class TubeCalc extends RocketComponentCalc {
 			double f = 0.25/MathUtil.pow2(Math.log10((epsilon / (3.7 * diameter) + 5.74/Math.pow(Re, 0.9))));
 
 			// If we're supersonic, apply a correction
-			// if (conditions.getMach() > 1) {
-			// 	f = f / conditions.getBeta();
-			// }
+			if (conditions.getMach() > 1) {
+			 	f = f / conditions.getBeta();
+			}
 
 			// pressure drop using Darcy-Weissbach equation
 			deltap = f * (length * rho * MathUtil.pow2(v)) / (2 * diameter);
-			System.out.println(tube + ", v " + v + ", Re " + Re + ", p " + p + ": " + "deltap " + deltap);
 
 			// drag coefficient of tube interior from pressure drop
 			tubeCD = 2 * (deltap * innerArea) / (rho * MathUtil.pow2(v) * innerArea);
 		}
 		   
 		// convert to CD and return
-		System.out.println(tube + " tube CD " + tubeCD + ", stagnationCD " + stagnationCD + ", baseCD " + baseCD + ", inner area " + innerArea + ", frontal area " + frontalArea);
-		final double cd = (tubeCD * innerArea + (stagnationCD + baseCD) * frontalArea) / conditions.getRefArea();
-		System.out.println(tube + " cd " + cd);
+		final double cd = (tubeCD * innerArea + 0.7*(stagnationCD + baseCD) * frontalArea) / conditions.getRefArea();
 		return cd;
 	}
 }
diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
index 1a2e8f97e..a0b53cbfd 100644
--- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
+++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
@@ -102,7 +102,6 @@ public class TubeFinSetCalc extends TubeCalc {
 		
 		// angle between bodyRadius+outerRadius and d
 		final double theta2 = Math.PI/2.0 - theta1;
-		System.out.println("theta2 " + theta2);
 		
 		// area of arc from body tube.  Doubled so we have area to remove from diamond
 		final double a2 = MathUtil.pow2(bodyRadius) * theta2;
@@ -118,18 +117,13 @@ public class TubeFinSetCalc extends TubeCalc {
 			
 		// Area of the outer surface of a tube, not including portion masked by interstice
 		final double outerArea = chord * 2.0 * (Math.PI - theta1) * outerRadius;
-
-		// Area of inner surface of a tube
-		final double innerArea = chord * 2.0 * Math.PI * innerRadius;
 			
 		// Surface area of the portion of the body tube masked by the tube fin.  We'll subtract it from
 		// the tube fin area rather than go in and change the body tube surface area calculation. If tube
 		// fin and body tube roughness aren't the same this will result in an inaccuracy.
 		final double maskedArea = chord * 2.0 * theta2 * bodyRadius;
 		
-		wettedArea = innerArea + outerArea - maskedArea;
-		System.out.println(tubes + " outer " + outerArea + ", masked " + maskedArea);
-		log.debug("wetted area of tube fin " + wettedArea);
+		wettedArea = outerArea - maskedArea;
 
 		// Precompute most of CNa.  Equation comes from Ribner, "The ring airfoil in nonaxial
 		// flow", Journal of the Aeronautical Sciences 14(9) pp 529-530 (1947) equation (5).
@@ -270,9 +264,8 @@ public class TubeFinSetCalc extends TubeCalc {
 
 	@Override
 	public double calculateFrictionCD(FlightConditions conditions, double componentCf, WarningSet warnings) {
-		System.out.println(tubes + "wetted area " + wettedArea);
 		final double frictionCD = componentCf * wettedArea / conditions.getRefArea();
-		
+
 		return frictionCD;
 	}
 
@@ -281,11 +274,10 @@ public class TubeFinSetCalc extends TubeCalc {
 					  double stagnationCD, double baseCD, WarningSet warnings) {
 		
 	    warnings.addAll(geometryWarnings);
-		System.out.println(tubes + " stag CD " + stagnationCD + ",  base CD " + baseCD);
 						    
 		final double cd = super.calculatePressureCD(conditions, stagnationCD, baseCD, warnings) +
-		    (stagnationCD + baseCD) * intersticeArea / conditions.getRefArea();
-	    
+					(stagnationCD + baseCD) * intersticeArea / conditions.getRefArea();
+
 	    return cd;
 	}
 }

From a3dfb8ecd4a692bc17f90f88b5d44463cf2906cc Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Fri, 30 Jun 2023 15:13:08 -0600
Subject: [PATCH 09/14] The first time a TubeFinSet is added to a rocket,
 inherit the thickness from the parent BodyTube.

The two rockets I was using to test my code both turned out to have the thickness of their tube fins set to the default, so the need for a user to do this is clearly easy to miss (I created one of those rockets myself!).
---
 .../sf/openrocket/rocketcomponent/BodyTube.java   | 15 +++++++++++++++
 .../sf/openrocket/rocketcomponent/TubeFinSet.java |  8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 5b737dae6..e8215e2c9 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -550,4 +550,19 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
 		// The motor config also has listeners, so clear them as well
 		getDefaultMotorConfig().clearConfigListeners();
 	}
+
+	/**
+	 * The first time we add a TubeFinSet to the component tree, inherit the tube thickness from
+	 * the parent body tube
+	 */
+	@Override
+	public final void addChild(RocketComponent component, int index, boolean trackStage) {
+		super.addChild(component, index, trackStage);
+		if (component instanceof TubeFinSet) {
+			TubeFinSet finset = (TubeFinSet) component;
+			if (Double.isNaN(finset.getThickness())) {
+				finset.setThickness(getThickness());
+			}
+		}
+	}
 }
diff --git a/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
index b5823989c..86e97e472 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
@@ -24,7 +24,7 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R
 	
 	private boolean autoRadius = true; // Radius chosen automatically based on parent component
 	private double outerRadius = DEFAULT_RADIUS;
-	protected double thickness = 0.002;
+	protected double thickness = Double.NaN;
 	private AngleMethod angleMethod = AngleMethod.FIXED;
 	protected RadiusMethod radiusMethod = RadiusMethod.RELATIVE;
 
@@ -49,7 +49,7 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R
 	
 	
 	/**
-	 * New FinSet with given number of fins and given base rotation angle.
+	 * New TubeFinSet with default values
 	 * Sets the component relative position to POSITION_RELATIVE_BOTTOM,
 	 * i.e. fins are positioned at the bottom of the parent component.
 	 */
@@ -146,6 +146,7 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R
 	 * Sets whether the radius is selected automatically or not.
 	 */
 	public void setOuterRadiusAutomatic(boolean auto) {
+		
 		for (RocketComponent listener : configListeners) {
 			if (listener instanceof TubeFinSet) {
 				((TubeFinSet) listener).setOuterRadiusAutomatic(auto);
@@ -195,8 +196,9 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R
 
 		if ((this.thickness == thickness))
 			return;
+
 		this.thickness = MathUtil.clamp(thickness, 0, getOuterRadius());
-		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
 		clearPreset();
 	}
 	

From 103a981bca196d867886e4f3db63609fd96cba54 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sat, 1 Jul 2023 18:28:00 +0200
Subject: [PATCH 10/14] [#2242] Remove double translation to root center

---
 .../net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
index fa40f5a8a..a97ea476f 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
@@ -39,13 +39,10 @@ public class FinRenderer {
 
 		{
 		    gl.glPushMatrix();
-            
-			gl.glTranslated(finSet.getLength() / 2, 0, 0);
 
-            gl.glTranslated(0, - finSet.getBodyRadius(), 0);
+            gl.glTranslated(0, - finSet.getBodyRadius(), 0);		// Move to the rocket centerline
             
             gl.glRotated( Math.toDegrees(finSet.getCantAngle()), 0, 1, 0);
-            gl.glTranslated(-finSet.getLength() / 2, 0, 0);
 
             GLUtessellatorCallback cb = new GLUtessellatorCallbackAdapter() {
 				@Override

From d728a27ee954a64eaafe34d2dd6b835a2e2c8fce Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sat, 1 Jul 2023 20:32:00 +0200
Subject: [PATCH 11/14] [#2231] Account for fin cant in root points

---
 .../rocketcomponent/EllipticalFinSet.java     | 13 +++-
 .../sf/openrocket/rocketcomponent/FinSet.java | 74 ++++++++++++++++---
 .../rocketcomponent/FreeformFinSet.java       | 11 ++-
 .../rocketcomponent/TrapezoidFinSet.java      | 23 ++++--
 4 files changed, 98 insertions(+), 23 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java
index cc4d54455..400f68a57 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java
@@ -36,11 +36,18 @@ public class EllipticalFinSet extends FinSet {
 	@Override
 	public Coordinate[] getFinPoints() {
 		double len = MathUtil.max(length, 0.0001);
-		Coordinate[] points = new Coordinate[POINTS];
+		Coordinate[] finPoints = new Coordinate[POINTS];
 		for (int i = 0; i < POINTS; i++) {
-			points[i] = new Coordinate(POINT_X[i] * len, POINT_Y[i] * height);
+			finPoints[i] = new Coordinate(POINT_X[i] * len, POINT_Y[i] * height);
 		}
-		return points;
+
+		// Set the start and end fin points the same as the root points (necessary for canted fins)
+		final Coordinate[] rootPoints = getRootPoints();
+		if (rootPoints.length > 1) {
+			finPoints[0] = finPoints[0].setX(rootPoints[0].x).setY(rootPoints[0].y);
+			finPoints[finPoints.length - 1] = finPoints[finPoints.length - 1].setX(rootPoints[rootPoints.length - 1].x).setY(rootPoints[rootPoints.length - 1].y);
+		}
+		return finPoints;
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
index ed675b502..227f9036a 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
@@ -1025,14 +1025,14 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 	 * @return points representing the fin-root points, relative to ( x: fin-front, y: centerline ) i.e. relto: fin Component reference point
 	 */
 	public Coordinate[] getRootPoints(final int maximumBodyDivisionCount) {
-		if( null == parent){
+		if (parent == null) {
 			return new Coordinate[]{Coordinate.ZERO};
 		}
 
 		final Coordinate finLead = getFinFront();
 		final double xFinEnd = finLead.x + getLength();
 
-		return getMountPoints( finLead.x, xFinEnd, -finLead.x, -finLead.y, maximumBodyDivisionCount);
+		return getMountPoints(finLead.x, xFinEnd, -finLead.x, -finLead.y, maximumBodyDivisionCount);
 	}
 
 	/**
@@ -1075,11 +1075,11 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 
 		// for a simple body, one increment is perfectly accurate.
 		int divisionCount = 1;
-		final SymmetricComponent body = (SymmetricComponent) getParent();
+		final SymmetricComponent parent = (SymmetricComponent) getParent();
 		final double intervalLength = xEnd - xStart;
 
 		// for anything more complicated, increase the count:
-		if ((body instanceof Transition) && (((Transition)body).getShapeType() != Shape.CONICAL)) {
+		if ((!MathUtil.equals(getCantAngle(), 0)) || (parent instanceof Transition) && (((Transition)parent).getShapeType() != Shape.CONICAL)) {
 			// the maximum precision to enforce when calculating the areas of fins (especially on curved parent bodies)
 			final double xWidth = 0.0025; // width (in meters) of each individual iteration
 			divisionCount = (int) Math.ceil(intervalLength / xWidth);
@@ -1093,13 +1093,18 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 		double xIncrement = intervalLength / divisionCount;
 
 		// Create the points: step through the radius of the parent
-		double xCur = xStart;
+		double xCurr = xStart;
 		List<Coordinate> points = new ArrayList<>();
 		for (int index = 0; index < divisionCount+1; index++) {
-			double yCur = body.getRadius(xCur);
-			points.add(new Coordinate(xCur, yCur));
+			double yCurr = parent.getRadius(xCurr);
 
-			xCur += xIncrement;
+			// Account for the fin cant angle
+			final double dy = getFinCantYOffset(xStart, xEnd, xCurr);
+			yCurr += dy;
+
+			points.add(new Coordinate(xCurr, yCurr));
+
+			xCurr += xIncrement;
 		}
 
 		/*
@@ -1107,11 +1112,11 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 		then we need to add an extra root point at the front of the parent. Same goes for the last point, but vice versa.
 		This ensures that fins are drawn correctly on transitions and nose cones (see GitHub issue #1021 for more info).
 		 */
-		// Front fin point is outside the parent's bounds and last point is still within the parent's bounds
+		// Front fin point is outside the parent's bounds and last point is beyond the parent's fore end
 		if (xStart < 0 && xEnd > 0) {
 			points.add(1, new Coordinate(0, points.get(0).y));
 		}
-		// End fin point is outside the parent's bounds and first point is still within the parent's bounds
+		// End fin point is beyond the parent's aft and first point is still before the parent's aft end
 		if (xEnd > parent.length && xStart < parent.length) {
 			final double x = parent.length;
 			final double y = points.get(points.size() - 1).y;
@@ -1122,8 +1127,8 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 
 		// correct last point, if beyond a rounding error from body's end.
 		final int lastIndex = rootPoints.length - 1;
-		if (Math.abs(rootPoints[lastIndex].x - body.getLength()) < MathUtil.EPSILON) {
-			rootPoints[lastIndex] = rootPoints[lastIndex].setX(body.getLength()).setY(body.getAftRadius());
+		if (Math.abs(rootPoints[lastIndex].x - parent.getLength()) < MathUtil.EPSILON) {
+			rootPoints[lastIndex] = rootPoints[lastIndex].setX(parent.getLength());
 		}
 
 		// translate the points if needed
@@ -1138,6 +1143,51 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
 		return getMountPoints(xStart, xEnd, xOffset, yOffset, MAX_ROOT_DIVISIONS);
 	}
 
+	/**
+	 * Returns a y offset that should be applied to the fin root point at the given x position to account for the fin cant.
+	 * @param xStart The x position of the fin root point at the front of the fin.
+	 * @param xEnd The x position of the fin root point at the back of the fin.
+	 * @param xCurr The x position of the fin root point to calculate the y offset for.
+	 * @return The y offset to apply to the fin root point at the given x position.
+	 */
+	private double getFinCantYOffset(final double xStart, final double xEnd, double xCurr) {
+		final SymmetricComponent parent = (SymmetricComponent) getParent();
+		final double cantAngle = getCantAngle();
+
+		if (MathUtil.equals(cantAngle, 0) || (xStart > parent.length && xEnd > parent.length) || (xStart < 0 && xEnd < 0)) {
+			return 0;
+		}
+
+		// Limit the x position to the parent's bounds
+		double x = Math.max(xCurr, 0);
+		x = Math.min(x, parent.getLength());
+
+		// Determine the center of rotation
+		final double xCenter = (xStart + xEnd) / 2;
+
+		// Calculate the new x position after rotation
+		final double dx = x - xCenter;		// Distance to the center of rotation
+		final double xCurr_rot = xCenter + dx * Math.abs(Math.cos(cantAngle));	// X coordinate after rotation
+
+		// Extend the root of the fin to touch the surface of the parent
+		final double radius_rot = parent.getRadius(xCurr_rot);
+		final double dz = Math.abs(Math.sin(cantAngle)) * dx;
+
+		final double dy;
+		if (dz >= radius_rot) {
+			dy = 0;
+		} else {
+				/*
+				 Simplification of  r^2 = (r-dy)^2 + dz^2, given that dz < r. (to derive this, draw
+				 the cross-section of the body, which is just a circle, with a tangent line starting on the top of the circle
+				 and reaching a distance dz. Use some Pythagorean theorem and bam, you got this equation.)
+				 */
+			dy = radius_rot - Math.sqrt(Math.pow(radius_rot, 2) - Math.pow(dz, 2));
+		}
+
+		return -dy;
+	}
+
 	/**
 	 * Return a list of coordinates defining the geometry of a single fin, including the parent's body points .
 	 */
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
index 99d901e93..169377c17 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
@@ -392,7 +392,16 @@ public class FreeformFinSet extends FinSet {
 
 	@Override
 	public Coordinate[] getFinPoints() {
-		return points.toArray(new Coordinate[0]);
+		Coordinate[] finPoints = points.toArray(new Coordinate[0]);
+
+		// Set the start and end fin points the same as the root points (necessary for canted fins)
+		final Coordinate[] rootPoints = getRootPoints();
+		if (rootPoints.length > 1) {
+			finPoints[0] = finPoints[0].setX(rootPoints[0].x).setY(rootPoints[0].y);
+			finPoints[finPoints.length - 1] = finPoints[finPoints.length - 1].setX(rootPoints[rootPoints.length - 1].x).setY(rootPoints[rootPoints.length - 1].y);
+		}
+
+		return finPoints;
 	}
 
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java
index afb7ee2d4..d7f63f434 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java
@@ -193,16 +193,25 @@ public class TrapezoidFinSet extends FinSet {
 	 */
 	@Override
 	public Coordinate[] getFinPoints() {
-		List<Coordinate> list = new ArrayList<Coordinate>(4);
-		
-		list.add(Coordinate.NUL);
-		list.add(new Coordinate(sweep, height));
+		List<Coordinate> points = new ArrayList<>(4);
+
+		points.add(Coordinate.NUL);
+		points.add(new Coordinate(sweep, height));
 		if (tipChord > 0.0001) {
-			list.add(new Coordinate(sweep + tipChord, height));
+			points.add(new Coordinate(sweep + tipChord, height));
+		}
+		points.add(new Coordinate(MathUtil.max(length, 0.0001), 0));
+
+		Coordinate[] finPoints = points.toArray(new Coordinate[0]);
+
+		// Set the start and end fin points the same as the root points (necessary for canted fins)
+		final Coordinate[] rootPoints = getRootPoints();
+		if (rootPoints.length > 1) {
+			finPoints[0] = finPoints[0].setX(rootPoints[0].x).setY(rootPoints[0].y);
+			finPoints[finPoints.length - 1] = finPoints[finPoints.length - 1].setX(rootPoints[rootPoints.length - 1].x).setY(rootPoints[rootPoints.length - 1].y);
 		}
-		list.add(new Coordinate(MathUtil.max(length, 0.0001), 0));
 		
-		return list.toArray(new Coordinate[list.size()]);
+		return finPoints;
 	}
 	
 	/**

From fb80671a60508e8ce59becf1f9409af0f1499e2c Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 2 Jul 2023 00:52:38 +0200
Subject: [PATCH 12/14] Add unit tests for canted fins

---
 .../rocketcomponent/FreeformFinSetTest.java   | 135 ++++++++++++++++++
 .../rocketcomponent/TrapezoidFinSetTest.java  |  66 +++++++++
 2 files changed, 201 insertions(+)

diff --git a/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java
index a5ced6bbb..20949593f 100644
--- a/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java
@@ -248,6 +248,141 @@ public class FreeformFinSetTest extends BaseTestCase {
 
 	}
 
+	@Test
+	public void testGenerateTrapezoidalPointsWithCant() {
+		final Rocket rkt = createTemplateRocket();
+		final Transition tailCone = (Transition) rkt.getChild(0).getChild(2);
+		final FreeformFinSet fins = createFinOnConicalTransition(tailCone);
+		fins.setCantAngle(Math.toRadians(15));
+
+		Coordinate[] actPoints = fins.getFinPoints();
+		Coordinate[] rootPoints = fins.getRootPoints();
+
+		final Coordinate[] expPoints = new Coordinate[] {
+				new Coordinate(0, -0.001683625, 0),
+				new Coordinate(0.4, 0.2, 0),
+				new Coordinate(0.4, -0.202224401, 0)
+		};
+
+		final Coordinate[] expRootPoints = new Coordinate[]{
+				new Coordinate(0, -0.001683625, 0),
+				new Coordinate(0.004, -0.003620824, 0),
+				new Coordinate(0.008, -0.005559077, 0),
+				new Coordinate(0.012, -0.00749839, 0),
+				new Coordinate(0.016, -0.009438771, 0),
+				new Coordinate(0.02, -0.011380227, 0),
+				new Coordinate(0.024, -0.013322767, 0),
+				new Coordinate(0.028, -0.015266398, 0),
+				new Coordinate(0.032, -0.017211128, 0),
+				new Coordinate(0.036, -0.019156966, 0),
+				new Coordinate(0.04, -0.021103918, 0),
+				new Coordinate(0.044, -0.023051993, 0),
+				new Coordinate(0.048, -0.0250012, 0),
+				new Coordinate(0.052, -0.026951546, 0),
+				new Coordinate(0.056, -0.028903041, 0),
+				new Coordinate(0.06, -0.030855692, 0),
+				new Coordinate(0.064, -0.032809508, 0),
+				new Coordinate(0.068, -0.034764497, 0),
+				new Coordinate(0.072, -0.036720669, 0),
+				new Coordinate(0.076, -0.038678032, 0),
+				new Coordinate(0.08, -0.040636596, 0),
+				new Coordinate(0.084, -0.042596368, 0),
+				new Coordinate(0.088, -0.044557359, 0),
+				new Coordinate(0.092, -0.046519577, 0),
+				new Coordinate(0.096, -0.048483032, 0),
+				new Coordinate(0.1, -0.050447733, 0),
+				new Coordinate(0.104, -0.052413689, 0),
+				new Coordinate(0.108, -0.054380911, 0),
+				new Coordinate(0.112, -0.056349408, 0),
+				new Coordinate(0.116, -0.05831919, 0),
+				new Coordinate(0.12, -0.060290266, 0),
+				new Coordinate(0.124, -0.062262648, 0),
+				new Coordinate(0.128, -0.064236344, 0),
+				new Coordinate(0.132, -0.066211365, 0),
+				new Coordinate(0.136, -0.068187722, 0),
+				new Coordinate(0.14, -0.070165425, 0),
+				new Coordinate(0.144, -0.072144484, 0),
+				new Coordinate(0.148, -0.074124911, 0),
+				new Coordinate(0.152, -0.076106716, 0),
+				new Coordinate(0.156, -0.07808991, 0),
+				new Coordinate(0.16, -0.080074505, 0),
+				new Coordinate(0.164, -0.082060511, 0),
+				new Coordinate(0.168, -0.08404794, 0),
+				new Coordinate(0.172, -0.086036803, 0),
+				new Coordinate(0.176, -0.088027112, 0),
+				new Coordinate(0.18, -0.090018879, 0),
+				new Coordinate(0.184, -0.092012115, 0),
+				new Coordinate(0.188, -0.094006834, 0),
+				new Coordinate(0.192, -0.096003045, 0),
+				new Coordinate(0.196, -0.098000763, 0),
+				new Coordinate(0.2, -0.1, 0),
+				new Coordinate(0.204, -0.102000768, 0),
+				new Coordinate(0.208, -0.104003079, 0),
+				new Coordinate(0.212, -0.106006948, 0),
+				new Coordinate(0.216, -0.108012386, 0),
+				new Coordinate(0.22, -0.110019407, 0),
+				new Coordinate(0.224, -0.112028025, 0),
+				new Coordinate(0.228, -0.114038253, 0),
+				new Coordinate(0.232, -0.116050104, 0),
+				new Coordinate(0.236, -0.118063594, 0),
+				new Coordinate(0.24, -0.120078734, 0),
+				new Coordinate(0.244, -0.122095541, 0),
+				new Coordinate(0.248, -0.124114028, 0),
+				new Coordinate(0.252, -0.126134209, 0),
+				new Coordinate(0.256, -0.1281561, 0),
+				new Coordinate(0.26, -0.130179716, 0),
+				new Coordinate(0.264, -0.132205071, 0),
+				new Coordinate(0.268, -0.134232181, 0),
+				new Coordinate(0.272, -0.136261062, 0),
+				new Coordinate(0.276, -0.138291728, 0),
+				new Coordinate(0.28, -0.140324197, 0),
+				new Coordinate(0.284, -0.142358484, 0),
+				new Coordinate(0.288, -0.144394605, 0),
+				new Coordinate(0.292, -0.146432578, 0),
+				new Coordinate(0.296, -0.148472418, 0),
+				new Coordinate(0.3, -0.150514143, 0),
+				new Coordinate(0.304, -0.152557769, 0),
+				new Coordinate(0.308, -0.154603316, 0),
+				new Coordinate(0.312, -0.156650799, 0),
+				new Coordinate(0.316, -0.158700236, 0),
+				new Coordinate(0.32, -0.160751647, 0),
+				new Coordinate(0.324, -0.16280505, 0),
+				new Coordinate(0.328, -0.164860462, 0),
+				new Coordinate(0.332, -0.166917903, 0),
+				new Coordinate(0.336, -0.168977392, 0),
+				new Coordinate(0.34, -0.171038948, 0),
+				new Coordinate(0.344, -0.173102591, 0),
+				new Coordinate(0.348, -0.175168341, 0),
+				new Coordinate(0.352, -0.177236218, 0),
+				new Coordinate(0.356, -0.179306243, 0),
+				new Coordinate(0.36, -0.181378435, 0),
+				new Coordinate(0.364, -0.183452818, 0),
+				new Coordinate(0.368, -0.18552941, 0),
+				new Coordinate(0.372, -0.187608235, 0),
+				new Coordinate(0.376, -0.189689315, 0),
+				new Coordinate(0.38, -0.191772671, 0),
+				new Coordinate(0.384, -0.193858326, 0),
+				new Coordinate(0.388, -0.195946303, 0),
+				new Coordinate(0.392, -0.198036625, 0),
+				new Coordinate(0.396, -0.200129317, 0),
+				new Coordinate(0.4, -0.202224401, 0)
+		};
+
+
+		assertEquals("Canted fin number of points doesn't match! ", expPoints.length, actPoints.length);
+		assertEquals("Canted root number of points doesn't match! ", expRootPoints.length, rootPoints.length);
+		for (int i = 0; i < expPoints.length; i++) {
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].x, actPoints[i].x, EPSILON);
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].y, actPoints[i].y, EPSILON);
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].z, actPoints[i].z, EPSILON);
+		}
+		for (int i = 0; i < expRootPoints.length; i++) {
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].x, rootPoints[i].x, EPSILON);
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].y, rootPoints[i].y, EPSILON);
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].z, rootPoints[i].z, EPSILON);
+		}
+	}
+
 	@Test
 	public void testFreeformCMComputation_trapezoidOnTube() {
 		final Rocket rkt = createTemplateRocket();
diff --git a/core/test/net/sf/openrocket/rocketcomponent/TrapezoidFinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/TrapezoidFinSetTest.java
index d047b2eff..d60d97d61 100644
--- a/core/test/net/sf/openrocket/rocketcomponent/TrapezoidFinSetTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/TrapezoidFinSetTest.java
@@ -1,6 +1,7 @@
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
 
 import org.junit.Test;
 
@@ -111,6 +112,71 @@ public class TrapezoidFinSetTest extends BaseTestCase {
 		}
 	}
 
+	@Test
+	public void testGenerateTrapezoidalPointsWithCant() {
+		final Rocket rkt = createSimpleTrapezoidalFin();
+		FinSet fins = (FinSet) rkt.getChild(0).getChild(0).getChild(0);
+		fins.setCantAngle(Math.toRadians(15));
+
+		// Fin length = 0.05
+		// Tab Length = 0.01
+		//          +--+
+		//         /    \
+		//        /      \
+		//   +---+--------+---+
+		//
+		Coordinate[] actPoints = fins.getFinPoints();
+		Coordinate[] rootPoints = fins.getRootPoints();
+
+		final Coordinate[] expPoints = new Coordinate[] {
+				new Coordinate(0.00, -0.00030189855, 0.00),
+				new Coordinate(0.02, 0.05, 0.00),
+				new Coordinate(0.04, 0.05, 0.00),
+				new Coordinate(0.06, -0.00030189855, 0.00)
+		};
+
+		final Coordinate[] expRootPoints = new Coordinate[] {
+				new Coordinate(0.0000, -0.000301899, 0.0000),
+				new Coordinate(0.0025, -0.000253617, 0.0000),
+				new Coordinate(0.0050, -0.000209555, 0.0000),
+				new Coordinate(0.0075, -0.000169706, 0.0000),
+				new Coordinate(0.0100, -0.000134064, 0.0000),
+				new Coordinate(0.0125, -0.000102627, 0.0000),
+				new Coordinate(0.0150, -0.000075389, 0.0000),
+				new Coordinate(0.0175, -0.000052348, 0.0000),
+				new Coordinate(0.0200, -0.000033499, 0.0000),
+				new Coordinate(0.0225, -0.000018842, 0.0000),
+				new Coordinate(0.0250, -0.000008374, 0.0000),
+				new Coordinate(0.0275, -0.000002093, 0.0000),
+				new Coordinate(0.0300, 0.0000, 0.0000),
+				new Coordinate(0.0325, -0.000002093, 0.0000),
+				new Coordinate(0.0350, -0.000008374, 0.0000),
+				new Coordinate(0.0375, -0.000018842, 0.0000),
+				new Coordinate(0.0400, -0.000033499, 0.0000),
+				new Coordinate(0.0425, -0.000052348, 0.0000),
+				new Coordinate(0.0450, -0.000075389, 0.0000),
+				new Coordinate(0.0475, -0.000102627, 0.0000),
+				new Coordinate(0.0500, -0.000134064, 0.0000),
+				new Coordinate(0.0525, -0.000169706, 0.0000),
+				new Coordinate(0.0550, -0.000209555, 0.0000),
+				new Coordinate(0.0575, -0.000253617, 0.0000),
+				new Coordinate(0.0600, -0.000301899, 0.0000)
+		};
+
+		assertEquals("Canted fin number of points doesn't match! ", expPoints.length, actPoints.length);
+		assertEquals("Canted root number of points doesn't match! ", expRootPoints.length, rootPoints.length);
+		for (int i = 0; i < expPoints.length; i++) {
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].x, actPoints[i].x, EPSILON);
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].y, actPoints[i].y, EPSILON);
+			assertEquals("Canted fin point [" + i + "] doesn't match! ", expPoints[i].z, actPoints[i].z, EPSILON);
+		}
+		for (int i = 0; i < expRootPoints.length; i++) {
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].x, rootPoints[i].x, EPSILON);
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].y, rootPoints[i].y, EPSILON);
+			assertEquals("Canted root point [" + i + "] doesn't match! ", expRootPoints[i].z, rootPoints[i].z, EPSILON);
+		}
+	}
+
 	@Test
 	public void testCGCalculation_simpleSquareFin() {
 		final Rocket rkt = createSimpleTrapezoidalFin();

From 1b2d7656c436e06f716df517f60ede4dcadf1aa0 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Mon, 3 Jul 2023 14:01:29 -0600
Subject: [PATCH 13/14] update legacy component preset databases setting all
 units to SI, instead of the various mixes of g, kg, cm, and m that previously
 existed.

*Only* updates the unit specifiers, not values.  The values appear to have all been in MKS units, while the unit specifiers were in error.
---
 .../components-openrocket/Estes-legacy.orc    | 320 ++++++++---------
 .../LocPrecision-legacy.orc                   | 292 ++++++++--------
 .../components-openrocket/Quest-legacy.orc    | 322 +++++++++---------
 .../components-openrocket/bluetube-legacy.orc |   2 +-
 .../components-openrocket/bms-legacy.orc      |   8 +-
 .../components-openrocket/fliskits-legacy.orc |  12 +-
 .../giantleaprocketry-legacy.orc              |  10 +-
 .../publicmissiles-legacy.orc                 | 124 +++----
 .../components-openrocket/semroc-legacy.orc   |  24 +-
 9 files changed, 557 insertions(+), 557 deletions(-)

diff --git a/swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc b/swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc
index f5f987563..bafec2db9 100644
--- a/swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc
@@ -3,802 +3,802 @@
     <Version>0.1</Version>
     <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name></Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.060 Carbon Fiber</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.125 in Fiberglass/Honeycomb</Name>
             <Density>461.33174592000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.25 in Fiberglass/Honeycomb</Name>
             <Density>235.47141198</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1 in. Flat Elastic</Name>
             <Density>0.015514109144</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1 in. Tubular Nylon</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1.1 Ounce Rip Stop Nylon</Name>
             <Density>0.05983056264534001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.1 oz. Rip Stop Nylon</Name>
             <Density>0.037350571446</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.3 oz. Ripstop Nylon (SkyAngle)</Name>
             <Density>0.04407367430628</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.7 oz. Ripstop Nylon</Name>
             <Density>0.057638523018492004</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon (PML)</Name>
             <Density>0.08788369752</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon (SkyAngle)</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/16 in. Aircraft Plywood</Name>
             <Density>361.3765253</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 in. Braided Nylon</Name>
             <Density>0.00102</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 in. Round Elastic</Name>
             <Density>0.00183</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/2 in. Flat Elastic</Name>
             <Density>0.003125144288</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/2 in. Tubular Kevlar</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/2 in. Tubular Nylon</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/32 in. Kevlar</Name>
             <Density>6.590000000000001E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 Aircraft Plywood</Name>
             <Density>344.269</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/4 In. Flat Elastic</Name>
             <Density>0.00402</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 in. Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 in. Braided Nylon</Name>
             <Density>0.06535533067200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/4 in. Tubular Kevlar</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 Aircraft Plywood</Name>
             <Density>337.541</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in Birch Plywood (Revell)</Name>
             <Density>640.7385360000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in. Aircraft Plywood</Name>
             <Density>672.7754628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in. Braided Nylon</Name>
             <Density>0.03267766533600001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Flat Elastic</Name>
             <Density>0.00205</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Flat Rubber</Name>
             <Density>0.00231</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Tubular Kevlar</Name>
             <Density>0.011161229600000001</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100 lb Kevlar (Apogee 29505)</Name>
             <Density>0.006359329969800001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100 lb. Kevlar</Name>
             <Density>0.032837849970000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100lb Kevlar (Apogee 29505)</Name>
             <Density>0.006359329969800001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1500 lb. Kevlar</Name>
             <Density>0.0959105496075</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1500lb Kevlar (Apogee 29507)</Name>
             <Density>0.0959105496075</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>260 lb. Elastic</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/16 Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/16 in. Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/4 in. Flat Elastic</Name>
             <Density>0.01227735256</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 in. Flat Elastic</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/8 in. Tubular Nylon</Name>
             <Density>0.018602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/8 in. Tubular Nylon (SkyAngle)</Name>
             <Density>0.018602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 inch Flat Elastic</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 tubular nylon (SkyAngle)</Name>
             <Density>2.9797705801314</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>30 Lb. Kevlar</Name>
             <Density>1.78E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300 lb. Kevlar</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300 lb. Kevlar (Apogee 29506)</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300lb Kevlar (Apogee 29506)</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>4000 lb. nylon</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/64 in. Round Elastic</Name>
             <Density>0.0024200000000000003</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/8 in. Tubular Nylon</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/8 in. Tubular Nylon (SkyAngle)</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>6000 lb. nylon</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>6oz &amp; 2oz FG &amp; Poster board</Name>
             <Density>798.85</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>7/16 in. Flat Braided Kevlar</Name>
             <Density>0.0502255332</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>70 Lb. Kevlar</Name>
             <Density>3.3E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>750 Lb. Kevlar</Name>
             <Density>0.0030135319920000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>9/16 in. Tubular Nylon</Name>
             <Density>0.0167418444</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Acrylic (Cast)</Name>
             <Density>1185.3662916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aircraft plywood (Birch)</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aircraft plywood (LOC)</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum</Name>
             <Density>2698.9</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum (Al)</Name>
             <Density>2698.9</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum 2024</Name>
             <Density>2780.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum 7075</Name>
             <Density>2810.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Ash</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Basswood</Name>
             <Density>424.48928010000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Beech</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch Plywood (Revell)</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Blue Tube</Name>
             <Density>1237.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Blue Tube 2</Name>
             <Density>1250.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Brass</Name>
             <Density>8553.8594556</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Carbon Fiber</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cardboard</Name>
             <Density>688.7939262000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Carpet String</Name>
             <Density>3.2972000000000003E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Carpet String (Apogee 29500)</Name>
             <Density>3.2972000000000003E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cellulose Acetate Propionate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Chalk (Fine)</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Composite Fin Material</Name>
             <Density>634.3311506400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (cast)</Name>
             <Density>8682.0071628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (rolled)</Name>
             <Density>8906.2656504</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cork (Solid)</Name>
             <Density>240.27695100000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cottonwood</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Custom</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Dyna-Wind Tubing</Name>
             <Density>1210.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiber</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiberglass</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (Douglas)</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (White)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.062)</Name>
             <Density>3.137448001464</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 (PML 0.062)</Name>
             <Density>0.07059977558916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.093)</Name>
             <Density>5.022553313268</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.125)</Name>
             <Density>6.169435565904</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass</Name>
             <Density>2175.3073297200003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass (LOC)</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass Filament Wound</Name>
             <Density>1934.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass Filament Wound Tube</Name>
             <Density>1820.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Phenolic</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G12 Fiberglass</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Glassed Phenolic</Name>
             <Density>1900.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Gold (24 kt.)</Name>
             <Density>19286.229933600003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Kevlar Thread (Apogee 29502)</Name>
             <Density>8.858E-5</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic</Name>
             <Density>943.4874942600001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic (Glassed)</Name>
             <Density>1153.329336</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (cast)</Name>
             <Density>11341.072087200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (rolled)</Name>
             <Density>11389.127477400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead Shot</Name>
             <Density>6727.75</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Leather</Name>
             <Density>945.0893406000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lexan</Name>
             <Density>1218.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lite Plywood</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Magna Phenolic</Name>
             <Density>1100.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mail Tube Paper</Name>
             <Density>800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Maple (Hard)</Name>
             <Density>632.7293043000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mat Board 4-Ply</Name>
             <Density>710.579</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mylar</Name>
             <Density>1309.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 200</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 400</Name>
             <Density>8800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 600</Name>
             <Density>8410.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 625</Name>
             <Density>8440.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 718</Name>
             <Density>8230.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel C276</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nylon</Name>
             <Density>1140.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Brown)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Red)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (White)</Name>
             <Density>752.8677798000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>PVC</Name>
             <Density>1300.6992280800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>608.7016092000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper/2layers 8 oz.  glass</Name>
             <Density>1681.94</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Northern)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Western)</Name>
             <Density>432.4985118000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Plastic</Name>
             <Density>920.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polycarbonate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene</Name>
             <Density>920.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene LDPE</Name>
             <Density>924.2653381800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Polyethylene LDPE(0.051)</Name>
             <Density>0.04713753224718001</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polystyrene PS</Name>
             <Density>1049.2093527000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Poplar (Yellow)</Name>
             <Density>480.55390200000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Quantum Tubing</Name>
             <Density>1100.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Rip stop nylon</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Rocketwood</Name>
             <Density>529.089846102</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Russian 1/8 in. Plywood</Name>
             <Density>685.1</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Silver</Name>
             <Density>10460.056600200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral/Glassine</Name>
             <Density>848.9785602000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral/Glassine-Thick</Name>
             <Density>768.886</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spruce</Name>
             <Density>448.51697520000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-4PH</Name>
             <Density>7600.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-5PH</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-7PH</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel 4130</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel 4340</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Sycamore</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Titanium</Name>
             <Density>4500.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Urethane</Name>
             <Density>847.0563445920002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Vulcanized Fiber</Name>
             <Density>1250.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>lite ply</Name>
             <Density>352.406186</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc b/swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc
index ebfcdfbe6..bd15c1603 100644
--- a/swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc
@@ -3,732 +3,732 @@
     <Version>0.1</Version>
     <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:.060 Carbon Fiber]</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1 In. Flat Elastic]</Name>
             <Density>0.015514109144</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1 in. tubular nylon]</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.1 Ounce Rip Stop Nylon]</Name>
             <Density>0.037350571446</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.3 oz. Ripstop Nylon (SkyAngle)]</Name>
             <Density>0.04407367430628</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.7 oz. Ripstop Nylon]</Name>
             <Density>0.057638523018492004</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.9 oz. Ripstop Nylon (PML)]</Name>
             <Density>0.08788369752</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.9 oz. Ripstop Nylon (SkyAngle)]</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:1.9 oz. Ripstop Nylon]</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/16 Aircraft Plywood]</Name>
             <Density>361.3765253</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/16 In. Braided Nylon]</Name>
             <Density>0.00102</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/16 In. Round Elastic]</Name>
             <Density>0.00183</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/16 in. Aircraft Plywood]</Name>
             <Density>361.3765253</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/2 In. Flat Elastic]</Name>
             <Density>0.003125144288</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/2 in. Tubular Nylon]</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/2 in. tubular kevlar]</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/32 In. Kevlar]</Name>
             <Density>6.590000000000001E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/4 Aircraft Plywood]</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/4 In. Flat Elastic]</Name>
             <Density>0.00402</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/4 in. Aircraft Plywood]</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/4 in. tubular kevlar]</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/8 Aircraft Plywood]</Name>
             <Density>337.5410523</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/8 In. Braided Nylon]</Name>
             <Density>0.03267766533600001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/8 In. Flat Elastic]</Name>
             <Density>0.00205</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/8 In. Flat Rubber]</Name>
             <Density>0.00231</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1/8 in. Aircraft Plywood]</Name>
             <Density>337.5410523</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1/8 in. Tubular Kevlar]</Name>
             <Density>0.011161229600000001</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:100 lb Kevlar (Apogee 29505)]</Name>
             <Density>0.006359329969800001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:100lb Kevlar (Apogee 29505)]</Name>
             <Density>3.9698E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:1500 lb Kevlar (Apogee 29507)]</Name>
             <Density>0.0959105496075</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:1500lb Kevlar (Apogee 29507)]</Name>
             <Density>0.0059875</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:260 lb. Elastic]</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:3/16 Aircraft Plywood]</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:3/16 in. Aircraft Plywood]</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/4 In. Flat Elastic]</Name>
             <Density>0.01227735256</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/8 in. Flat Elastic]</Name>
             <Density>0.0038</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/8 in. Tubular Nylon (SkyAngle)]</Name>
             <Density>0.18602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/8 in. Tubular Nylon]</Name>
             <Density>0.18602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/8 inch Flat Elastic]</Name>
             <Density>0.0038</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:3/8 tubular nylon (SkyAngle)]</Name>
             <Density>0.18602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:30 Lb. Kevlar]</Name>
             <Density>1.78E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:300 lb. Kevlar (Apogee 29506)]</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:300lb Kevlar (Apogee 29506)]</Name>
             <Density>0.001128609</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:4000 lb. nylon]</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:5/64 In. Round Elastic]</Name>
             <Density>0.0024200000000000003</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:5/8 Tubular nylon (SkyAngle)]</Name>
             <Density>0.223224592</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:5/8 in. Tubular Nylon (SkyAngle)]</Name>
             <Density>0.223224592</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:5/8 in. Tubular Nylon]</Name>
             <Density>0.223224592</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:6000 lb. nylon]</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:6oz &amp; 2oz FG &amp; Poster board]</Name>
             <Density>798.85</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:7/16 in. Flat braided kevlar]</Name>
             <Density>0.0502255332</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:70 Lb. Kevlar]</Name>
             <Density>3.3E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:9/16 In. Tubular Nylon]</Name>
             <Density>0.0167418444</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Acrylic (Cast)]</Name>
             <Density>1185.3662916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Aircraft plywood (Birch)]</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Aircraft plywood (LOC)]</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Aluminum (Al)]</Name>
             <Density>2698.9</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Aluminum 2024]</Name>
             <Density>2780.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Aluminum 7075]</Name>
             <Density>2810.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Ash]</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:BadNoseMaterial]</Name>
             <Density>128.147704</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Balsa]</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Basswood]</Name>
             <Density>424.48928010000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Beech]</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Birch]</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Blue Tube]</Name>
             <Density>1237.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Brass]</Name>
             <Density>8553.8594556</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Carbon Fiber]</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Cardboard]</Name>
             <Density>688.7939262000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:Carpet String (Apogee 29500)]</Name>
             <Density>3.2972000000000003E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Cellulose Acetate Propionate]</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Chalk (Fine)]</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Copper (cast)]</Name>
             <Density>8682.0071628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Copper (rolled)]</Name>
             <Density>8906.2656504</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Cork (Solid)]</Name>
             <Density>240.27695100000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Cottonwood]</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Epoxy]</Name>
             <Density>1254.2456842200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Fiber]</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Fiberglass]</Name>
             <Density>128.147704</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Fir (Douglas)]</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Fir (White)]</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:G10 (PML 0.062)1.1]</Name>
             <Density>3.137448001464</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:G10 (PML 0.062)]</Name>
             <Density>3.137448001464</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:G10 (PML 0.093)]</Name>
             <Density>5.022553313268</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:G10 (PML 0.125)]</Name>
             <Density>6.169435565904</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:G10 Fiberglass Filament Wound]</Name>
             <Density>1820.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:G10 fiberglass (LOC)]</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:G10 fiberglass]</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:G10 phenolic]</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:G12 Fiberglass Filament Wound]</Name>
             <Density>1820.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Glassed Phenolic]</Name>
             <Density>1521.753985</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Gold (24 kt.)]</Name>
             <Density>19286.229933600003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Iron (cast)]</Name>
             <Density>7208.308530000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Iron (cast]</Name>
             <Density>7208.308530000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Iron (wrought)]</Name>
             <Density>7768.954749</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>[material:Kevlar Thread (Apogee 29502)]</Name>
             <Density>8.858E-5</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Kraft phenolic (Glassed)]</Name>
             <Density>1153.329336</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Kraft phenolic]</Name>
             <Density>958.7050344900001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Lead (cast)]</Name>
             <Density>11341.072087200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Lead (rolled)]</Name>
             <Density>11389.127477400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Lead Shot]</Name>
             <Density>6727.75</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Leather]</Name>
             <Density>945.0893406000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Lexan]</Name>
             <Density>1218.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Lite Plywood]</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Maple (Hard)]</Name>
             <Density>632.7293043000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Mylar]</Name>
             <Density>1309.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel 200]</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel 400]</Name>
             <Density>8800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel 600]</Name>
             <Density>8410.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel 625]</Name>
             <Density>8440.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel 718]</Name>
             <Density>8230.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nickel C276]</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Nylon]</Name>
             <Density>1140.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Oak (Brown)]</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Oak (Red)]</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Oak (White)]</Name>
             <Density>752.8677798000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:PVC]</Name>
             <Density>1300.6992280800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Paper 2]</Name>
             <Density>752.5473917</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Paper/2layers 8 oz.  glass]</Name>
             <Density>1681.94</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Paper]</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Pine (White Northern)]</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Pine (White Western)]</Name>
             <Density>432.4985118000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Polycarbonate]</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Polyethylene LDPE]</Name>
             <Density>924.2653381800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Polyethylene]</Name>
             <Density>920.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Polystyrene PS]</Name>
             <Density>1049.2093527000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Poplar (Yellow)]</Name>
             <Density>480.55390200000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Quantum Tubing]</Name>
             <Density>1100.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>[material:Rip stop nylon]</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Rocketwood]</Name>
             <Density>529.089846102</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Russian 1/8 in. Plywood]</Name>
             <Density>685.1</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Silver]</Name>
             <Density>10460.056600200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Spiral/Glassine]</Name>
             <Density>848.9785602000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Spruce]</Name>
             <Density>448.51697520000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Stainless steel 17-4PH]</Name>
             <Density>7600.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Stainless steel 17-5PH]</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Stainless steel 17-7PH]</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Steel 4130]</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Steel 4340]</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Steel]</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Sycamore]</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Titanium]</Name>
             <Density>4500.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:Urethane]</Name>
             <Density>847.0563445920002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:]</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:lite ply]</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>[material:paper2]</Name>
             <Density>752.5473917</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc b/swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc
index f5dc587a3..c3d25e7b8 100644
--- a/swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc
@@ -3,807 +3,807 @@
     <Version>0.1</Version>
     <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name></Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.060 Carbon Fiber</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.125 in Fiberglass/Honeycomb</Name>
             <Density>461.33174592000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>.25 in Fiberglass/Honeycomb</Name>
             <Density>235.47141198</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1 in. Flat Elastic</Name>
             <Density>0.015514109144</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1 in. Tubular Nylon</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1.1 Ounce Rip Stop Nylon</Name>
             <Density>0.05983056264534001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.1 oz. Rip Stop Nylon</Name>
             <Density>0.037350571446</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.3 oz. Ripstop Nylon (SkyAngle)</Name>
             <Density>0.04407367430628</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.7 oz. Ripstop Nylon</Name>
             <Density>0.057638523018492004</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon (PML)</Name>
             <Density>0.08788369752</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>1.9 oz. Ripstop Nylon (SkyAngle)</Name>
             <Density>0.06441875028216</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/16 in. Aircraft Plywood</Name>
             <Density>361.3765253</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 in. Braided Nylon</Name>
             <Density>0.00102</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 in. Round Elastic</Name>
             <Density>0.00183</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/2 in. Flat Elastic</Name>
             <Density>0.003125144288</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/2 in. Tubular Kevlar</Name>
             <Density>0.044644918400000004</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/2 in. Tubular Nylon</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/32 in. Kevlar</Name>
             <Density>6.590000000000001E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 Aircraft Plywood</Name>
             <Density>344.269</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/4 In. Flat Elastic</Name>
             <Density>0.00402</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 in. Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/4 in. Braided Nylon</Name>
             <Density>0.06535533067200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/4 in. Tubular Kevlar</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 Aircraft Plywood</Name>
             <Density>337.541</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in Birch Plywood (Revell)</Name>
             <Density>640.7385360000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in. Aircraft Plywood</Name>
             <Density>672.7754628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1/8 in. Braided Nylon</Name>
             <Density>0.03267766533600001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Flat Elastic</Name>
             <Density>0.00205</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Flat Rubber</Name>
             <Density>0.00231</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 in. Tubular Kevlar</Name>
             <Density>0.011161229600000001</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100 lb Kevlar (Apogee 29505)</Name>
             <Density>0.006359329969800001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100 lb. Kevlar</Name>
             <Density>0.032837849970000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>100lb Kevlar (Apogee 29505)</Name>
             <Density>0.006359329969800001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1500 lb. Kevlar</Name>
             <Density>0.0959105496075</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>1500lb Kevlar (Apogee 29507)</Name>
             <Density>0.0959105496075</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>260 lb. Elastic</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/16 Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/16 in. Aircraft Plywood</Name>
             <Density>344.2688068</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/4 in. Flat Elastic</Name>
             <Density>0.01227735256</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 in. Flat Elastic</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/8 in. Tubular Nylon</Name>
             <Density>0.018602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/8 in. Tubular Nylon (SkyAngle)</Name>
             <Density>0.018602086537432</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 inch Flat Elastic</Name>
             <Density>0.060870160920000006</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>3/8 tubular nylon (SkyAngle)</Name>
             <Density>2.9797705801314</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>30 Lb. Kevlar</Name>
             <Density>1.78E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300 lb. Kevlar</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300 lb. Kevlar (Apogee 29506)</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>300lb Kevlar (Apogee 29506)</Name>
             <Density>0.01807843779324</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>4000 lb. nylon</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/64 in. Round Elastic</Name>
             <Density>0.0024200000000000003</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/8 in. Tubular Nylon</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/8 in. Tubular Nylon (SkyAngle)</Name>
             <Density>0.022322459200000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>6000 lb. nylon</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>6oz &amp; 2oz FG &amp; Poster board</Name>
             <Density>798.85</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>7/16 in. Flat Braided Kevlar</Name>
             <Density>0.0502255332</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>70 Lb. Kevlar</Name>
             <Density>3.3E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>750 Lb. Kevlar</Name>
             <Density>0.0030135319920000002</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>9/16 in. Tubular Nylon</Name>
             <Density>0.0167418444</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Acrylic (Cast)</Name>
             <Density>1185.3662916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aircraft plywood (Birch)</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aircraft plywood (LOC)</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum</Name>
             <Density>2698.9</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum (Al)</Name>
             <Density>2698.9</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum 2024</Name>
             <Density>2780.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aluminum 7075</Name>
             <Density>2810.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Ash</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Basswood</Name>
             <Density>424.48928010000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Beech</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch Plywood (Revell)</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Blue Tube</Name>
             <Density>1237.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Blue Tube 2</Name>
             <Density>1250.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Brass</Name>
             <Density>8553.8594556</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Carbon Fiber</Name>
             <Density>1400.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cardboard</Name>
             <Density>688.7939262000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Carpet String</Name>
             <Density>3.2972000000000003E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Carpet String (Apogee 29500)</Name>
             <Density>3.2972000000000003E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cellulose Acetate Propionate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Chalk (Fine)</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Composite Fin Material</Name>
             <Density>634.3311506400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (cast)</Name>
             <Density>8682.0071628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (rolled)</Name>
             <Density>8906.2656504</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cork (Solid)</Name>
             <Density>240.27695100000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cottonwood</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Custom</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Dyna-Wind Tubing</Name>
             <Density>1210.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiber</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiberglass</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (Douglas)</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (White)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.062)</Name>
             <Density>3.137448001464</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 (PML 0.062)</Name>
             <Density>0.07059977558916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.093)</Name>
             <Density>5.022553313268</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.125)</Name>
             <Density>6.169435565904</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass</Name>
             <Density>2175.3073297200003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass (LOC)</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass Filament Wound</Name>
             <Density>1934.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Fiberglass Filament Wound Tube</Name>
             <Density>1820.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 Phenolic</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G12 Fiberglass</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Glassed Phenolic</Name>
             <Density>1900.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Gold (24 kt.)</Name>
             <Density>19286.229933600003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>Kevlar Thread (Apogee 29502)</Name>
             <Density>8.858E-5</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic</Name>
             <Density>943.4874942600001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic (Glassed)</Name>
             <Density>1153.329336</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (cast)</Name>
             <Density>11341.072087200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (rolled)</Name>
             <Density>11389.127477400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead Shot</Name>
             <Density>6727.75</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Leather</Name>
             <Density>945.0893406000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lexan</Name>
             <Density>1218.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lite Plywood</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Magna Phenolic</Name>
             <Density>1100.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mail Tube Paper</Name>
             <Density>800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Maple (Hard)</Name>
             <Density>632.7293043000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mat Board 4-Ply</Name>
             <Density>710.579</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mylar</Name>
             <Density>1309.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 200</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 400</Name>
             <Density>8800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 600</Name>
             <Density>8410.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 625</Name>
             <Density>8440.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel 718</Name>
             <Density>8230.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nickel C276</Name>
             <Density>8890.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nylon</Name>
             <Density>1140.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Brown)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Red)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (White)</Name>
             <Density>752.8677798000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>PVC</Name>
             <Density>1300.6992280800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>608.7016092000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper/2layers 8 oz.  glass</Name>
             <Density>1681.94</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Northern)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Western)</Name>
             <Density>432.4985118000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Plastic</Name>
             <Density>920.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polycarbonate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene</Name>
             <Density>920.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene LDPE</Name>
             <Density>924.2653381800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Polyethylene LDPE(0.025)</Name>
             <Density>0.023476339589772004</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Polyethylene LDPE(0.051)</Name>
             <Density>0.04695267917954401</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polystyrene PS</Name>
             <Density>1049.2093527000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Poplar (Yellow)</Name>
             <Density>480.55390200000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Quantum Tubing</Name>
             <Density>1100.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Rip stop nylon</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Rocketwood</Name>
             <Density>529.089846102</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Russian 1/8 in. Plywood</Name>
             <Density>685.1</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Silver</Name>
             <Density>10460.056600200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral/Glassine</Name>
             <Density>848.9785602000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral/Glassine-Thick</Name>
             <Density>768.886</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spruce</Name>
             <Density>448.51697520000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-4PH</Name>
             <Density>7600.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-5PH</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Stainless steel 17-7PH</Name>
             <Density>7800.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel 4130</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Steel 4340</Name>
             <Density>7850.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Sycamore</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Titanium</Name>
             <Density>4500.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Urethane</Name>
             <Density>847.0563445920002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Vulcanized Fiber</Name>
             <Density>1250.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>lite ply</Name>
             <Density>352.406186</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc b/swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc
index c54ccca16..7987eee0b 100644
--- a/swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc
@@ -3,7 +3,7 @@
     <Version>0.1</Version>
     <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Vulcanized Fiber</Name>
             <Density>1250.0</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc b/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
index 8b23edb6f..11877d3fd 100644
--- a/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
@@ -3,22 +3,22 @@
   <Version>0.1</Version>
   <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiber</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>lite ply</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc b/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
index 55ea9a827..6f782079e 100644
--- a/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
@@ -3,32 +3,32 @@
   <Version>0.1</Version>
   <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiber</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Light Ply</Name>
             <Density>0.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Paper</Name>
             <Density>90</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>671.1787601020637</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral-Wound Paper/Glassine</Name>
             <Density>1047.6648350683759</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc b/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
index 4b70f473d..ab5149e25 100644
--- a/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
@@ -3,27 +3,27 @@
   <Version>0.1</Version>
   <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cardboard</Name>
             <Density>688.7939262000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic</Name>
             <Density>958.7050344900001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polycarbonate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Rip stop nylon</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc b/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
index ff45db001..2080689cc 100644
--- a/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
@@ -3,312 +3,312 @@
   <Version>0.1</Version>
   <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 In. braided nylon</Name>
             <Density>0.00102</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 In. round elastic</Name>
             <Density>0.00183</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/32 In. kevlar</Name>
             <Density>6.590000000000001E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/4 In. flat elastic</Name>
             <Density>0.00402</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 In. flat elastic</Name>
             <Density>0.00205</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/8 In. flat rubber</Name>
             <Density>0.00231</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>3/8 inch Flat Elastic</Name>
             <Density>0.0038</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>30 Lb. kevlar</Name>
             <Density>1.78E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>5/64 In. round elastic</Name>
             <Density>0.0024200000000000003</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>70 Lb. kevlar</Name>
             <Density>3.3E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Acrylic (Cast)</Name>
             <Density>1185.3662916</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Aircraft plywood (Birch)</Name>
             <Density>724.9956534840001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Ash</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Basswood</Name>
             <Density>424.48928010000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Beech</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Birch</Name>
             <Density>680.7846945000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Brass</Name>
             <Density>8553.8594556</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cardboard</Name>
             <Density>688.7939262000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Chalk (Fine)</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (cast)</Name>
             <Density>8682.0071628</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Copper (rolled)</Name>
             <Density>8906.2656504</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cork (Solid)</Name>
             <Density>240.27695100000003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Cottonwood</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Epoxy</Name>
             <Density>1254.2456842200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiberglass</Name>
             <Density>128.147704</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (Douglas)</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fir (White)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.062)</Name>
             <Density>3.137448001464</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.093)</Name>
             <Density>5.022553313268</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>G10 (PML 0.125)</Name>
             <Density>6.169435565904</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 fiberglass</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>G10 phenolic</Name>
             <Density>1905.2360367960002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Gold (24 kt.)</Name>
             <Density>19286.229933600003</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Iron (cast</Name>
             <Density>7208.308530000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Iron (wrought)</Name>
             <Density>7768.954749</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Kraft phenolic</Name>
             <Density>958.7050344900001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (cast)</Name>
             <Density>11341.072087200002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lead (rolled)</Name>
             <Density>11389.127477400001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Leather</Name>
             <Density>945.0893406000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Lexan</Name>
             <Density>1218.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Maple (Hard)</Name>
             <Density>632.7293043000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Mylar</Name>
             <Density>1309.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Nylon</Name>
             <Density>1140.0</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Brown)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (Red)</Name>
             <Density>720.830853</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Oak (White)</Name>
             <Density>752.8677798000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>PVC</Name>
             <Density>1300.6992280800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Northern)</Name>
             <Density>400.461585</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Pine (White Western)</Name>
             <Density>432.4985118000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polycarbonate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene LDPE</Name>
             <Density>924.2653381800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Polyethylene LDPE(0.051)</Name>
             <Density>0.04695267917954401</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polystyrene PS</Name>
             <Density>1049.2093527000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Poplar (Yellow)</Name>
             <Density>480.55390200000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Rip stop nylon</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Rocketwood</Name>
             <Density>529.089846102</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Silver</Name>
             <Density>10460.056600200001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spruce</Name>
             <Density>448.51697520000005</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Sycamore</Name>
             <Density>560.6462190000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Urethane</Name>
             <Density>847.0563445920002</Density>
             <Type>BULK</Type>
diff --git a/swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc b/swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc
index cdeee9b6e..8efb517b8 100644
--- a/swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc
@@ -3,62 +3,62 @@
     <Version>0.1</Version>
     <Legacy />
     <Materials>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>1/16 In. braided nylon</Name>
             <Density>0.00102</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m">
+        <Material UnitsOfMeasure="kg/m">
             <Name>30 Lb. kevlar</Name>
             <Density>1.78E-4</Density>
             <Type>LINE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Balsa</Name>
             <Density>128.1477072</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Fiber</Name>
             <Density>656.7569994</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Paper</Name>
             <Density>1121.2924380000002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Paper(0.051)</Name>
             <Density>0.05696165585040001</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polycarbonate</Name>
             <Density>1199.7829086600002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Polyethylene LDPE</Name>
             <Density>924.2653381800002</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Polyethylene LDPE(0.025)</Name>
             <Density>0.023476339589772004</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/m2">
+        <Material UnitsOfMeasure="kg/m2">
             <Name>Rip stop nylon</Name>
             <Density>0.06684999999999999</Density>
             <Type>SURFACE</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>Spiral/Glassine</Name>
             <Density>848.9785602000001</Density>
             <Type>BULK</Type>
         </Material>
-        <Material UnitsOfMeasure="g/cm3">
+        <Material UnitsOfMeasure="kg/m3">
             <Name>lite ply</Name>
             <Density>352.40619480000004</Density>
             <Type>BULK</Type>

From 602d9436e247df4e0e3526c3994154bd65605ecf Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 11 Jul 2023 20:56:59 +0200
Subject: [PATCH 14/14] [#2256] Use fixed width for warnings panel

---
 .../sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index a1290ea7f..12cd39195 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -145,14 +145,14 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 					worstToggle.setSelected(false);
 			}
 		});
-		panel.add(worstToggle, "");
+		panel.add(worstToggle);
 
 
 		warningList = new JList<>();
 		JScrollPane scrollPane = new JScrollPane(warningList);
 		////Warnings:
 		scrollPane.setBorder(BorderFactory.createTitledBorder(trans.get("componentanalysisdlg.TitledBorder.warnings")));
-		panel.add(scrollPane, "gap paragraph, spany 4, wmin 300lp, grow, height :100lp:, wrap");
+		panel.add(scrollPane, "gap paragraph, spany 4, w 300lp, grow, height :100lp:, wrap");
 
 		////Angle of attack:
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")), "width 120lp!");