Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -37,6 +37,9 @@
 /core/resources-src/pix/sormus.xcf.gz
 /core/resources-src/pix/splashscreen-sormus.png
 /core/resources-src/pix/splashscreen-sormus.xcf.gz
+<<<<<<< HEAD
 
 /*/bin/
 /android-libraries/*/bin/
+=======
+>>>>>>> Convert svn:ignore properties to .gitignore.

core/.classpath

@@ -10,12 +10,6 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib-extra/RXTXcomm.jar"/>
-	<classpathentry kind="lib" path="lib/jfreechart-1.0.13.jar" sourcepath="/home/sampo/Projects/lib/jfreechart-1.0.13/source"/>
-	<classpathentry kind="lib" path="lib/jcommon-1.0.16.jar">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="org/jfree/util/Log"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="lib" path="lib/miglayout15-swing.jar"/>
 	<classpathentry kind="lib" path="lib/iText-5.0.2.jar"/>
 	<classpathentry kind="lib" path="lib-test/hamcrest-core-1.3.0RC1.jar"/>
@@ -26,12 +20,16 @@
 	<classpathentry kind="lib" path="lib-test/uispec4j-2.3-jdk16.jar"/>
 	<classpathentry kind="lib" path="resources"/>
 	<classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
-	<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
-	<classpathentry kind="lib" path="lib/jogl/jogl.all.jar"/>
 	<classpathentry kind="lib" path="lib/OrangeExtensions-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/guice-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/guice-multibindings-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/javax.inject.jar"/>
 	<classpathentry kind="lib" path="lib/aopalliance.jar"/>
+	<classpathentry kind="lib" path="lib/jcommon-1.0.17.jar"/>
+	<classpathentry kind="lib" path="lib/jfreechart-1.0.14.jar" sourcepath="reference/jfreechart-1.0.14-sources.jar"/>
+	<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar" sourcepath="reference/gluegen-v2.0-rc11-sources.jar"/>
+	<classpathentry kind="lib" path="lib/jogl/jogl-all.jar" sourcepath="reference/jogl-v2.0-rc11-sources.jar"/>
+	<classpathentry kind="lib" path="lib-test/test-plugin.jar"/>
+	<classpathentry kind="lib" path="lib/annotation-detector-3.0.2-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/.gitignore

@@ -0,0 +1 @@
+/bin

core/.settings/org.eclipse.jdt.core.prefs

@@ -71,3 +71,283 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=200
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

core/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,56 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_OpenRocket style
+formatter_settings_version=12
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

core/ChangeLog

@@ -1,3 +1,36 @@
+
+2013-04-17 Bill Kuker and Kevin Ruland
+    * Added support for decals on rockets.  Added two new 3d views - 3d finished and 3d unfinshed.  Added support to export and
+      apply decals (images) to rocket components.  Added ability to launch external graphics editor to edit decals and monitor
+      file for writes to update the rocket view.
+
+2013-04-17 Kevin Ruland
+    * Added simulation of tumble recovery based on experimentation done by Sampo Niskane.  This is particularly useful
+      for low power staged flights.
+
+2013-04-17 Kevin Ruland
+    * Extended "motor configuration" concept to cover more properties.  The concept was renamed "Flight Configuration" and
+      allows the user to override stage separation, recovery deployment, and motor ignition per flight configuration.
+      These configurations are stored in the ork file with each component.  If no override is specified then the user specified
+      default is used (set in the component edit dialog).  The flight configuration dialog was reworked to make it more
+      usable.  The user selects the configuration in a drop down with buttons for "add", "delete" and "rename".  After selecting
+      the configuration, the tabbed area below allows the user to change the configuration for this simulation.
+      
+2013-04-17 Kevin Ruland
+    * Allow simulation of stages without a motor.  Users in the past have attempted to simulate separate recovery of payload
+      and booster by tricking OpenRocket using a dummy motor with trivial thrust curve.  Now the user does not need to do this.
+      There is an example of this provided in TARC Payloader.ork and Boosted Dart.ork
+      
+2013-04-17 Kevin Ruland
+    * Simulate recovery of boosters.  The simulation engine will create new FlightDataBranches for each stage after
+      separation.  The data for the boosters begins at t=separation.  The simulation plot allows the user to select
+      which stage's data to show (or all).
+
+2013-04-17 Kevin Ruland
+    * Modified the zoom and pan controls in the simulation plot.  Added zoom in, out, and reset buttons.  Added
+      scroll with mouse wheel.  If the alt key is used with either of these, only the domain is zoomed.  Richard
+      contributed a more logical mouse controlled zoom - right click and drag will zoom (either domain, range or both).
+
 2012-09-28 Sampo Niskane
 	* Released version 12.09.1
 

core/LICENSE.TXT

@@ -1,6 +1,6 @@
 OpenRocket - A model rocket simulator
 
-Copyright (C) 2007-2012 Sampo Niskanen and others
+Copyright (C) 2007-2013 Sampo Niskanen and others
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

core/README.TXT

@@ -2,7 +2,7 @@
 OpenRocket - an Open Source model rocket simulator
 --------------------------------------------------
 
-Copyright (C) 2007-2012  Sampo Niskanen and others
+Copyright (C) 2007-2013  Sampo Niskanen and others
 
 
 For license information see the file LICENSE.TXT.

core/build.xml

@@ -70,7 +70,7 @@
 	<target name="build">
 		<mkdir dir="${classes.dir}"/>
 		<echo level="info">Compiling main classes</echo>
-		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false"/>
+		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.6" target="1.6"/>
 	</target>
 	
 	<!-- Executible Eclipse-Jar-In-Jar style JAR -->
@@ -80,7 +80,7 @@
 			<manifest>
 				<attribute name="Main-Class" value="${main-class}" />
 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png" />
-				<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl.all.jar" />
+				<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl-all.jar" />
 			</manifest>
 
 			<!-- Include, in the root of the JAR, the resources needed by OR -->
@@ -96,11 +96,12 @@
 			<zipfileset src="${lib.dir}/guice-multibindings-3.0.jar"/>
 			<zipfileset src="${lib.dir}/iText-5.0.2.jar"/>
 			<zipfileset src="${lib.dir}/javax.inject.jar"/>
-			<zipfileset src="${lib.dir}/jcommon-1.0.16.jar"/>
-			<zipfileset src="${lib.dir}/jfreechart-1.0.13.jar"/>
+			<zipfileset src="${lib.dir}/jcommon-1.0.17.jar"/>
+			<zipfileset src="${lib.dir}/jfreechart-1.0.14.jar"/>
 			<zipfileset src="${lib.dir}/miglayout15-swing.jar"/>
 			<zipfileset src="${lib.dir}/opencsv-2.3.jar"/>
 			<zipfileset src="${lib.dir}/OrangeExtensions-1.2.jar"/>
+			<zipfileset src="${lib.dir}/annotation-detector-3.0.2-SNAPSHOT.jar"/>
 			
 			
 			<!-- JOGL libraries need to be jar-in-jar -->
@@ -217,7 +218,7 @@
 	<!-- CHECK TODOs -->
 	<target name="todo" depends="checktodo"/>
 	<target name="checktodo">
-		<tempfile property="todo.file" prefix="${tmp.dir}/checktodo-"/>
+		<tempfile property="todo.file" prefix="checktodo-" destDir="${tmp.dir}"/>
 		<echo>Checking project for FIXMEs.</echo>
 		<concat destfile="${todo.file}">
 			<fileset dir="${src.dir}">
@@ -243,7 +244,7 @@ ${criticaltodos}</fail>
 	<!-- CHECK ASCII -->
 	<target name="ascii" depends="checkascii"/>
 	<target name="checkascii">
-		<tempfile property="ascii.file" prefix="${tmp.dir}/checkascii-"/>
+		<tempfile property="ascii.file" prefix="checkascii-" destDir="${tmp.dir}"/>
 		<echo>Checking project for non-ASCII characters.</echo>
 		<concat destfile="${ascii.file}">
 			<fileset dir="${src.dir}">

core/doc/properties.txt

@@ -12,6 +12,13 @@ openrocket.locale
 openrocket.3d.disable
 	Disables all OpenGL calls if set.
 
+openrocket.plugins
+	List of extra plugin JARs to load.  By default the directory Plugins/ under the
+	application directory is scanned and all .JAR files are used.  Multiple plugins
+	are separated using the platform-specific path separator (; or :).
+
+
+
 Logging options
 ---------------
 
@@ -30,7 +37,6 @@ openrocket.log.tracelevel
 
 
 
-
 Debugging options
 -----------------
 

core/fileformat.txt

@@ -43,3 +43,7 @@ The following file format versions exist:
       Added lowerstageseparation as recovery device deployment event.
       Added <datatypes> section for supporting datatypes other than
       internal ones. Currently only supports datatypes from custom expressions.
+      
+1.6:  Introduced with OpenRocket 13.04.  Added component Appearances (decals & paint)
+      Added configurable parameters to recovery devices, motor ignition and separation.
+      

core/resources-src/datafiles/thrustcurves/thrustcurve.org/00INDEX.txt

@@ -1,5 +1,6 @@
+Downloaded 2013/03/13
 Rocket motor simulation data downloaded from ThrustCurve.org.
-This ZIP file contains 1556 simulator data files.
+This ZIP file contains 1581 simulator data files.
 For more info, please see http://www.thrustcurve.org/
 
 AMW_I195.eng
@@ -1864,6 +1865,13 @@ AeroTech_H128.rse
     Data Source:  user
     Contributor:  John Coker
 
+AeroTech_H135.eng
+    Manufacturer: AeroTech
+    Designation:  H135W
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Robert Belknap
+
 AeroTech_H148.eng
     Manufacturer: AeroTech
     Designation:  H148R
@@ -3434,12 +3442,19 @@ AeroTech_M1600.rse
 
 AeroTech_M1780.eng
     Manufacturer: AeroTech
-    Designation:  M1780T
+    Designation:  M1780NT
     Data Format:  RASP
     Data Source:  mfr
     Contributor:  Mark Koelsch
 
 AeroTech_M1780_1.eng
