Conflicts: core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java