diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties
index 69a4f39..a3133e1 100644
--- a/.gradle/2.0/taskArtifacts/cache.properties
+++ b/.gradle/2.0/taskArtifacts/cache.properties
@@ -1 +1 @@
-#Thu May 25 13:06:54 CEST 2017
+#Mon Jul 04 19:58:54 CEST 2016
diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock
index 48e33f4..e45c6a4 100644
Binary files a/.gradle/2.0/taskArtifacts/cache.properties.lock and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000..b540d57
Binary files /dev/null and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
index 470280d..04ed467 100644
Binary files a/.gradle/2.0/taskArtifacts/fileSnapshots.bin and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000..b6e7e21
Binary files /dev/null and b/.gradle/2.0/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
index 08219e8..576d6a4 100644
Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ
diff --git a/README.txt b/README.txt
index f414887..cb75cb6 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
-------------------------------------------------------
-######## ORBITAL BOMBARDMENT 1.7.10 ##########
-------------------------------------------------------
+#ORBITAL BOMBARDMENT 1.7.10
+
+
Une suite du mod (mort) ORBITAL BOMBARDMENT de la 1.6.4.
Celui permet d'ajouter au jeu de nouveaux blocs et items pour
tirer de puissante salves destructrices sur vos cochons !
diff --git a/build.gradle b/build.gradle
index 95c4f81..28d57bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,12 +12,13 @@ buildscript {
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+ classpath 'net.sf.proguard:proguard-gradle:5.2.1'
}
}
apply plugin: 'forge'
-version = "2.0"
+version = "2.1"
group= "fr.jackcartersmith.ob" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "OrbitalBombardment"
@@ -61,3 +62,28 @@ processResources
exclude 'mcmod.info'
}
}
+
+task obfJar(type: proguard.gradle.ProGuardTask, dependsOn: reobf) {
+ inputs.file jar.archivePath
+ ext {
+ outDir = file("${buildDir}/proguard")
+ obfuscatedJar = "${outDir}/${jar.baseName}-${jar.version}.jar"
+ }
+ outDir.mkdirs()
+
+ injars jar.archivePath
+ outjars obfuscatedJar
+ libraryjars configurations.compile
+ configuration 'proguard.pro'
+}
+
+task obfOutput(type: Jar, dependsOn: obfJar) {
+ appendix = 'obf'
+ from zipTree(obfJar.obfuscatedJar)
+}
+
+artifacts {
+ archives obfOutput
+}
+
+build.dependsOn obfJar, obfOutput
diff --git a/eclipse/.metadata/.mylyn/.taskListIndex/segments_1 b/eclipse/.metadata/.mylyn/.taskListIndex/segments_1
index 3b0ac8f..816c688 100644
Binary files a/eclipse/.metadata/.mylyn/.taskListIndex/segments_1 and b/eclipse/.metadata/.mylyn/.taskListIndex/segments_1 differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location
new file mode 100644
index 0000000..3f2393a
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location
index e69de29..658f543 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers
new file mode 100644
index 0000000..8849c89
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
new file mode 100644
index 0000000..ecbcaea
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
index b7122a4..3d52861 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree
new file mode 100644
index 0000000..810300d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index b993c7a..2603739 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs
new file mode 100644
index 0000000..565f933
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
index 466d7f9..a97b8a7 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sun Jun 05 18:58:07 CEST 2011
-version=1
eclipse.preferences.version=1
+encoding=UTF-8
refresh.enabled=true
+version=1
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
index 94c5676..af02aa3 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
@@ -1,7 +1,7 @@
-#Sun Jun 05 19:03:53 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.debug.ui.UseContextualLaunch=false
Console.highWaterMark=88000
-org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n
-org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n
StringVariablePreferencePage=130,107,107,86,
+eclipse.preferences.version=1
+org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n
+org.eclipse.debug.ui.UseContextualLaunch=false
+org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n
+preferredTargets=default\:default|
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
index 12ec368..57c6752 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,326 @@
-#Sun Sep 18 16:44:39 NZST 2011
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=81
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+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_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=0
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+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=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not 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=true
+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=false
+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=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+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_after_type_annotation=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=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=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not 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=do not 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=do not 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_lambda_arrow=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=do not 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=do not 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_lambda_arrow=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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=do not 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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=do not 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=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+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=400
+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=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+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_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..80e44bb
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
index c8fd235..4bb7daa 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -1,12 +1,85 @@
+content_assist_disabled_computers=org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.recommenders.calls.rcp.proposalCategory.templates\u0000org.eclipse.mylyn.java.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.recommenders.chain.rcp.proposalCategory.chain\u0000
+content_assist_lru_history=
+content_assist_number_of_computers=19
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
+formatter_profile=_mff
+formatter_settings_version=12
+hoverModifierMasks=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;0;org.eclipse.jdt.ui.ProblemHover;0;org.eclipse.jdt.ui.NLSStringHover;327680;org.eclipse.jdt.ui.JavadocHover;393216;org.eclipse.jdt.ui.AnnotationHover;0;org.eclipse.jdt.ui.JavaSourceHover;131072;
+hoverModifiers=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;\!0;org.eclipse.jdt.ui.ProblemHover;\!0;org.eclipse.jdt.ui.NLSStringHover;Ctrl+Alt;org.eclipse.jdt.ui.JavadocHover;Ctrl+Shift;org.eclipse.jdt.ui.AnnotationHover;\!0;org.eclipse.jdt.ui.JavaSourceHover;Shift;
org.eclipse.jdt.ui.editor.tab.width=
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.formatterprofiles=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
org.eclipse.jdt.ui.formatterprofiles.version=12
+org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.javadoclocations.migrated=true
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.code_templates_migrated=true
+org.eclipse.jdt.ui.text.custom_code_templates=
+org.eclipse.jdt.ui.text.custom_templates=
+org.eclipse.jdt.ui.text.templates_migrated=true
org.eclipse.jface.textfont=1|Consolas|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
proposalOrderMigrated=true
+sourceHoverBackgroundColor=255,255,225
+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_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+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=false
+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_redundant_type_arguments=false
+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_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+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
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.java.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.java.ui.prefs
new file mode 100644
index 0000000..2a6fe50
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.java.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+org.eclipse.mylyn.java.ui.run.count.3_10_0=1
+org.eclipse.mylyn.java.ui.run.count.3_1_0=1
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs
new file mode 100644
index 0000000..b9bd711
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.recommenders.completion.rcp.prefs
@@ -0,0 +1,2 @@
+completion_tips_seen=org.eclipse.recommenders.completion.rcp.tips.discovery\:org.eclipse.recommenders.completion.rcp.tips.types
+eclipse.preferences.version=1
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
index d0447d5..5e4462e 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@@ -3,6 +3,6 @@ IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
PROBLEMS_FILTERS_MIGRATE=true
SAVE_ALL_BEFORE_BUILD=true
eclipse.preferences.version=1
-platformState=1465652141027
+platformState=1475256831034
quickStart=false
tipsAndTricks=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client-noLogin.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client-noLogin.launch
new file mode 100644
index 0000000..c07519b
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client-noLogin.launch
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
index a639572..382cdf3 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
+++ b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
@@ -1,13 +1,14 @@
-
+
-
+
+
-
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
index 395f317..e46a5a1 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
+++ b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
new file mode 100644
index 0000000..88a2f74
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
@@ -0,0 +1,16 @@
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
index 1208f60..c61e11b 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
@@ -1,23 +1,25 @@
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
index 62e7609..47d161c 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+++ b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
@@ -1,20 +1,20 @@
-
-
+
+
activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration
ModelMigrationProcessor.001
-
+
-
+
topLevel
shellMaximized
-
-
-
+
+
+
persp.actionSet:org.eclipse.mylyn.doc.actionSet
persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation
@@ -73,1161 +73,1206 @@
persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task
persp.viewSC:org.eclipse.wb.core.StructureView
persp.viewSC:org.eclipse.wb.core.PaletteView
-
-
-
+
+
+
org.eclipse.e4.primaryNavigationStack
- active
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
org.eclipse.e4.secondaryNavigationStack
-
-
-
+
+
+
-
+
org.eclipse.e4.secondaryDataStack
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
View
categoryTag:Help
-
+
View
categoryTag:General
-
+
View
categoryTag:Help
-
-
+
+
org.eclipse.e4.primaryDataStack
EditorStack
+ active
+
+
+ Editor
+ org.eclipse.jdt.ui.CompilationUnitEditor
+ removeOnHide
+ active
+ activeOnClose
+
+
+
+ Editor
+ org.eclipse.jdt.ui.CompilationUnitEditor
+ removeOnHide
+
+
+
+ Editor
+ org.eclipse.jdt.ui.CompilationUnitEditor
+ removeOnHide
+
+
+
+ Editor
+ org.eclipse.jdt.ui.CompilationUnitEditor
+ removeOnHide
+
+
+
+ Editor
+ org.eclipse.jdt.ui.CompilationUnitEditor
+ removeOnHide
+
-
+
-
+
View
categoryTag:Java
- active
- activeOnClose
-
+
ViewMenu
menuContribution:menu
-
+
-
+
View
categoryTag:Java
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
ViewMenu
menuContribution:menu
-
+
-
+
View
categoryTag:Java
-
+
View
categoryTag:Java
-
+
View
categoryTag:General
-
+
+
View
categoryTag:General
+
+ ViewMenu
+ menuContribution:menu
+
+
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
ViewMenu
menuContribution:menu
-
+
-
+
View
categoryTag:General
-
+
View
categoryTag:Ant
-
+
View
categoryTag:Git
-
+
View
categoryTag:Java
-
+
View
categoryTag:Mylyn
-
+
ViewMenu
menuContribution:menu
-
+
-
+
View
categoryTag:WindowBuilder
-
+
View
categoryTag:WindowBuilder
-
-
+
+
toolbarSeparator
-
+
-
+
Draggable
-
+
-
+
toolbarSeparator
-
+
-
+
Draggable
-
+
Draggable
-
+
Draggable
-
+
+ Draggable
+
+
toolbarSeparator
-
+
-
+
Draggable
-
+
-
+
toolbarSeparator
-
+
-
+
toolbarSeparator
-
+
-
+
Draggable
-
+
stretch
SHOW_RESTORE_MENU
-
+
Draggable
HIDEABLE
SHOW_RESTORE_MENU
-
-
+
+
stretch
-
+
Draggable
-
+
+ Draggable
+
+
+
+
+ TrimStack
+ Draggable
+
+
+
+
+ TrimStack
+ Draggable
+
+
+ TrimStack
+ Draggable
+
+
+ TrimStack
+ Draggable
+
+
+ TrimStack
Draggable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
platform:win32
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
platform:win32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Editor
-
+
View
categoryTag:Ant
-
+
View
categoryTag:Gradle
-
+
View
categoryTag:Gradle
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Git
-
+
View
categoryTag:Git
-
+
View
categoryTag:Git
-
+
View
categoryTag:Git
-
+
View
categoryTag:Git
-
+
View
categoryTag:General
-
+
View
categoryTag:Help
-
+
View
categoryTag:Debug
-
+
View
categoryTag:Java
-
+
View
categoryTag:Java
-
+
View
categoryTag:Java
-
+
View
categoryTag:Java Browsing
-
+
View
categoryTag:Java Browsing
-
+
View
categoryTag:Java Browsing
-
+
View
categoryTag:Java Browsing
-
+
View
categoryTag:Java
-
+
View
categoryTag:General
-
+
View
categoryTag:Java
-
+
View
categoryTag:Java
-
+
View
categoryTag:Maven
-
+
View
categoryTag:Maven
-
+
View
categoryTag:Mylyn
-
+
View
categoryTag:Mylyn
-
+
View
categoryTag:Mylyn
-
+
View
categoryTag:Mylyn
-
+
View
categoryTag:Oomph
-
+
View
categoryTag:Code Recommenders
-
+
View
categoryTag:Code Recommenders
-
+
View
categoryTag:Code Recommenders
-
+
View
categoryTag:Code Recommenders
-
+
View
categoryTag:Code Recommenders
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:Team
-
+
View
categoryTag:Team
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:Help
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
+
View
categoryTag:General
-
-
-
- View
- categoryTag:WindowBuilder
-
-
-
-
- View
- categoryTag:WindowBuilder
-
-
+
View
categoryTag:General
-
+
View
categoryTag:XML
-
+
View
categoryTag:XML
-
-
+
+
@@ -1246,981 +1291,981 @@
SHOW_RESTORE_MENU
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1 b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1
index ce8adac..eed6d53 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1 and b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/local-history/segments_1 differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/segments_2 b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/segments_2
index 20a3ca7..2465a4f 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/segments_2 and b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/remote-history/segments_2 differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json
index 20b9f41..7dc671a 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json
+++ b/eclipse/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json
@@ -1,7 +1,7 @@
{
"version": "v1",
"title": "Eclipse Automated Error Reporting",
- "timestamp": 1467795330905,
+ "timestamp": 1484256544184,
"ttl": 10080,
"helpUrl": "https://dev.eclipse.org/recommenders/community/aeri/v2/help/",
"feedbackUrl": "http://ctrlflow.com/automated-error-reporting",
@@ -13,18 +13,20 @@
"connectTimeout": 10,
"socketTimeout": 10,
"acceptedProducts": [
- "org.eclipse.*"
+ "org.eclipse.*",
+ "org.fordiac.*"
],
"acceptedPlugins": [
"org.apache.log4j.*",
- "org.eclipse.*"
+ "org.eclipse.*",
+ "org.fordiac.*"
],
"acceptedPackages": [
"ch.qos.*",
"com.cforcoding.*",
- "com.ctrlflow.*",
"com.google.*",
"com.gradleware.tooling.*",
+ "com.mountainminds.eclemma.*",
"com.naef.*",
"com.sun.*",
"java.*",
@@ -32,20 +34,24 @@
"javax.*",
"org.apache.*",
"org.eclipse.*",
+ "org.fordiac.*",
"org.gradle.*",
+ "org.jacoco.*",
"org.osgi.*",
"org.slf4j.*",
"sun.*"
],
"requiredPackages": [
"com.cforcoding.*",
- "com.ctrlflow.*",
"com.gradleware.tooling.*",
+ "com.mountainminds.eclemma.*",
"com.naef.*",
"org.eclipse.*",
- "org.gradle.*"
+ "org.fordiac.*",
+ "org.gradle.*",
+ "org.jacoco.*"
],
- "acceptOtherPackages": true,
+ "acceptOtherPackages": false,
"acceptUiFreezes": true,
"ignoredStatuses": [
":java.io.IOException:There is not enough space on the disk",
@@ -60,5 +66,5 @@
"org.eclipse.pde.core::The current target platform contains errors*",
"org.eclipse.ui::Conflicting handlers for*"
],
- "problemsZipLastDownloadTimestamp": 1467795640650
+ "problemsZipLastDownloadTimestamp": 0
}
\ No newline at end of file
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/.org.eclipse.jdt.core.external.folders/.project b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/.org.eclipse.jdt.core.external.folders/.project
new file mode 100644
index 0000000..751a7b2
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/.org.eclipse.jdt.core.external.folders/.project
@@ -0,0 +1,18 @@
+
+
+ .org.eclipse.jdt.core.external.folders
+
+
+
+
+
+
+
+
+
+ .link0
+ 2
+ C:/Users/arech/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/start
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1031062034.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1031062034.index
new file mode 100644
index 0000000..92a3224
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1031062034.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1091608142.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1091608142.index
new file mode 100644
index 0000000..f2b64c5
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1091608142.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1097412145.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1097412145.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1097412145.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1123956748.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1123956748.index
new file mode 100644
index 0000000..4df39b1
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1123956748.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1130872821.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1130872821.index
new file mode 100644
index 0000000..1ef2563
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1130872821.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1252128141.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1252128141.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1252128141.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1259842432.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1259842432.index
new file mode 100644
index 0000000..ff01d81
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1259842432.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1260374096.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1260374096.index
new file mode 100644
index 0000000..fd95852
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1260374096.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1297580988.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1297580988.index
new file mode 100644
index 0000000..2fe05cc
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1297580988.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1305655923.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1305655923.index
new file mode 100644
index 0000000..827bd3d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1305655923.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1316314897.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1316314897.index
new file mode 100644
index 0000000..5930c06
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1316314897.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1357421196.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1357421196.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1357421196.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1363380408.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1363380408.index
new file mode 100644
index 0000000..6216531
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1363380408.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1616963895.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1616963895.index
new file mode 100644
index 0000000..0e79a10
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1616963895.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1793249213.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1793249213.index
new file mode 100644
index 0000000..8f75acd
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1793249213.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1834775697.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1834775697.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1834775697.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1850794102.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1850794102.index
new file mode 100644
index 0000000..1250105
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1850794102.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1858897955.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1858897955.index
new file mode 100644
index 0000000..e1f39dd
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1858897955.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/186815308.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/186815308.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/186815308.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1884985995.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1884985995.index
new file mode 100644
index 0000000..8e559cd
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1884985995.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1896760521.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1896760521.index
new file mode 100644
index 0000000..9c6aef0
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1896760521.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1901452023.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1901452023.index
new file mode 100644
index 0000000..d84b4d9
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1901452023.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1927192158.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1927192158.index
new file mode 100644
index 0000000..73019a1
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1927192158.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1944372739.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1944372739.index
new file mode 100644
index 0000000..5c8174d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/1944372739.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2037292668.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2037292668.index
new file mode 100644
index 0000000..1ea3426
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2037292668.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2095596375.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2095596375.index
new file mode 100644
index 0000000..9ca085d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2095596375.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2211164785.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2211164785.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2211164785.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2353711714.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2353711714.index
new file mode 100644
index 0000000..8a95bfb
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2353711714.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2391615764.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2391615764.index
new file mode 100644
index 0000000..fda912c
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2391615764.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2469754730.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2469754730.index
new file mode 100644
index 0000000..8b176d2
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2469754730.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2483765885.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2483765885.index
new file mode 100644
index 0000000..83d3a83
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2483765885.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2597019815.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2597019815.index
new file mode 100644
index 0000000..73acf0e
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2597019815.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2617162989.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2617162989.index
new file mode 100644
index 0000000..2ba5dd9
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2617162989.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2724105677.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2724105677.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2724105677.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2814825160.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2814825160.index
new file mode 100644
index 0000000..89cb6cc
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2814825160.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2827211443.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2827211443.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2827211443.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2840801640.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2840801640.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2840801640.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index
new file mode 100644
index 0000000..a23eeda
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2866154576.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2866154576.index
new file mode 100644
index 0000000..0235e49
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2866154576.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2873934814.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2873934814.index
new file mode 100644
index 0000000..53198b3
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2873934814.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2876569663.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2876569663.index
new file mode 100644
index 0000000..da584a2
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2876569663.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2886414589.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2886414589.index
new file mode 100644
index 0000000..242bdd9
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2886414589.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2920302435.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2920302435.index
new file mode 100644
index 0000000..a0dfad9
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2920302435.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2997081707.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2997081707.index
new file mode 100644
index 0000000..dcf29f1
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/2997081707.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3023681961.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3023681961.index
new file mode 100644
index 0000000..9f3693d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3023681961.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3028879811.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3028879811.index
new file mode 100644
index 0000000..2fccec6
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3028879811.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3034582973.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3034582973.index
new file mode 100644
index 0000000..569bd71
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3034582973.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3038461293.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3038461293.index
new file mode 100644
index 0000000..b859929
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3038461293.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3264606951.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3264606951.index
new file mode 100644
index 0000000..f597659
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3264606951.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3305734410.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3305734410.index
new file mode 100644
index 0000000..9a0b96d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3305734410.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3411788347.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3411788347.index
new file mode 100644
index 0000000..8f75acd
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3411788347.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3526314922.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3526314922.index
new file mode 100644
index 0000000..1ffbf1a
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3526314922.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/361111136.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/361111136.index
new file mode 100644
index 0000000..345d8a6
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/361111136.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3661160138.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3661160138.index
new file mode 100644
index 0000000..4793787
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3661160138.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3675635723.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3675635723.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3675635723.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3756262147.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3756262147.index
new file mode 100644
index 0000000..da1abf3
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3756262147.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3816164716.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3816164716.index
new file mode 100644
index 0000000..a344e5b
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3816164716.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3823939264.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3823939264.index
new file mode 100644
index 0000000..a5ad486
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3823939264.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3838977931.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3838977931.index
new file mode 100644
index 0000000..a803a39
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3838977931.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3958912187.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3958912187.index
new file mode 100644
index 0000000..1f380a5
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3958912187.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3973075560.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3973075560.index
new file mode 100644
index 0000000..9e3995a
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/3973075560.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4169219086.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4169219086.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4169219086.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4171298298.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4171298298.index
new file mode 100644
index 0000000..9afca20
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4171298298.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4245344279.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4245344279.index
new file mode 100644
index 0000000..de366b8
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4245344279.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4257325822.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4257325822.index
new file mode 100644
index 0000000..c1dbd5f
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4257325822.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4277781418.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4277781418.index
new file mode 100644
index 0000000..6c110f4
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/4277781418.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/493040035.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/493040035.index
new file mode 100644
index 0000000..66762af
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/493040035.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/513130945.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/513130945.index
new file mode 100644
index 0000000..cf70b5f
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/513130945.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/561483598.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/561483598.index
new file mode 100644
index 0000000..24f473d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/561483598.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/598645799.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/598645799.index
new file mode 100644
index 0000000..a964964
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/598645799.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/628464451.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/628464451.index
new file mode 100644
index 0000000..569bd71
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/628464451.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/662129271.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/662129271.index
new file mode 100644
index 0000000..97af37d
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/662129271.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/680738220.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/680738220.index
new file mode 100644
index 0000000..92518a4
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/680738220.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/685495921.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/685495921.index
new file mode 100644
index 0000000..746eb02
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/685495921.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/713790025.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/713790025.index
new file mode 100644
index 0000000..0c372d0
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/713790025.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/745870794.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/745870794.index
new file mode 100644
index 0000000..a637aa6
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/745870794.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/889102377.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/889102377.index
new file mode 100644
index 0000000..0204293
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/889102377.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/954628911.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/954628911.index
new file mode 100644
index 0000000..edab3f8
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/954628911.index differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
index 593f470..f227e49 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
new file mode 100644
index 0000000..545ac43
Binary files /dev/null and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt
new file mode 100644
index 0000000..ef54136
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt
@@ -0,0 +1 @@
+INDEX VERSION 1.129
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
new file mode 100644
index 0000000..8586397
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
@@ -0,0 +1 @@
+java
\ No newline at end of file
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
index 593f470..198b394 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
new file mode 100644
index 0000000..3f9b0dd
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
@@ -0,0 +1,79 @@
+INDEX VERSION 1.129+D:\ARECH\Documents\MinecraftModding\OrbitalBombardment-2.0-1.7.10\eclipse\.metadata\.plugins\org.eclipse.jdt.core
+3305734410.index
+4277781418.index
+1305655923.index
+561483598.index
+3838977931.index
+4171298298.index
+3661160138.index
+4169219086.index
+1616963895.index
+1858897955.index
+3411788347.index
+745870794.index
+3675635723.index
+1363380408.index
+3958912187.index
+2866154576.index
+1850794102.index
+1884985995.index
+1793249213.index
+2037292668.index
+954628911.index
+1944372739.index
+2469754730.index
+1031062034.index
+1097412145.index
+2483765885.index
+1896760521.index
+3823939264.index
+2724105677.index
+186815308.index
+3756262147.index
+1260374096.index
+361111136.index
+4257325822.index
+3973075560.index
+628464451.index
+2827211443.index
+2814825160.index
+713790025.index
+1259842432.index
+598645799.index
+2997081707.index
+1834775697.index
+2617162989.index
+3526314922.index
+2353711714.index
+680738220.index
+1927192158.index
+3023681961.index
+3028879811.index
+1252128141.index
+889102377.index
+4245344279.index
+1297580988.index
+2840801640.index
+1091608142.index
+3816164716.index
+2597019815.index
+3034582973.index
+1901452023.index
+2095596375.index
+662129271.index
+1316314897.index
+3264606951.index
+2391615764.index
+1357421196.index
+3038461293.index
+2876569663.index
+2920302435.index
+1130872821.index
+2873934814.index
+286606776.index
+1123956748.index
+513130945.index
+2211164785.index
+2886414589.index
+493040035.index
+685495921.index
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
index 0edae4b..f9f7c7a 100644
Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
new file mode 100644
index 0000000..be59699
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml b/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
new file mode 100644
index 0000000..a1bec29
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
index 9e390f5..a256d99 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
@@ -1,2 +1,63 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
index 76ff0aa..307f1b4 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
+++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
@@ -1,10 +1,31 @@
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.history b/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.history
new file mode 100644
index 0000000..a540ad0
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.history
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.index b/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.index
new file mode 100644
index 0000000..1829d5a
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Minecraft/2016/7/27/refactorings.index
@@ -0,0 +1,18 @@
+1467663834983 Delete element
+1467710206670 Delete element
+1467728988222 Delete element
+1467729589123 Delete elements
+1467732512868 Delete element
+1467732813662 Delete element
+1467732894786 Delete element
+1467733149225 Delete element
+1467733214415 Delete element
+1467733437905 Delete element
+1467736946644 Delete element
+1467808519387 Delete element
+1467809558412 Delete element
+1467809894478 Delete element
+1467809971472 Delete elements
+1467910181376 Delete elements
+1467916498366 Delete element
+1467919234965 Delete elements
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
new file mode 100644
index 0000000..0b0c3a2
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
@@ -0,0 +1,12 @@
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml b/eclipse/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml
new file mode 100644
index 0000000..e33758c
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml
@@ -0,0 +1,43 @@
+
+
+
+ %date [%thread] %-5level %logger{35} - %msg%n
+
+
+ OFF
+
+
+
+
+ ${org.eclipse.m2e.log.dir}/0.log
+
+ ${org.eclipse.m2e.log.dir}/%i.log
+ 1
+ 10
+
+
+ 100MB
+
+
+ %date [%thread] %-5level %logger{35} - %msg%n
+
+
+
+
+
+ WARN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml
new file mode 100644
index 0000000..50f1edb
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
new file mode 100644
index 0000000..b80fa31
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
@@ -0,0 +1,10 @@
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
new file mode 100644
index 0000000..5ad0ddb
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
index 851c296..ec55e7d 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
+++ b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
@@ -1,5 +1,9 @@
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
index 9376736..4731a2f 100644
--- a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
+++ b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/eclipse/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties b/eclipse/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
new file mode 100644
index 0000000..0d992f6
--- /dev/null
+++ b/eclipse/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
@@ -0,0 +1,3 @@
+#
+#Thu Jan 12 22:40:29 CET 2017
+task-tag-projects-already-scanned=
diff --git a/eclipse/.metadata/version.ini b/eclipse/.metadata/version.ini
index d067700..68ad024 100644
--- a/eclipse/.metadata/version.ini
+++ b/eclipse/.metadata/version.ini
@@ -1,3 +1,3 @@
-#Wed Jul 06 10:55:15 CEST 2016
+#Thu Jan 12 22:46:04 CET 2017
org.eclipse.core.runtime=2
-org.eclipse.platform=4.6.0.v20160525-2000
+org.eclipse.platform=4.6.0.v20160606-1100