+    Manufacturer: AeroTech
+    Designation:  M1780T
+    Data Format:  RASP
+    Data Source:  mfr
+    Contributor:  Mark Koelsch
+
+AeroTech_M1780_2.eng
     Manufacturer: AeroTech
     Designation:  M1780T
     Data Format:  RASP
@@ -3551,6 +3566,13 @@ AeroTech_M650.rse
     Data Source:  user
     Contributor:  John Coker
 
+AeroTech_M685.eng
+    Manufacturer: AeroTech
+    Designation:  M685W-PS
+    Data Format:  RASP
+    Data Source:  mfr
+    Contributor:  Mark Koelsch
+
 AeroTech_M750.eng
     Manufacturer: AeroTech
     Designation:  M750W
@@ -3796,6 +3818,13 @@ Apogee_F10.rse
     Data Source:  user
     Contributor:  John Coker
 
+Cesaroni_E22.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  E22-SS-13A
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_E22.rse
     Manufacturer: Cesaroni Technology
     Designation:  E22-SS-13A
@@ -3803,6 +3832,13 @@ Cesaroni_E22.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_E31.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  E31-WT-15A
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_E31.rse
     Manufacturer: Cesaroni Technology
     Designation:  E31-WT-15A
@@ -3908,6 +3944,13 @@ Cesaroni_F36_1.rse
     Data Source:  cert
     Contributor:  Len Bryan
 
+Cesaroni_F50.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  F50-SK-13A
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_F50.rse
     Manufacturer: Cesaroni Technology
     Designation:  F50-SK-13A
@@ -3915,6 +3958,13 @@ Cesaroni_F50.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_F51.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  F51-CL-12A
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_F51.rse
     Manufacturer: Cesaroni Technology
     Designation:  F51-CL-12A
@@ -4909,6 +4959,20 @@ Cesaroni_I120.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_I125.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  567-I125-WH/LB
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
+Cesaroni_I125.rse
+    Manufacturer: Cesaroni Technology
+    Designation:  567-I125-WH/LB
+    Data Format:  RockSim
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_I140.eng
     Manufacturer: Cesaroni Technology
     Designation:  396-I140-14A
@@ -5728,6 +5792,13 @@ Cesaroni_J449.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_J453.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  J453-WH-16A
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_J453.rse
     Manufacturer: Cesaroni Technology
     Designation:  J453-WH-16A
@@ -5938,6 +6009,13 @@ Cesaroni_K1720.rse
     Data Source:  user
     Contributor:  John Coker
 
+Cesaroni_K2000.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  K2000-VM-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_K2000.rse
     Manufacturer: Cesaroni Technology
     Designation:  K2000-VM-P
@@ -6234,10 +6312,10 @@ Cesaroni_K635.rse
 
 Cesaroni_K650.eng
     Manufacturer: Cesaroni Technology
-    Designation:  1750 K650SS-16A
+    Designation:  K650-PK-21A
     Data Format:  RASP
-    Data Source:  mfr
-    Contributor:  Casey Hatch
+    Data Source:  cert
+    Contributor:  Andre Choquette
 
 Cesaroni_K650.rse
     Manufacturer: Cesaroni Technology
@@ -6246,6 +6324,13 @@ Cesaroni_K650.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_K650_1.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  1750 K650SS-16A
+    Data Format:  RASP
+    Data Source:  mfr
+    Contributor:  Casey Hatch
+
 Cesaroni_K650_1.rse
     Manufacturer: Cesaroni Technology
     Designation:  1750 K650SS-16A
@@ -6267,6 +6352,13 @@ Cesaroni_K660.rse
     Data Source:  user
     Contributor:  John Coker
 
+Cesaroni_K661.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  K661-BS-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_K661.rse
     Manufacturer: Cesaroni Technology
     Designation:  K661-BS-P
@@ -6323,6 +6415,13 @@ Cesaroni_K710.rse
     Data Source:  cert
     Contributor:  Len Bryan
 
+Cesaroni_K735.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  K735-SK-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_K735.rse
     Manufacturer: Cesaroni Technology
     Designation:  K735-SK-P
@@ -6428,6 +6527,13 @@ Cesaroni_L1030.rse
     Data Source:  mfr
     Contributor:  Thomas Raithby
 
+Cesaroni_L1050.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L1050-BS-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L1050.rse
     Manufacturer: Cesaroni Technology
     Designation:  L1050-BS-P
@@ -6498,6 +6604,13 @@ Cesaroni_L1290.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_L1350.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L1350-CS-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L1350.rse
     Manufacturer: Cesaroni Technology
     Designation:  L1350-CS-P
@@ -6582,6 +6695,13 @@ Cesaroni_L3150.rse
     Data Source:  mfr
     Contributor:  Thomas Raithby
 
+Cesaroni_L3200.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L3200-VM-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L3200.rse
     Manufacturer: Cesaroni Technology
     Designation:  L3200-VM-P
@@ -6631,6 +6751,13 @@ Cesaroni_L640.rse
     Data Source:  cert
     Contributor:  Len Bryan
 
+Cesaroni_L645.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L645-GR-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L645.rse
     Manufacturer: Cesaroni Technology
     Designation:  L645-GR-P
@@ -6673,6 +6800,13 @@ Cesaroni_L800_1.eng
     Data Source:  mfr
     Contributor:  Casey Hatch
 
+Cesaroni_L805.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L805-WH-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L805.rse
     Manufacturer: Cesaroni Technology
     Designation:  L805-WH-P
@@ -6722,6 +6856,13 @@ Cesaroni_L890.rse
     Data Source:  user
     Contributor:  John Coker
 
+Cesaroni_L910.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  L910-CS-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_L910.rse
     Manufacturer: Cesaroni Technology
     Designation:  L910-CS-P
@@ -7261,6 +7402,20 @@ Cesaroni_M520.rse
     Data Source:  user
     Contributor:  John Coker
 
+Cesaroni_M6400.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  8634-M6400-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
+Cesaroni_M6400.rse
+    Manufacturer: Cesaroni Technology
+    Designation:  8634-M6400-P
+    Data Format:  RockSim
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_M795.eng
     Manufacturer: Cesaroni Technology
     Designation:  10133 M795-P
@@ -7513,6 +7668,13 @@ Cesaroni_N5800.rse
     Data Source:  cert
     Contributor:  Andre Choquette
 
+Cesaroni_O25000.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  30795-O25000-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_O25000.rse
     Manufacturer: Cesaroni Technology
     Designation:  30795-O25000-P
@@ -7520,6 +7682,20 @@ Cesaroni_O25000.rse
     Data Source:  user
     Contributor:  Andre Choquette
 
+Cesaroni_O3400.eng
+    Manufacturer: Cesaroni Technology
+    Designation:  21062-O3400-P
+    Data Format:  RASP
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
+Cesaroni_O3400.rse
+    Manufacturer: Cesaroni Technology
+    Designation:  21062-O3400-P
+    Data Format:  RockSim
+    Data Source:  cert
+    Contributor:  Andre Choquette
+
 Cesaroni_O3700.eng
     Manufacturer: Cesaroni Technology
     Designation:  29920-O3700-P

core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H135.eng

@@ -0,0 +1,22 @@
+; AeroTech Pro-SU 29mm H135 14sec adjustable delay.
+; From Tripoli Data Sheet updated 2013/02/10
+; Created by Robert Belknap 2013/03/04
+H135W 29 216 6-8-10-12-14 0.082 0.212 AT
+   0.014 159.806
+   0.045 110.931
+   0.104 144.43
+   0.131 135.643
+   0.252 154.315
+   0.293 130.701
+   0.387 149.921
+   1.005 140.037
+   1.261 119.168
+   1.297 142.233
+   1.324 109.833
+   1.387 120.267
+   1.518 110.382
+   1.595 80.727
+   1.685 60.408
+   1.797 33.499
+   1.896 14.278
+   2.072 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_2.eng

@@ -0,0 +1,23 @@
+M1780 75 665 P 2.56 4.715 AT
+   0.028 2204.193
+   0.118 2566.025
+   0.173 2566.025
+   0.341 2214.151
+   0.44 2144.44
+   0.636 2114.564
+   1.34 2134.482
+   1.395 2204.193
+   1.648 2121.203
+   1.841 2041.534
+   1.874 1895.473
+   2.127 1643.186
+   2.353 1517.042
+   2.584 1460.61
+   2.672 1347.744
+   2.763 1068.901
+   2.829 723.666
+   2.939 438.183
+   2.999 292.122
+   3.101 172.617
+   3.272 36.515
+   3.5 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M685.eng

@@ -0,0 +1,24 @@
+; M685W-PS Moonburner
+M685W-PS 75 801 P 4.32 7.008 AT
+   0.083 1333.469
+   0.13 1368.376
+   0.249 1361.395
+   0.308 1380.012
+   0.403 1359.068
+   0.675 1184.53
+   1.018 1072.826
+   1.456 996.029
+   1.977 958.794
+   2.995 914.578
+   3.99 856.399
+   4.985 781.929
+   5.494 730.732
+   5.991 679.534
+   7.258 542.231
+   7.862 463.107
+   8.015 456.125
+   8.998 330.458
+   9.993 207.118
+   10.514 137.303
+   11.496 34.908
+   11.994 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E22.eng

@@ -0,0 +1,18 @@
+;Smoky Sam 24mm 1G
+;24-E22-SS-13A
+24-E22-SS-13A 24 69 13-10-8-6-4 0.0203 0.0565 CTI 
+0.008 18.292
+0.026 30
+0.038 30.792
+0.067 18.708
+0.101 21.875
+0.33 26.083
+0.528 28.042
+0.716 27.875
+0.841 23.542
+0.912 17.833
+0.987 7
+1.016 3.333
+1.065 1.083
+1.087 0
+;

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E31.eng

@@ -0,0 +1,16 @@
+;White 24mm 1G
+;26-E31-WH-15A
+26-E31-WH-15A 24 69 15-12-10-8-6 0.0169 0.052 CTI 
+0.02 43.824
+0.027 39.964
+0.049 26.781
+0.113 32.601
+0.193 34.739
+0.282 35.808
+0.5 34.442
+0.727 29.276
+0.771 22.743
+0.807 9.561
+0.84 3.563
+0.87 0
+;

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F50.eng

@@ -0,0 +1,15 @@
+; Skidmark 24mm 3G
+; 60-F50-SK-13A
+60-F50-SK-13A 24 133 13-10-8-6-4 0.0382 0.0939 CTI
+   0.015 64.982
+   0.022 69.516
+   0.064 55.537
+   0.118 62.81
+   0.342 62.149
+   0.536 59.41
+   0.743 53.837
+   0.884 46.942
+   0.976 40.047
+   1.096 12.562
+   1.246 2.078
+   1.298 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F51.eng

@@ -0,0 +1,12 @@
+; Classic 24mm 3G
+; 75-F51-CL-12A
+75-F51-CL-12A 24 133 12-9-7-5 0.040 0.095 CTI
+   0.02 75.924
+   0.031 84.148
+   0.062 70.441
+   0.117 73.659
+   1.211 38.737
+   1.376 14.779
+   1.456 7.271
+   1.532 3.337
+   1.577 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I125.eng

@@ -0,0 +1,17 @@
+; CTI Pro-38 5G
+; 567 I125 WH LB 10A
+567-I125-WH-LB-10 38 367 10-7-5-3 0.3556 0.647 CTI
+   0.046 174.74
+   0.089 267.82
+   0.135 235.986
+   0.258 193.772
+   0.35 182.007
+   0.553 174.74
+   1.124 176.125
+   1.502 173.01
+   1.806 162.284
+   2.439 135.986
+   3.372 84.775
+   4.005 36.678
+   4.395 14.879
+   4.585 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I125.rse

@@ -0,0 +1,31 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="567-I125-WH-LB-10" Type="reloadable" dia="38." len="367."
+initWt="647." propWt="355.6" delays="10,7,5,3" auto-calc-mass="1"
+auto-calc-cg="1" avgThrust="124.202" peakThrust="267.82" throatDia="0."
+exitDia="0." Itot="569.465" burn-time="4.58" massFrac="54.96" Isp="163.3"
+tDiv="10" tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10"
+mStep="-1." mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>CTI Pro-38 5G
+567 I125 WH LB 10A
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="355.6" cg="183.5"/>
+      <eng-data  t="0.046" f="174.74" m="353.09" cg="183.5"/>
+      <eng-data  t="0.089" f="267.82" m="347.149" cg="183.5"/>
+      <eng-data  t="0.135" f="235.986" m="339.913" cg="183.5"/>
+      <eng-data  t="0.258" f="193.772" m="323.409" cg="183.5"/>
+      <eng-data  t="0.35" f="182.007" m="312.615" cg="183.5"/>
+      <eng-data  t="0.553" f="174.74" m="290.004" cg="183.5"/>
+      <eng-data  t="1.124" f="176.125" m="227.452" cg="183.5"/>
+      <eng-data  t="1.502" f="173.01" m="186.247" cg="183.5"/>
+      <eng-data  t="1.806" f="162.284" m="154.422" cg="183.5"/>
+      <eng-data  t="2.439" f="135.986" m="95.4728" cg="183.5"/>
+      <eng-data  t="3.372" f="84.775" m="31.1642" cg="183.5"/>
+      <eng-data  t="4.005" f="36.678" m="7.16059" cg="183.5"/>
+      <eng-data  t="4.395" f="14.879" m="0.882657" cg="183.5"/>
+      <eng-data  t="4.585" f="0." m="0." cg="183.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J453.eng

@@ -0,0 +1,14 @@
+; White 38mm 6GXL
+; 1013-J453-WH-16A
+1013-J453-WH-16A 38 500 16-13-11-9-7 0.6132 0.9643 CTI
+   0.018 663.789
+   0.04 725.18
+   0.105 630.216
+   0.23 578.417
+   0.451 543.885
+   1.454 535.252
+   1.797 291.607
+   1.91 188.969
+   2.088 128.537
+   2.276 19.185
+   2.364 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2000.eng

@@ -0,0 +1,16 @@
+; VMax 75mm 2G
+; 2330-K2000-VM-P
+2330-K2000-VM-P 75 350 P 1.1642 2.4645 CTI
+   0.01 1979.532
+   0.029 1634.503
+   0.161 1947.368
+   0.321 2190.058
+   0.457 2397.661
+   0.548 2473.684
+   0.678 2383.041
+   0.768 2263.158
+   0.977 1923.977
+   1.027 1883.041
+   1.104 859.649
+   1.149 87.719
+   1.191 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650.eng

@@ -1,17 +1,12 @@
+;Pink 54mm 5G
+;1997-K650-PK-21
+1997-K650-PK-21 54 488 21-19-17-15-13-11 1.0651 1.71 CTI 
+0.011 1353.5
+0.028 793.832
+0.186 815.421
+2.578 601.186
+2.689 479.953
+2.855 189.324
+3.086 43.179
+3.451 0
 ;
-;
-K650SS  54.0 488.00 6-16 1.28100 1.98990 CTI
-   0.04     664.52 
-   0.12     645.90 
-   0.31     642.24 
-   0.60     664.78 
-   0.91     684.59 
-   1.22     712.82 
-   1.50     723.41 
-   1.80     728.70 
-   2.10     664.52 
-   2.40     614.68 
-   2.51     680.53 
-   2.55     534.62 
-   2.61     268.19 
-   2.66       0.00 

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650_1.eng

@@ -0,0 +1,17 @@
+;
+;
+K650SS  54.0 488.00 6-16 1.28100 1.98990 CTI
+   0.04     664.52 
+   0.12     645.90 
+   0.31     642.24 
+   0.60     664.78 
+   0.91     684.59 
+   1.22     712.82 
+   1.50     723.41 
+   1.80     728.70 
+   2.10     664.52 
+   2.40     614.68 
+   2.51     680.53 
+   2.55     534.62 
+   2.61     268.19 
+   2.66       0.00 

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K661.eng

@@ -0,0 +1,19 @@
+; Blue Streak 75mm 2G
+; 2430-K661-BS-P
+2430-K661-BS-P 75 350 P 1.2625 2.5278 CTI
+   0.041 588.591
+   0.073 659.371
+   0.122 635.157
+   0.225 634.226
+   0.679 713.388
+   1.039 751.572
+   1.241 758.091
+   1.832 727.357
+   2.298 687.311
+   2.729 667.753
+   3.195 645.402
+   3.367 670.547
+   3.584 182.538
+   3.672 55.879
+   3.72 18.626
+   3.798 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K735.eng

@@ -0,0 +1,17 @@
+; Skidmark 75mm 2G
+; 1955-K735-SK-P
+1955-K735-SK-P 75 350 P 1.2221 2.5088 CTI
+   0.053 683.157
+   0.142 593.64
+   0.408 697.291
+   0.893 848.057
+   1.109 886.926
+   1.24 882.214
+   1.362 889.282
+   2.0 783.274
+   2.346 706.714
+   2.439 648.999
+   2.612 123.675
+   2.676 36.514
+   2.754 12.956
+   2.831 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1050.eng

@@ -0,0 +1,18 @@
+; Blue Streak 75mm 3G
+; 3727-L1050-BS-P
+3727-L1050-BS-P 75 486 P 1.8634 3.4477 CTI
+   0.035 721.412
+   0.081 1110.118
+   0.131 1057.412
+   0.249 1100.235
+   0.913 1194.118
+   1.125 1207.294
+   2.271 1100.235
+   2.797 1055.765
+   3.076 1042.588
+   3.122 996.471
+   3.23 807.059
+   3.452 289.882
+   3.544 123.529
+   3.685 36.235
+   3.731 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1350.eng

@@ -0,0 +1,18 @@
+; C-Star 75mm 3G
+; 4263-L1350-CS-P
+4263-L1350-CS-P 75 486 P 2.0245 3.5707 CTI
+   0.016 1421.724
+   0.034 1345.218
+   0.049 1502.479
+   0.081 1415.348
+   0.21 1432.349
+   0.453 1432.349
+   0.809 1462.102
+   1.07 1534.357
+   1.28 1540.732
+   2.661 1283.589
+   2.843 1277.214
+   2.932 1115.702
+   3.037 488.784
+   3.163 82.881
+   3.284 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L3200.eng

@@ -0,0 +1,16 @@
+; VMax 75mm 3G
+; 3300-L3200-VM-P
+3300-L3200-VM-P 75 486 P 1.6584 3.2637 CTI
+   0.008 3315.23
+   0.024 2672.963
+   0.108 2975.207
+   0.415 3669.421
+   0.524 3711.924
+   0.644 3669.421
+   0.819 3225.502
+   0.911 3022.432
+   0.937 3050.767
+   0.957 2899.646
+   1.022 288.076
+   1.039 51.948
+   1.055 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L645.eng

@@ -0,0 +1,15 @@
+; Green 75mm 3G
+; 3419-L645-GR-P
+3419-L645-GR-P 75 486 P 2.1441 3.7518 CTI
+   0.05 511.243
+   0.12 647.574
+   0.256 689.231
+   0.425 684.497
+   1.554 736.568
+   2.043 764.97
+   3.075 687.337
+   4.557 601.183
+   4.756 550.059
+   4.985 412.781
+   5.281 69.112
+   5.39 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L805.eng

@@ -0,0 +1,14 @@
+;White 54mm 6GXL
+;2833-L805-WH-P
+2833-L805-WH-P 54 649 0 1.6752 2.5025 CTI 
+0.012 1618.1
+0.037 1171.8
+0.173 1027.97
+0.388 994.125
+0.626 985.664
+2.318 886.251
+3.054 448.414
+3.464 126.91
+3.608 40.188
+3.827 0
+;

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L910.eng

@@ -0,0 +1,17 @@
+;C-Star 75mm 2G
+;2856-L910-CS-P
+2856-L910-CS-P 75 350 0 1.3643 2.6158 CTI 
+0.034 858.741
+0.056 921.678
+0.305 952.448
+0.718 983.217
+1.221 1047.55
+1.642 1005.59
+1.842 973.427
+2.951 773.427
+3.035 584.615
+3.108 169.231
+3.152 72.727
+3.182 27.972
+3.262 0
+;

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M6400.eng

@@ -0,0 +1,15 @@
+; CTI Pro-98 4G
+; 8634 M6400-VM P
+8634-M6400-VM-P 98 702 P 4.308 7.9190000000000005 CTI
+   0.011 6079.636
+   0.135 6598.407
+   0.354 7080.774
+   0.503 7244.596
+   0.713 7162.685
+   0.954 6707.622
+   1.183 5688.282
+   1.233 5460.751
+   1.26 4914.676
+   1.288 3394.767
+   1.331 800.91
+   1.383 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M6400.rse

@@ -0,0 +1,29 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="8634-M6400-VM-P" Type="reloadable" dia="98." len="702."
+initWt="7919." propWt="4308." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="6243.1" peakThrust="7244.6" throatDia="0." exitDia="0." Itot="8634.21"
+burn-time="1.38" massFrac="54.4" Isp="204.37" tDiv="10" tStep="-1." tFix="1"
+FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1." mFix="1" cgDiv="10"
+cgStep="-1." cgFix="1">
+    <comments>CTI Pro-98 4G
+8634 M6400-VM P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="4308." cg="351."/>
+      <eng-data  t="0.011" f="6079.64" m="4291.32" cg="351."/>
+      <eng-data  t="0.135" f="6598.41" m="3899.13" cg="351."/>
+      <eng-data  t="0.354" f="7080.77" m="3151.77" cg="351."/>
+      <eng-data  t="0.503" f="7244.6" m="2619.28" cg="351."/>
+      <eng-data  t="0.713" f="7162.69" m="1864.49" cg="351."/>
+      <eng-data  t="0.954" f="6707.62" m="1030.57" cg="351."/>
+      <eng-data  t="1.183" f="5688.28" m="322.397" cg="351."/>
+      <eng-data  t="1.233" f="5460.75" m="183.328" cg="351."/>
+      <eng-data  t="1.26" f="4914.68" m="113.442" cg="351."/>
+      <eng-data  t="1.288" f="3394.77" m="55.3983" cg="351."/>
+      <eng-data  t="1.331" f="800.91" m="10.3899" cg="351."/>
+      <eng-data  t="1.383" f="0." m="0." cg="351."/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O25000.eng

@@ -0,0 +1,14 @@
+; CTI 30,795-O25,000-VM-P
+; Single-Use
+O25,000-VM-P 132 1407 P 14.705 23.558 CTI
+   0.0080 21113.445
+   0.022 24705.882
+   0.042 26281.513
+   0.067 24390.756
+   0.201 24044.118
+   0.56 25052.521
+   0.927 24075.63
+   1.202 22815.126
+   1.25 23602.941
+   1.297 4852.941
+   1.32 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3400.eng

@@ -0,0 +1,18 @@
+; CTI Pro-98 6GXL
+; 21062 O3400-IM P
+21062-O3400-IM-P 98 1239 P 11.272 16.842 CTI
+   0.04 3959.811
+   0.052 4432.624
+   0.101 4515.366
+   0.19 4420.804
+   0.38 4391.253
+   0.965 4444.444
+   2.176 4698.582
+   2.887 4592.199
+   3.658 4225.768
+   4.17 2854.61
+   4.493 2559.102
+   4.881 1619.385
+   5.483 868.794
+   6.137 248.227
+   6.322 0.0

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3400.rse

@@ -0,0 +1,32 @@
+<engine-database>
+  <engine-list>
+    <engine  mfg="CTI" code="21062-O3400-IM-P" Type="reloadable" dia="98." len="1239."
+initWt="16842." propWt="11272." delays="0" auto-calc-mass="1" auto-calc-cg="1"
+avgThrust="3328.22" peakThrust="4698.58" throatDia="0." exitDia="0."
+Itot="21041." burn-time="6.32" massFrac="66.93" Isp="190.35" tDiv="10"
+tStep="-1." tFix="1" FDiv="10" FStep="-1." FFix="1" mDiv="10" mStep="-1."
+mFix="1" cgDiv="10" cgStep="-1." cgFix="1">
+    <comments>CTI Pro-98 6GXL
+21062 O3400-IM P
+</comments>
+    <data>
+      <eng-data  t="0." f="0." m="11272." cg="619.5"/>
+      <eng-data  t="0.04" f="3959.81" m="11229.6" cg="619.5"/>
+      <eng-data  t="0.052" f="4432.62" m="11202.6" cg="619.5"/>
+      <eng-data  t="0.101" f="4515.37" m="11085.2" cg="619.5"/>
+      <eng-data  t="0.19" f="4420.8" m="10872.1" cg="619.5"/>
+      <eng-data  t="0.38" f="4391.25" m="10423.7" cg="619.5"/>
+      <eng-data  t="0.965" f="4444.44" m="9039.12" cg="619.5"/>
+      <eng-data  t="2.176" f="4698.58" m="6073.35" cg="619.5"/>
+      <eng-data  t="2.887" f="4592.2" m="4303.95" cg="619.5"/>
+      <eng-data  t="3.658" f="4225.77" m="2482.87" cg="619.5"/>
+      <eng-data  t="4.17" f="2854.61" m="1511.85" cg="619.5"/>
+      <eng-data  t="4.493" f="2559.1" m="1043.46" cg="619.5"/>
+      <eng-data  t="4.881" f="1619.38" m="609.199" cg="619.5"/>
+      <eng-data  t="5.483" f="868.794" m="207.979" cg="619.5"/>
+      <eng-data  t="6.137" f="248.227" m="12.3006" cg="619.5"/>
+      <eng-data  t="6.322" f="0." m="0." cg="619.5"/>
+    </data>
+  </engine>
+</engine-list>
+</engine-database>

core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse

@@ -0,0 +1,27 @@
+<engine-database>
+ <engine-list>
+<engine FDiv="10" FFix="1" FStep="-1." Isp="199.98" Itot="1157.08" Type="hybrid" auto-calc-cg="1" auto-calc-mass="1" avgThrust="178.012" burn-time="6.5" cgDiv="10" cgFix="1" cgStep="-1." code="J175" delays="1000" dia="54." exitDia="0." initWt="1264." len="327." mDiv="10" mFix="1" mStep="-1." massFrac="46.68" mfg="Loki Research" peakThrust="420.4" propWt="590." tDiv="10" tFix="1" tStep="-1." throatDia="0.">
+<data>
+<eng-data cg="163.5" f="0." m="590." t="0."/>
+<eng-data cg="163.5" f="4.8" m="589.988" t="0.01"/>
+<eng-data cg="163.5" f="420.4" m="580.231" t="0.1"/>
+<eng-data cg="163.5" f="347.5" m="560.653" t="0.2"/>
+<eng-data cg="163.5" f="349.9" m="542.873" t="0.3"/>
+<eng-data cg="163.5" f="364.5" m="524.659" t="0.4"/>
+<eng-data cg="163.5" f="320.7" m="507.19" t="0.5"/>
+<eng-data cg="163.5" f="296.4" m="428.524" t="1."/>
+<eng-data cg="163.5" f="279.4" m="355.123" t="1.5"/>
+<eng-data cg="163.5" f="260." m="286.363" t="2."/>
+<eng-data cg="163.5" f="238.1" m="222.867" t="2.5"/>
+<eng-data cg="163.5" f="209." m="165.872" t="3."/>
+<eng-data cg="163.5" f="172." m="117.304" t="3.5"/>
+<eng-data cg="163.5" f="133.6" m="78.3469" t="4."/>
+<eng-data cg="163.5" f="102." m="48.3135" t="4.5"/>
+<eng-data cg="163.5" f="75.3" m="25.712" t="5."/>
+<eng-data cg="163.5" f="46.2" m="10.2236" t="5.5"/>
+<eng-data cg="163.5" f="17." m="2.1671" t="6."/>
+<eng-data cg="163.5" f="0." m="0." t="6.5"/>
+</data>
+</engine>
+ </engine-list>
+</engine-database>

core/resources/build.properties

@@ -1,7 +1,7 @@
 
 # The OpenRocket build version
 
-build.version=12.09.1dev
+build.version=13.04beta1
 
 
 # The source of the package.  When building a package for a specific

core/resources/l10n/messages.properties

@@ -45,14 +45,14 @@ RocketActions.MoveDownAct.ttip.Movedown = Move this component downwards.
 
 ! RocketPanel
 RocketPanel.FigTypeAct.Sideview = Side view
-RocketPanel.FigTypeAct.ttip.Sideview = Side view
 RocketPanel.FigTypeAct.Backview = Back view
-RocketPanel.FigTypeAct.ttip.Backview = Rear view
-RocketPanel.FigViewAct.2D = 2D View
-RocketPanel.FigViewAct.ttip.2D = 2D View
-RocketPanel.FigViewAct.3D = 3D View
-RocketPanel.FigViewAct.ttip.3D = 3D View
-RocketPanel.lbl.Motorcfg = Motor configuration:
+RocketPanel.FigTypeAct.Figure3D = 3D Figure
+RocketPanel.FigTypeAct.Finished = 3D Finished
+RocketPanel.FigTypeAct.Unfinished = 3D Unfinished
+
+
+RocketPanel.lbl.Flightcfg = Flight configuration:
+RocketPanel.but.FlightcfgEdit = Edit
 RocketPanel.lbl.infoMessage = <html>Click to select &nbsp;&nbsp; Shift+click to select other &nbsp;&nbsp; Double-click to edit &nbsp;&nbsp; Click+drag to move
 
 
@@ -76,6 +76,7 @@ error.fileExists.desc = File '{filename}' exists.  Do you want to overwrite it?
 
 error.writing.title = Error writing file
 error.writing.desc = An error occurred while writing to the file:
+Configuration.lbl.override = Parameter can be overridden in each flight configuration.
 
 
 ! Labels used in buttons of dialog windows
@@ -173,16 +174,38 @@ debuglogdlg.lbl.Stacktrace = Stack trace:
 MotorChooserDialog.title = Select a rocket motor
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Remove motor
-edtmotorconfdlg.but.Selectmotor = Select motor
-edtmotorconfdlg.but.Removeconfiguration = Remove configuration
-edtmotorconfdlg.but.Newconfiguration = New configuration
-edtmotorconfdlg.lbl.Motormounts = <html><b>Motor mounts:</b>
-edtmotorconfdlg.title.Editmotorconf = Edit motor configurations
+edtmotorconfdlg.but.Removeconfiguration = Remove
+edtmotorconfdlg.but.Renameconfiguration = Rename
+edtmotorconfdlg.but.Newconfiguration = New
+edtmotorconfdlg.but.Copyconfiguration = Copy
+edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations
+edtmotorconfdlg.title.Renameconf = Rename Flight Configuration
+edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration
+edtmotorconfdlg.title.Selectignitionconf = Select Ignition Configuration
+edtmotorconfdlg.title.Selectseparationconf = Select Separation Configuration
+edtmotorconfdlg.lbl.Selectedconf = Selected flight configuration:
 edtmotorconfdlg.selectcomp = <html>Select which components function as motor mounts:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Motor configurations:</b>
 edtmotorconfdlg.lbl.Configname = Configuration name:
-edtmotorconfdlg.lbl.Leavenamedefault = Leave name empty for default.
+edtmotorconfdlg.lbl.Motortab = Motors
+edtmotorconfdlg.lbl.Recoverytab = Recovery
+edtmotorconfdlg.lbl.Stagetab = Stages
+edtmotorconfdlg.tbl.None = None
+edtmotorconfdlg.tbl.Motorheader = Motor
+edtmotorconfdlg.tbl.Mountheader = Motor Mount
+edtmotorconfdlg.tbl.Ignitionheader = Ignition
+edtmotorconfdlg.but.Resetdeployment = Reset to default
+edtmotorconfdlg.but.Selectdeployment = Select deployment
+edtmotorconfdlg.tbl.Recoveryheader = Recovery Device
+edtmotorconfdlg.tbl.Deploymentheader = Deployment
+edtmotorconfdlg.but.Resetseparation = Reset to default
+edtmotorconfdlg.but.Selectseparation = Select separation
+edtmotorconfdlg.tbl.Stageheader = Stage
+edtmotorconfdlg.tbl.Separationheader = Separation
+
+! Rename FlightConfiguration Dialog
+RenameConfigDialog.title = Rename Configuration
+RenameConfigDialog.lbl.name = Name for flight configuration:
+RenameConfigDialog.but.reset = Reset to default
 
 ! Example design dialog
 exdesigndlg.but.open = Open
@@ -230,6 +253,7 @@ pref.dlg.tab.Materials = Materials
 pref.dlg.tab.Custommaterials = Custom materials
 pref.dlg.tab.Options = Options
 pref.dlg.tab.Miscellaneousoptions = Miscellaneous options
+pref.dlg.tab.DecalEditor = Graphics Editor
 pref.dlg.lbl.Positiontoinsert = Position to insert new body components:
 pref.dlg.lbl.Confirmdeletion = Confirm deletion of simulations:
 pref.dlg.lbl.User-definedthrust = User-defined thrust curves:
@@ -291,9 +315,10 @@ simedtdlg.tab.Simopt = Simulation options
 simedtdlg.tab.Plotdata = Plot data
 simedtdlg.tab.CustomExpressions = Custom expressions
 simedtdlg.tab.Exportdata = Export data
-simedtdlg.lbl.Motorcfg = Motor configuration:
-simedtdlg.lbl.ttip.Motorcfg = Select the motor configuration to use.
-simedtdlg.combo.ttip.motorconf = Select the motor configuration to use.
+simedtdlg.lbl.Flightcfg = Flight configuration:
+simedtdlg.but.FlightcfgEdit = Edit
+simedtdlg.lbl.ttip.Flightcfg = Select the flight configuration to use.
+simedtdlg.combo.ttip.Flightcfg = Select the flight configuration to use.
 simedtdlg.lbl.Wind = Wind
 simedtdlg.lbl.Averwindspeed = Average windspeed:
 simedtdlg.lbl.ttip.Averwindspeed = The average windspeed relative to the ground.
@@ -387,6 +412,7 @@ simpanel.dlg.lbl.DeleteSim2 = <html><i>This operation cannot be undone.</i>
 simpanel.dlg.lbl.DeleteSim3 = Delete simulations
 simpanel.col.Name = Name
 simpanel.col.Motors = Motors
+simpanel.col.Configuration = Configuration
 simpanel.col.Velocityoffrod = Velocity off rod
 simpanel.col.Velocityatdeploy = Velocity at deployment
 simpanel.col.Apogee = Apogee
@@ -698,6 +724,29 @@ FinMarkingGuide.lbl.Front = Front
 MotorDbLoadDlg.title = Loading motors
 MotorDbLoadDlg.Loadingmotors = Loading motors...
 
+! AppearanceConfig
+AppearanceCfg.lbl.Appearance = Appearance
+AppearanceCfg.lbl.Usedefault = Use default
+AppearanceCfg.but.edit = Edit
+AppearanceCfg.but.savedefault = Save as default appearance
+AppearanceCfg.lbl.Texture = Texture:
+AppearanceCfg.lbl.shine = Shine:
+AppearanceCfg.lbl.color.Color = Color:
+AppearanceCfg.lbl.color.diffuse = Diffuse Color:
+AppearanceCfg.lbl.color.ambient = Ambient Color:
+AppearanceCfg.lbl.color.specular = Specular Color:
+AppearanceCfg.lbl.texture.scale = Scale:
+AppearanceCfg.lbl.texture.offset = Offset:
+AppearanceCfg.lbl.texture.center = Center:
+AppearanceCfg.lbl.texture.rotation = Rotation:
+AppearanceCfg.lbl.texture.repeat = Repeat:
+
+! Texture Wrap Modes
+TextureWrap.Repeat = Repeat
+TextureWrap.Mirror = Repeat & Mirror
+TextureWrap.Clamp = Clamp Edge Pixels
+TextureWrap.Sticker = Sticker
+
 ! RocketConfig
 RocketCfg.lbl.Designname = Design name:
 RocketCfg.lbl.Designer = Designer:
@@ -859,8 +908,9 @@ MassComponentCfg.but.Reset = Reset
 
 ! MotorConfig
 MotorCfg.checkbox.compmotormount = This component is a motor mount
-MotorCfg.lbl.Motorcfg = Motor configuration:
+MotorCfg.lbl.Flightcfg = Flight configuration:
 MotorCfg.but.New = New
+MotorCfg.but.FlightcfgEdit = Edit
 MotorCfg.lbl.Currentmotor = Current motor:
 MotorCfg.lbl.Motoroverhang = Motor overhang:
 MotorCfg.lbl.Ignitionat = Ignition at:
@@ -1020,8 +1070,6 @@ StorageOptChooser.lbl.seconds = seconds
 StorageOptChooser.rdbut.Onlyprimfig = Only primary figures
 StorageOptChooser.lbl.longC1 = <html>Store only the values shown in the summary table.<br>
 StorageOptChooser.lbl.longC2 = This results in the smallest files.
-StorageOptChooser.checkbox.Compfile = Compress file
-StorageOptChooser.lbl.UsingComp = Using compression reduces the file size significantly.
 StorageOptChooser.lbl.longD1 = An estimate on how large the resulting file would be with the present options.
 StorageOptChooser.ttip.Saveopt = Save options
 StorageOptChooser.lbl.Estfilesize = Estimated file size:
@@ -1054,10 +1102,8 @@ TCMotorSelPan.noDescription = No description available.
 
 
 ! PlotDialog
-PlotDialog.title.Flightdataplot = Flight data plot
-PlotDialog.Chart.Simulatedflight = Simulated flight
 PlotDialog.CheckBox.Showdatapoints = Show data points
-PlotDialog.lbl.Chart = Click and drag down+right to zoom in, up+left to zoom out
+PlotDialog.lbl.Chart = left click drag to zoom area. mouse wheel to zoom. ctrl-mouse wheel to zoom x axis only. ctrl-left click drag to pan.  right click drag to zoom dynamically.
 
 
 ! "main" prefix is used for the main application dialog
@@ -1084,6 +1130,8 @@ main.menu.file.close = Close
 BasicFrame.item.Closedesign = Close the current rocket design
 main.menu.file.quit = Quit
 BasicFrame.item.Quitprogram = Quit the program
+main.menu.file.exportDecal = Export Decal
+main.menu.file.exportDecal.desc = Export a decal from the current rocket design to a file for editing.
 
 main.menu.edit = Edit
 BasicFrame.menu.Rocketedt = Rocket editing
@@ -1273,7 +1321,8 @@ Streamer.Streamer = Streamer
 Sleeve.Sleeve = Sleeve
 
 !Rocket
-Rocket.motorCount.Nomotor = [No motors]
+Rocket.motorCount.Nomotor = No motors
+Rocket.motorCount.noStageMotors = None
 Rocket.compname.Rocket = Rocket
 
 !MotorMount
@@ -1283,6 +1332,13 @@ MotorMount.IgnitionEvent.EJECTION_CHARGE = First ejection charge of previous sta
 MotorMount.IgnitionEvent.BURNOUT = First burnout of previous stage
 MotorMount.IgnitionEvent.NEVER = Never
 
+MotorMount.IgnitionEvent.short.AUTOMATIC = Automatic
+MotorMount.IgnitionEvent.short.LAUNCH = Launch
+MotorMount.IgnitionEvent.short.EJECTION_CHARGE = Ejection charge
+MotorMount.IgnitionEvent.short.BURNOUT = Burnout
+MotorMount.IgnitionEvent.short.NEVER = Never
+
+
 !ComponentIcons
 ComponentIcons.Nosecone = Nose cone
 ComponentIcons.Bodytube = Body tube
@@ -1314,6 +1370,15 @@ RecoveryDevice.DeployEvent.CURRENT_STAGE_SEPARATION = Current stage separation
 RecoveryDevice.DeployEvent.LOWER_STAGE_SEPARATION = Lower stage separation
 RecoveryDevice.DeployEvent.NEVER = Never
 
+RecoveryDevice.DeployEvent.short.LAUNCH = Launch
+RecoveryDevice.DeployEvent.short.EJECTION = Ejection charge
+RecoveryDevice.DeployEvent.short.APOGEE = Apogee
+RecoveryDevice.DeployEvent.short.ALTITUDE = Altitude
+RecoveryDevice.DeployEvent.short.CURRENT_STAGE_SEPARATION = Current stage separation
+RecoveryDevice.DeployEvent.short.LOWER_STAGE_SEPARATION = Lower stage separation
+RecoveryDevice.DeployEvent.short.NEVER = Never
+
+
 ! FlightEvent
 FlightEvent.Type.LAUNCH = Launch
 FlightEvent.Type.IGNITION = Motor ignition
@@ -1327,6 +1392,7 @@ FlightEvent.Type.RECOVERY_DEVICE_DEPLOYMENT = Recovery device deployment
 FlightEvent.Type.GROUND_HIT = Ground hit
 FlightEvent.Type.SIMULATION_END = Simulation end
 FlightEvent.Type.ALTITUDE = Altitude change
+FlightEvent.Type.TUMBLE = Tumbling
 
 ! ThrustCurveMotorColumns
 TCurveMotorCol.MANUFACTURER = Manufacturer
@@ -1718,6 +1784,13 @@ CustomFinImport.description = The image will be converted internally to black an
 PresetModel.lbl.select = Select preset
 PresetModel.lbl.database = From database...
 
+DecalModel.lbl.select = <none>
+DecalModel.lbl.choose = From file...
+
+! Export Decal Dialog
+ExportDecalDialog.title = Export Decal
+ExportDecalDialog.decalList.lbl = Decal
+ExportDecalDialog.exception = Unable to write decal to file ''{0}''
 
 ! Component Preset Chooser Dialog
 ComponentPresetChooserDialog.title = Choose component preset
@@ -1756,4 +1829,43 @@ table.column.LineCount = Line Count
 table.column.LineLength = Line Length
 table.column.LineMaterial = Line Material
 
+! Edit Decal Dialog
+EditDecalDialog.title = Edit decal
+EditDecalDialog.lbl.prompt = Show Prompt
+EditDecalDialog.lbl.select = Select Editor
+EditDecalDialog.lbl.system = Use Default Editor
+EditDecalDialog.lbl.cmdline = Command Line
+EditDecalDialog.lbl.cmdline.help = The filename will be subsituted for ''%%''
+EditDecalDialog.lbl.always = Always use these settings
+EditDecalDialog.btn.chooser = Select Graphics Editor Program
+EditDecalHelper.createFileException = Cannot create temporary file {0}
+EditDecalHelper.launchSystemEditorException = Cannot launch system graphics editor
+EditDecalHelper.launchCustomEditorException = Cannot launch graphics editor with command ''{0}''
+EditDecalHelper.editPreferencesHelp = The editor used can be modified in the Preferences dialog.
 
+MotorConfigurationPanel.lbl.motorMounts = Motor mounts:
+MotorConfigurationPanel.lbl.motorConfiguration = Motor configurations:
+MotorConfigurationPanel.btn.removeMotor = Remove motor
+MotorConfigurationPanel.btn.selectMotor = Select motor
+MotorConfigurationPanel.btn.selectIgnition = Select ignition
+MotorConfigurationPanel.btn.resetIgnition = Reset ignition
+
+MotorConfigurationTableModel.table.ignition.default = Default ({0})
+RecoveryConfigurationPanel.table.deployment.default = Default ({0})
+SeparationConfigurationPanel.table.separation.default = Default ({0})
+
+IgnitionSelectionDialog.opt.title = Which flight configurations are affected:
+IgnitionSelectionDialog.opt.default = Change all configurations using the default ignition event
+IgnitionSelectionDialog.opt.override = Override for the {0} flight configuration only
+
+DeploymentSelectionDialog.opt.title = Which flight configurations are affected:
+DeploymentSelectionDialog.opt.default = Change all configuration using the default deployment event
+DeploymentSelectionDialog.opt.override = Override for the {0} flight configuration only
+
+SeparationSelectionDialog.opt.title = Which flight configurations are affected:
+SeparationSelectionDialog.opt.default = Change all configuration using the default separation event
+SeparationSelectionDialog.opt.override = Override for the {0} flight configuration only
+
+MotorConfigurationPanel.description = <b>Select the motors and motor ignition events of the selected flight configuration.</b><br> <em>Motor mounts:</em> Select which components function as motor mounts.<br> <em>Motor configurations:</em> Select the motor and ignition event for each motor mount.
+
+MotorDescriptionSubstitutor.description = Motors in the configuration

core/resources/l10n/messages_cs.properties

@@ -170,14 +170,14 @@ debuglogdlg.lbl.Stacktrace = Tracov
 
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Odeber motor
-edtmotorconfdlg.but.Selectmotor = Vyber motor
+MotorConfigurationPanel.btn.removeMotor = Odeber motor
+MotorConfigurationPanel.btn.selectMotor = Vyber motor
 edtmotorconfdlg.but.Removeconfiguration = Odeber nastavení
 edtmotorconfdlg.but.Newconfiguration = Nové nastavení
-edtmotorconfdlg.lbl.Motormounts = <html><b>Pripojení motoru:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>Pripojení motoru:</b>
 edtmotorconfdlg.title.Editmotorconf = Úprava nastavení motoru
 edtmotorconfdlg.selectcomp = <html>Vyber ke kterým komponentám se má motor pripojit:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Nastavení motoru:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>Nastavení motoru:</b>
 edtmotorconfdlg.lbl.Configname = Jméno nastavení:
 edtmotorconfdlg.lbl.Leavenamedefault = Nechej prázdné polícko jako výchozí hodnotu.
 
@@ -1159,7 +1159,7 @@ ShockCord.ShockCord = Poutac
 Bulkhead.Bulkhead = Prepá\u017Eka
 
 !Rocket
-Rocket.motorCount.Nomotor = [\u017Dádné motory]
+Rocket.motorCount.Nomotor = \u017Dádné motory
 Rocket.compname.Rocket = Raketa
 
 !MotorMount

core/resources/l10n/messages_de.properties

@@ -171,14 +171,14 @@ debuglogdlg.lbl.Stacktrace = Stacktrace:
 
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Motor entfernen
-edtmotorconfdlg.but.Selectmotor = Motor auswählen
+MotorConfigurationPanel.btn.removeMotor = Motor entfernen
+MotorConfigurationPanel.btn.selectMotor = Motor auswählen
 edtmotorconfdlg.but.Removeconfiguration = Konfiguration entfernen
 edtmotorconfdlg.but.Newconfiguration = Neue Konfiguration
-edtmotorconfdlg.lbl.Motormounts = <html><b>Motorhalterungen:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>Motorhalterungen:</b>
 edtmotorconfdlg.title.Editmotorconf = Motorkonfiguration bearbeiten
 edtmotorconfdlg.selectcomp = <html>Auswählen, welche Komponenten Motorhalterungen sind:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Motorkonfigurationen:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>Motorkonfigurationen:</b>
 edtmotorconfdlg.lbl.Configname = Name der Konfiguration:
 edtmotorconfdlg.lbl.Leavenamedefault = Leer lassen für Standardwert.
 
@@ -1216,7 +1216,7 @@ ShockCord.ShockCord = Gummiband
 Bulkhead.Bulkhead = Schott
 
 !Rocket
-Rocket.motorCount.Nomotor = [Keine Motoren]
+Rocket.motorCount.Nomotor = Keine Motoren
 Rocket.compname.Rocket = Rakete
 
 !MotorMount

core/resources/l10n/messages_es.properties

@@ -179,14 +179,14 @@ debuglogdlg.lbl.Stacktrace = Trazabilidad de la pila:
 
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Quitar motor
-edtmotorconfdlg.but.Selectmotor = Seleccionar motor
+MotorConfigurationPanel.btn.removeMotor = Quitar motor
+MotorConfigurationPanel.btn.selectMotor = Seleccionar motor
 edtmotorconfdlg.but.Removeconfiguration = Quitar configuración
 edtmotorconfdlg.but.Newconfiguration = Nueva configuración
-edtmotorconfdlg.lbl.Motormounts = <html><b>Porta motor:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>Porta motor:</b>
 edtmotorconfdlg.title.Editmotorconf = Mostrar las configuraciones de motor
 edtmotorconfdlg.selectcomp = <html>Seleccionar qué componentes tienen la función de porta motor:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Configuraciones del motor:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>Configuraciones del motor:</b>
 edtmotorconfdlg.lbl.Configname = Nombre de la configuración:
 edtmotorconfdlg.lbl.Leavenamedefault = Dejar el nombre por defecto.
 
@@ -1227,7 +1227,7 @@ ShockCord.ShockCord = Tirante de suspensi
 Bulkhead.Bulkhead = Disco de enganche
 
 !Rocket
-Rocket.motorCount.Nomotor = [Sin motores]
+Rocket.motorCount.Nomotor = Sin motores
 Rocket.compname.Rocket = Cohete
 
 !MotorMount

core/resources/l10n/messages_fr.properties

@@ -1,4 +1,3 @@
-#
 # French base translation file
 # Translated by Tripoli France
 # Should you need to add new logical keys here is the proposed method
@@ -173,14 +172,14 @@ debuglogdlg.lbl.Stacktrace = Stack trace:
 MotorChooserDialog.title = Selectionnez un moteur fusée
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Enlever le moteur
-edtmotorconfdlg.but.Selectmotor = Choisir le moteur
+MotorConfigurationPanel.btn.removeMotor = Enlever le moteur
+MotorConfigurationPanel.btn.selectMotor = Choisir le moteur
 edtmotorconfdlg.but.Removeconfiguration = Supprimer la configuration
 edtmotorconfdlg.but.Newconfiguration = Nouvelle configuration
-edtmotorconfdlg.lbl.Motormounts = <html><b>Portes moteur:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>Portes moteur:</b>
 edtmotorconfdlg.title.Editmotorconf = Changer la configuration moteur
 edtmotorconfdlg.selectcomp = <html>Choisir les pièces utilisées par le porte moteur:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Configurations moteur:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>Configurations moteur:</b>
 edtmotorconfdlg.lbl.Configname = Nom de la configuration:
 edtmotorconfdlg.lbl.Leavenamedefault = Laisser le champ vide par défaut.
 
@@ -220,6 +219,7 @@ MaterialModel.title.Defcustmat = D
 pref.dlg.but.add = Ajouter
 pref.dlg.but.reset = Réinitialiser
 pref.dlg.but.checknow = Vérifier maintenant
+pref.dlg.but.openlast = Ouvrir le dernier fichier de projet au démarrage
 pref.dlg.but.defaultmetric = Système métrique
 pref.dlg.but.defaultimperial = Système impérial
 pref.dlg.title.Preferences = Préférences 
@@ -359,8 +359,10 @@ simedtdlg.IntensityDesc.High = Haute
 simedtdlg.IntensityDesc.Veryhigh = Très haute
 simedtdlg.IntensityDesc.Extreme = Extrême
 
-GeodeticComputationStrategy.none.name = Aucune
-GeodeticComputationStrategy.none.desc = Ne pas faire de calculs geodetic.
+GeodeticComputationStrategy.flat.name = Flat Earth
+GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation.  Sufficient for low-altitude flights.
+#GeodeticComputationStrategy.none.name = Aucune
+#GeodeticComputationStrategy.none.desc = Ne pas faire de calculs geodetic.
 GeodeticComputationStrategy.spherical.name = Approximation sphérique
 GeodeticComputationStrategy.spherical.desc = <html>Performe des calculs geodetic en assumant une terre sphérique.<br>Ceci est suffisamment précis dans la plupart des cas.
 GeodeticComputationStrategy.wgs84.name = ellipsoïde WGS84
@@ -631,6 +633,8 @@ componentanalysisdlg.lbl.reflenght = Longueur de r
 componentanalysisdlg.lbl.refarea = Aire de référence: 
 !componentanalysisdlg.but.close =Fermer
 componentanalysisdlg.TabStability.Col.Component = Pièce
+componentanalysisdlg.TOTAL = Total
+componentanalysisdlg.noWarnings = <html><i><font color=\"gray\">Pas d'alertes.</font></i>
 
 ! Custom Material dialog
 custmatdlg.title.Custommaterial = Matériau personnalisé
@@ -1048,6 +1052,7 @@ TCMotorSelPan.lbl.Digest = Assimilation:
 TCMotorSelPan.title.Thrustcurve = Courbe de poussée:
 TCMotorSelPan.title.Thrust = Poussée
 TCMotorSelPan.delayBox.None = Aucun
+TCMotorSelPan.noDescription = Aucune description disponible
 
 
 ! PlotDialog
@@ -1094,6 +1099,7 @@ main.menu.edit.paste = Coller
 main.menu.edit.delete = Effacer
 main.menu.edit.resize = Redimensionner...
 main.menu.edit.resize.desc = Redimensionner certaines parties de la fusée
+main.menu.edit.editpreset= Edit Component Preset File
 main.menu.edit.preferences = Préférences
 main.menu.edit.preferences.desc = Configure les préférences de l'application
 
@@ -1269,7 +1275,7 @@ Streamer.Streamer = Streamer
 Sleeve.Sleeve = Sleeve
 
 !Rocket
-Rocket.motorCount.Nomotor = [aucun moteurs]
+Rocket.motorCount.Nomotor = aucun moteurs
 Rocket.compname.Rocket = Fusée
 
 !MotorMount
@@ -1331,6 +1337,15 @@ TCurveMotorCol.TYPE = Type
 TCurveMotorCol.DIAMETER = Diamètre
 TCurveMotorCol.LENGTH = Longueur
 
+TCurveMotor.ttip.diameter = Diamètre:
+TCurveMotor.ttip.length = Longeur:
+TCurveMotor.ttip.maxThrust = Poussée Maximum:
+TCurveMotor.ttip.avgThrust = Poussée moyenne:
+TCurveMotor.ttip.burnTime = Durée de la combustion:
+TCurveMotor.ttip.totalImpulse = Impulsion Totale:
+TCurveMotor.ttip.launchMass = Masse au décolage:
+TCurveMotor.ttip.emptyMass = Masse à vide:
+
 ! RocketInfo
 RocketInfo.lengthLine.Length = Longueur
 RocketInfo.lengthLine.maxdiameter = , diamètre max.
@@ -1716,6 +1731,7 @@ ComponentPresetChooserDialog.menu.sortAsc = Trier par ordre croissant
 ComponentPresetChooserDialog.menu.sortDesc = Trier par ordre dé-croissant
 ComponentPresetChooserDialog.menu.units = Unités
 ComponentPresetChooserDialog.checkbox.showAllCompatible = Montrer tous ceux qui sont compatibles
+ComponentPresetChooserDialog.lbl.favorites = Select to add preset to drop-down menu
 table.column.Favorite = Préférée
 table.column.Manufacturer = Frabriquant
 table.column.PartNo = Réference de la pièce

core/resources/l10n/messages_it.properties

@@ -173,14 +173,14 @@ debuglogdlg.lbl.Stacktrace = traccia della memoria:
 
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = Rimuovi il motore
-edtmotorconfdlg.but.Selectmotor = Seleziona il motore
+MotorConfigurationPanel.btn.removeMotor = Rimuovi il motore
+MotorConfigurationPanel.btn.selectMotor = Seleziona il motore
 edtmotorconfdlg.but.Removeconfiguration = Rimuovi la configurazione
 edtmotorconfdlg.but.Newconfiguration = Nuova configurazione
-edtmotorconfdlg.lbl.Motormounts = <html><b>Alloggiamenti motore:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>Alloggiamenti motore:</b>
 edtmotorconfdlg.title.Editmotorconf = Modifica la configurazione del motore
 edtmotorconfdlg.selectcomp = <html>Seleziona quali componenti fungono da alloggiamenti per il motore:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>Configurazione dei motori:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>Configurazione dei motori:</b>
 edtmotorconfdlg.lbl.Configname = Nome della configurazione:
 edtmotorconfdlg.lbl.Leavenamedefault = Lascia il campo vuoto per il nome prestabilito.
 
@@ -1220,7 +1220,7 @@ ShockCord.ShockCord = Shock cord
 Bulkhead.Bulkhead = Paratia
 
 !Rocket
-Rocket.motorCount.Nomotor = [Nessun motore]
+Rocket.motorCount.Nomotor = Nessun motore
 Rocket.compname.Rocket = Razzo
 
 !MotorMount

core/resources/l10n/messages_pl.properties

@@ -171,14 +171,14 @@
  
  
  ! Edit Motor configuration dialog
- edtmotorconfdlg.but.removemotor  =  Usu\u0144 silnik
- edtmotorconfdlg.but.Selectmotor  =  Wybierz silnik
+ MotorConfigurationPanel.btn.removeMotor  =  Usu\u0144 silnik
+ MotorConfigurationPanel.btn.selectMotor  =  Wybierz silnik
  edtmotorconfdlg.but.Removeconfiguration  =  Usu\u0144 konfiguracj\u0119
  edtmotorconfdlg.but.Newconfiguration  =  Nowa konfiguracja
- edtmotorconfdlg.lbl.Motormounts  =  <html><b>Gniazda silnikowe:</b>
+ MotorConfigurationPanel.lbl.motorMounts  =  <html><b>Gniazda silnikowe:</b>
  edtmotorconfdlg.title.Editmotorconf  =  Edytuj konfiguracje silnika
  edtmotorconfdlg.selectcomp  =  <html>Wybierz cz\u0119\u015Bci, które pe\u0142ni\u0105 funkcj\u0119 gniazd silnikowych:
- edtmotorconfdlg.lbl.Motorconfig  =  <html><b>Konfiguracje silników:</b>
+ MotorConfigurationPanel.lbl.motorConfiguration  =  <html><b>Konfiguracje silników:</b>
  edtmotorconfdlg.lbl.Configname  =  Nazwa konfiguracji:
  edtmotorconfdlg.lbl.Leavenamedefault  =  Pozostaw bez nazwy w celu u\u017Cycia nazwy domy\u015Blnej.
  
@@ -1161,7 +1161,7 @@
  Bulkhead.Bulkhead  =  Przegroda
  
  !Rocket
- Rocket.motorCount.Nomotor  =  [bez silników]
+ Rocket.motorCount.Nomotor  =  bez silników
  Rocket.compname.Rocket  =  Rakieta
  
  !MotorMount

core/resources/l10n/messages_ru.properties

@@ -173,14 +173,14 @@ debuglogdlg.lbl.Stacktrace = \u0421\u0442\u0435\u043a \u0432\u044b\u0437\u043e\u
 MotorChooserDialog.title = \u0412\u044b\u0431\u043e\u0440 \u0440\u0430\u043a\u0435\u0442\u043d\u043e\u0433\u043e \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u044f
 
 ! Edit Motor configuration dialog
-edtmotorconfdlg.but.removemotor = \u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u044c
-edtmotorconfdlg.but.Selectmotor = \u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u044c
+MotorConfigurationPanel.btn.removeMotor = \u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u044c
+MotorConfigurationPanel.btn.selectMotor = \u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u044c
 edtmotorconfdlg.but.Removeconfiguration = \u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e
 edtmotorconfdlg.but.Newconfiguration = \u041d\u043e\u0432\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
-edtmotorconfdlg.lbl.Motormounts = <html><b>\u041a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439:</b>
+MotorConfigurationPanel.lbl.motorMounts = <html><b>\u041a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439:</b>
 edtmotorconfdlg.title.Editmotorconf = \u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0439 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439
 edtmotorconfdlg.selectcomp = <html>\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b, \u044f\u0432\u043b\u044f\u044e\u0449\u0438\u0435\u0441\u044f \u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f\u043c\u0438 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439:
-edtmotorconfdlg.lbl.Motorconfig = <html><b>\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439:</b>
+MotorConfigurationPanel.lbl.motorConfiguration = <html><b>\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439:</b>
 edtmotorconfdlg.lbl.Configname = \u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438:
 edtmotorconfdlg.lbl.Leavenamedefault = \u041e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0443\u0441\u0442\u044b\u043c \u0434\u043b\u044f \u0438\u043c\u0435\u043d\u0438 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.
 
@@ -1274,7 +1274,7 @@ Streamer.Streamer = \u0422\u043e\u0440\u043c\u043e\u0437\u043d\u0430\u044f \u043
 Sleeve.Sleeve = \u0412\u0442\u0443\u043b\u043a\u0430
 
 !Rocket
-Rocket.motorCount.Nomotor = [\u0411\u0435\u0437 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439]
+Rocket.motorCount.Nomotor = \u0411\u0435\u0437 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043b\u0435\u0439
 Rocket.compname.Rocket = \u0420\u0430\u043a\u0435\u0442\u0430
 
 !MotorMount

core/src/net/sf/openrocket/aerodynamics/FlightConditions.java

@@ -445,12 +445,12 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 	
 	
 	@Override
-	public void addChangeListener(EventListener listener) {
+	public void addChangeListener(StateChangeListener listener) {
 		listenerList.add(0, listener);
 	}
 	
 	@Override
-	public void removeChangeListener(EventListener listener) {
+	public void removeChangeListener(StateChangeListener listener) {
 		listenerList.remove(listener);
 	}
 	
@@ -459,8 +459,8 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 		// Copy the list before iterating to prevent concurrent modification exceptions.
 		EventListener[] listeners = listenerList.toArray(new EventListener[0]);
 		for (EventListener l : listeners) {
-			if ( l instanceof StateChangeListener ) {
-				((StateChangeListener)l).stateChanged(event);
+			if (l instanceof StateChangeListener) {
+				((StateChangeListener) l).stateChanged(event);
 			}
 		}
 	}

core/src/net/sf/openrocket/appearance/Appearance.java

@@ -0,0 +1,49 @@
+package net.sf.openrocket.appearance;
+
+import net.sf.openrocket.util.Color;
+import net.sf.openrocket.util.MathUtil;
+
+/**
+ * A component appearance.
+ * This class is immutable.
+ * 
+ * @author Bill Kuker <bkuker@billkuker.com>
+ */
+public class Appearance {
+	public static final Appearance MISSING = new Appearance(new Color(0, 0, 0), 1, null);
+	
+	private final Color paint;
+	private final double shine;
+	private final Decal texture;
+	
+	public Appearance(final Color paint, final double shine, final Decal texture) {
+		this.paint = paint;
+		this.shine = MathUtil.clamp(shine, 0, 1);
+		this.texture = texture;
+	}
+	
+	public Appearance(final Color paint, final double shine) {
+		this.paint = paint;
+		this.shine = MathUtil.clamp(shine, 0, 1);
+		this.texture = null;
+	}
+	
+	public Color getPaint() {
+		return paint;
+	}
+	
+	public double getShine() {
+		return shine;
+	}
+	
+	public Decal getTexture() {
+		return texture;
+	}
+	
+	@Override
+	public String toString() {
+		return "Appearance [paint=" + paint + ", shine="
+				+ shine + ", texture=" + texture + "]";
+	}
+	
+}

core/src/net/sf/openrocket/appearance/AppearanceBuilder.java

@@ -0,0 +1,235 @@
+package net.sf.openrocket.appearance;
+
+import net.sf.openrocket.appearance.Decal.EdgeMode;
+import net.sf.openrocket.util.AbstractChangeSource;
+import net.sf.openrocket.util.Color;
+import net.sf.openrocket.util.Coordinate;
+
+/**
+ * Use this class to build an immutable Appearance object in a friendly way. Set
+ * the various values one at a time with the setter methods and then call
+ * getAppearance(). Each call to getAppearance will return a new appearance.
+ * 
+ * You can use this class repeatedly and resetToDefaults() in between, or create
+ * a new one every time.
+ * 
+ * @author Bill Kuker <bkuker@billkuker.com>
+ * 
+ */
+public class AppearanceBuilder extends AbstractChangeSource {
+	
+	private Color paint;
+	private double shine;
+	private double offsetU, offsetV;
+	private double centerU, centerV;
+	private double scaleU, scaleV;
+	private double rotation;
+	private DecalImage image;
+	private Decal.EdgeMode edgeMode;
+	
+	private boolean batch;
+	
+	public AppearanceBuilder() {
+		resetToDefaults();
+	}
+	
+	public AppearanceBuilder(Appearance a) {
+		setAppearance(a);
+	}
+	
+	private void resetToDefaults() {
+		paint = new Color(0, 0, 0);
+		shine = 0;
+		offsetU = offsetV = 0;
+		centerU = centerV = 0;
+		scaleU = scaleV = 1;
+		rotation = 0;
+		image = null;
+		edgeMode = EdgeMode.REPEAT;
+	}
+	
+	public void setAppearance(final Appearance a) {
+		batch(new Runnable() {
+			@Override
+			public void run() {
+				resetToDefaults();
+				if (a != null) {
+					setPaint(a.getPaint());
+					setShine(a.getShine());
+					Decal d = a.getTexture();
+					if (d != null) {
+						setOffset(d.getOffset().x, d.getOffset().y);
+						setCenter(d.getCenter().x, d.getCenter().y);
+						setScaleUV(d.getScale().x, d.getScale().y);
+						setRotation(d.getRotation());
+						setEdgeMode(d.getEdgeMode());
+						setImage(d.getImage());
+					}
+				}
+			}
+		});
+	}
+	
+	public Appearance getAppearance() {
+		
+		Decal t = null;
+		
+		if (image != null) {
+			t = new Decal( //
+					new Coordinate(offsetU, offsetV), //
+					new Coordinate(centerU, centerV), //
+					new Coordinate(scaleU, scaleV), //
+					rotation, //
+					image, //
+					edgeMode);
+		}
+		
+		return new Appearance(paint, shine, t);
+	}
+	
+	
+	
+	public Color getPaint() {
+		return paint;
+	}
+	
+	public void setPaint(Color paint) {
+		this.paint = paint;
+		fireChangeEvent();
+	}
+	
+	public double getShine() {
+		return shine;
+	}
+	
+	public void setShine(double shine) {
+		this.shine = shine;
+		fireChangeEvent();
+	}
+	
+	public double getOffsetU() {
+		return offsetU;
+	}
+	
+	public void setOffsetU(double offsetU) {
+		this.offsetU = offsetU;
+		fireChangeEvent();
+	}
+	
+	public double getOffsetV() {
+		return offsetV;
+	}
+	
+	public void setOffsetV(double offsetV) {
+		this.offsetV = offsetV;
+		fireChangeEvent();
+	}
+	
+	public void setOffset(double u, double v) {
+		setOffsetU(u);
+		setOffsetV(v);
+	}
+	
+	public double getCenterU() {
+		return centerU;
+	}
+	
+	public void setCenterU(double centerU) {
+		this.centerU = centerU;
+		fireChangeEvent();
+	}
+	
+	public double getCenterV() {
+		return centerV;
+	}
+	
+	public void setCenterV(double centerV) {
+		this.centerV = centerV;
+		fireChangeEvent();
+	}
+	
+	public void setCenter(double u, double v) {
+		setCenterU(u);
+		setCenterV(v);
+	}
+	
+	public double getScaleU() {
+		return scaleU;
+	}
+	
+	public void setScaleU(double scaleU) {
+		this.scaleU = scaleU;
+		fireChangeEvent();
+	}
+	
+	public double getScaleV() {
+		return scaleV;
+	}
+	
+	public void setScaleV(double scaleV) {
+		this.scaleV = scaleV;
+		fireChangeEvent();
+	}
+	
+	public void setScaleUV(double u, double v) {
+		setScaleU(u);
+		setScaleV(v);
+	}
+	
+	public double getScaleX() {
+		return 1.0 / getScaleU();
+	}
+	
+	public void setScaleX(double scaleU) {
+		setScaleU(1.0 / scaleU);
+	}
+	
+	public double getScaleY() {
+		return 1.0 / getScaleV();
+	}
+	
+	public void setScaleY(double scaleV) {
+		setScaleV(1.0 / scaleV);
+	}
+	
+	public double getRotation() {
+		return rotation;
+	}
+	
+	public void setRotation(double rotation) {
+		this.rotation = rotation;
+		fireChangeEvent();
+	}
+	
+	public DecalImage getImage() {
+		return image;
+	}
+	
+	public void setImage(DecalImage image) {
+		this.image = image;
+		fireChangeEvent();
+	}
+	
+	public Decal.EdgeMode getEdgeMode() {
+		return edgeMode;
+	}
+	
+	public void setEdgeMode(Decal.EdgeMode edgeMode) {
+		this.edgeMode = edgeMode;
+		fireChangeEvent();
+	}
+	
+	@Override
+	protected void fireChangeEvent() {
+		if (!batch)
+			super.fireChangeEvent();
+	}
+	
+	public void batch(Runnable r) {
+		batch = true;
+		r.run();
+		batch = false;
+		fireChangeEvent();
+	}
+	
+}

core/src/net/sf/openrocket/appearance/Decal.java

@@ -0,0 +1,72 @@
+package net.sf.openrocket.appearance;
+
+import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.util.Coordinate;
+
+/**
+ * A texture that can be applied by an Appearance. This class is immutable.
+ * 
+ * @author Bill Kuker <bkuker@billkuker.com>
+ */
+public class Decal {
+	
+	public static enum EdgeMode {
+		REPEAT("TextureWrap.Repeat"), MIRROR("TextureWrap.Mirror"), CLAMP("TextureWrap.Clamp"), STICKER("TextureWrap.Sticker");
+		private final String transName;
+		
+		EdgeMode(final String name) {
+			this.transName = name;
+		}
+		
+		@Override
+		public String toString() {
+			return Application.getTranslator().get(transName);
+		}
+	}
+	
+	private final Coordinate offset, center, scale;
+	private final double rotation;
+	private final DecalImage image;
+	private final EdgeMode mode;
+	
+	public Decal(final Coordinate offset, final Coordinate center, final Coordinate scale, final double rotation,
+			final DecalImage image, final EdgeMode mode) {
+		this.offset = offset;
+		this.center = center;
+		this.scale = scale;
+		this.rotation = rotation;
+		this.image = image;
+		this.mode = mode;
+	}
+	
+	public Coordinate getOffset() {
+		return offset;
+	}
+	
+	public Coordinate getCenter() {
+		return center;
+	}
+	
+	public Coordinate getScale() {
+		return scale;
+	}
+	
+	public double getRotation() {
+		return rotation;
+	}
+	
+	public EdgeMode getEdgeMode() {
+		return mode;
+	}
+	
+	public DecalImage getImage() {
+		return image;
+	}
+	
+	@Override
+	public String toString() {
+		return "Texture [offset=" + offset + ", center=" + center + ", scale=" + scale + ", rotation=" + rotation
+				+ ", image=" + image + "]";
+	}
+	
+}