diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index 0b06a9b2..ee81399d 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 index bc79a052..e6efd41a 100644 Binary files a/.gradle/2.0/taskArtifacts/fileHashes.bin 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 787bdfc2..f2c51a05 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 index 1e251919..2760e32c 100644 Binary files a/.gradle/2.0/taskArtifacts/outputFileStates.bin 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 7b0d2a55..4a10efd8 100644 Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 90f0f955..81140b3b 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -5,11 +5,28 @@ R4wk, ZeuX, IngisKahn, bspkrs MCP Data version : unknown **************************** -:eclipseClasspath -:eclipseJdt -:eclipseProject -:eclipse +:cleanTest UP-TO-DATE +:compileApiJava UP-TO-DATE +:processApiResources UP-TO-DATE +:apiClasses UP-TO-DATE +:sourceMainJava +:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6 +Note: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +1 warning + +:processResources +:classes +:compileTestJava UP-TO-DATE +:processTestResources UP-TO-DATE +:testClasses UP-TO-DATE +:test + + +:test UP-TO-DATE BUILD SUCCESSFUL -Total time: 22.646 secs +Total time: 4.199 secs diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..b12a62a6 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ForgeCraft \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..96cc43ef --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..0314d94b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle___forgeSrc_1_7_10_10_13_4_1448_1_7_10.xml b/.idea/libraries/Gradle___forgeSrc_1_7_10_10_13_4_1448_1_7_10.xml new file mode 100644 index 00000000..5b0dccfb --- /dev/null +++ b/.idea/libraries/Gradle___forgeSrc_1_7_10_10_13_4_1448_1_7_10.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml new file mode 100644 index 00000000..63b7b354 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml new file mode 100644 index 00000000..a914c7d1 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml new file mode 100644 index 00000000..cb03358c --- /dev/null +++ b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_ibm_icu_icu4j_core_mojang_51_2.xml b/.idea/libraries/Gradle__com_ibm_icu_icu4j_core_mojang_51_2.xml new file mode 100644 index 00000000..4175be5f --- /dev/null +++ b/.idea/libraries/Gradle__com_ibm_icu_icu4j_core_mojang_51_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_mojang_authlib_1_5_16.xml b/.idea/libraries/Gradle__com_mojang_authlib_1_5_16.xml new file mode 100644 index 00000000..1b0e68a7 --- /dev/null +++ b/.idea/libraries/Gradle__com_mojang_authlib_1_5_16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_mojang_realms_1_3_5.xml b/.idea/libraries/Gradle__com_mojang_realms_1_3_5.xml new file mode 100644 index 00000000..04163a66 --- /dev/null +++ b/.idea/libraries/Gradle__com_mojang_realms_1_3_5.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_paulscode_codecjorbis_20101023.xml b/.idea/libraries/Gradle__com_paulscode_codecjorbis_20101023.xml new file mode 100644 index 00000000..04773eaf --- /dev/null +++ b/.idea/libraries/Gradle__com_paulscode_codecjorbis_20101023.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_paulscode_codecwav_20101023.xml b/.idea/libraries/Gradle__com_paulscode_codecwav_20101023.xml new file mode 100644 index 00000000..b345a4bc --- /dev/null +++ b/.idea/libraries/Gradle__com_paulscode_codecwav_20101023.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_paulscode_libraryjavasound_20101123.xml b/.idea/libraries/Gradle__com_paulscode_libraryjavasound_20101123.xml new file mode 100644 index 00000000..dd579258 --- /dev/null +++ b/.idea/libraries/Gradle__com_paulscode_libraryjavasound_20101123.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_paulscode_librarylwjglopenal_20100824.xml b/.idea/libraries/Gradle__com_paulscode_librarylwjglopenal_20100824.xml new file mode 100644 index 00000000..7c8a6ec1 --- /dev/null +++ b/.idea/libraries/Gradle__com_paulscode_librarylwjglopenal_20100824.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_paulscode_soundsystem_20120107.xml b/.idea/libraries/Gradle__com_paulscode_soundsystem_20120107.xml new file mode 100644 index 00000000..5037b882 --- /dev/null +++ b/.idea/libraries/Gradle__com_paulscode_soundsystem_20120107.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_typesafe_akka_akka_actor_2_11_2_3_3.xml b/.idea/libraries/Gradle__com_typesafe_akka_akka_actor_2_11_2_3_3.xml new file mode 100644 index 00000000..8878db07 --- /dev/null +++ b/.idea/libraries/Gradle__com_typesafe_akka_akka_actor_2_11_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_typesafe_config_1_2_1.xml b/.idea/libraries/Gradle__com_typesafe_config_1_2_1.xml new file mode 100644 index 00000000..c4cd9e64 --- /dev/null +++ b/.idea/libraries/Gradle__com_typesafe_config_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml new file mode 100644 index 00000000..e28b29b1 --- /dev/null +++ b/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml b/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml new file mode 100644 index 00000000..4fce9aa2 --- /dev/null +++ b/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml new file mode 100644 index 00000000..b2369562 --- /dev/null +++ b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_netty_netty_all_4_0_10_Final.xml b/.idea/libraries/Gradle__io_netty_netty_all_4_0_10_Final.xml new file mode 100644 index 00000000..07f25a9f --- /dev/null +++ b/.idea/libraries/Gradle__io_netty_netty_all_4_0_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__java3d_vecmath_1_3_1.xml b/.idea/libraries/Gradle__java3d_vecmath_1_3_1.xml new file mode 100644 index 00000000..46877016 --- /dev/null +++ b/.idea/libraries/Gradle__java3d_vecmath_1_3_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__lzma_lzma_0_0_1.xml b/.idea/libraries/Gradle__lzma_lzma_0_0_1.xml new file mode 100644 index 00000000..2244edc3 --- /dev/null +++ b/.idea/libraries/Gradle__lzma_lzma_0_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_jinput_jinput_2_0_5.xml b/.idea/libraries/Gradle__net_java_jinput_jinput_2_0_5.xml new file mode 100644 index 00000000..dec6c5ff --- /dev/null +++ b/.idea/libraries/Gradle__net_java_jinput_jinput_2_0_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_linux.xml b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_linux.xml new file mode 100644 index 00000000..4eeffdab --- /dev/null +++ b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_linux.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_osx.xml b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_osx.xml new file mode 100644 index 00000000..9551c286 --- /dev/null +++ b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_osx.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_windows.xml b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_windows.xml new file mode 100644 index 00000000..0aba83e5 --- /dev/null +++ b/.idea/libraries/Gradle__net_java_jinput_jinput_platform_2_0_5_natives_windows.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_jutils_jutils_1_0_0.xml b/.idea/libraries/Gradle__net_java_jutils_jutils_1_0_0.xml new file mode 100644 index 00000000..a482b3c0 --- /dev/null +++ b/.idea/libraries/Gradle__net_java_jutils_jutils_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_minecraft_launchwrapper_1_11.xml b/.idea/libraries/Gradle__net_minecraft_launchwrapper_1_11.xml new file mode 100644 index 00000000..d39b42fc --- /dev/null +++ b/.idea/libraries/Gradle__net_minecraft_launchwrapper_1_11.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_4_5.xml b/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_4_5.xml new file mode 100644 index 00000000..0ce9c041 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml b/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml new file mode 100644 index 00000000..bdb963fd --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml b/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml new file mode 100644 index 00000000..50e0d40a --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 00000000..f2e6ea4d --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_3.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_3.xml new file mode 100644 index 00000000..4f27e292 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml new file mode 100644 index 00000000..5c09472b --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_0_beta9.xml b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_0_beta9.xml new file mode 100644 index 00000000..34025841 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_0_beta9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_0_beta9.xml b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_0_beta9.xml new file mode 100644 index 00000000..0dc22cb9 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_0_beta9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_2_9_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_2_9_1.xml new file mode 100644 index 00000000..27f68fcf --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_linux.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_linux.xml new file mode 100644 index 00000000..c4c776b1 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_linux.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_osx.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_osx.xml new file mode 100644 index 00000000..0445b759 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_osx.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_windows.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_windows.xml new file mode 100644 index 00000000..bed2b036 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_platform_2_9_1_natives_windows.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_util_2_9_1.xml b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_util_2_9_1.xml new file mode 100644 index 00000000..5a1ef086 --- /dev/null +++ b/.idea/libraries/Gradle__org_lwjgl_lwjgl_lwjgl_util_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_ow2_asm_asm_debug_all_5_0_3.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_debug_all_5_0_3.xml new file mode 100644 index 00000000..4cfd6f2c --- /dev/null +++ b/.idea/libraries/Gradle__org_ow2_asm_asm_debug_all_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_modules_scala_parser_combinators_2_11_1_0_1.xml b/.idea/libraries/Gradle__org_scala_lang_modules_scala_parser_combinators_2_11_1_0_1.xml new file mode 100644 index 00000000..6d48ba48 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_modules_scala_parser_combinators_2_11_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_modules_scala_xml_2_11_1_0_2.xml b/.idea/libraries/Gradle__org_scala_lang_modules_scala_xml_2_11_1_0_2.xml new file mode 100644 index 00000000..4feb81d1 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_modules_scala_xml_2_11_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_library_2_11_1_0_2.xml b/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_library_2_11_1_0_2.xml new file mode 100644 index 00000000..604a8d65 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_library_2_11_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_plugin_2_11_1_1_0_2.xml b/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_plugin_2_11_1_1_0_2.xml new file mode 100644 index 00000000..d87e06d4 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_plugins_scala_continuations_plugin_2_11_1_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_actors_2_11_0.xml b/.idea/libraries/Gradle__org_scala_lang_scala_actors_2_11_0.xml new file mode 100644 index 00000000..277f9348 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_actors_2_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_actors_migration_2_11_1_1_0.xml b/.idea/libraries/Gradle__org_scala_lang_scala_actors_migration_2_11_1_1_0.xml new file mode 100644 index 00000000..de120ade --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_actors_migration_2_11_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_compiler_2_11_1.xml b/.idea/libraries/Gradle__org_scala_lang_scala_compiler_2_11_1.xml new file mode 100644 index 00000000..d14ebbbd --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_compiler_2_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_library_2_11_1.xml b/.idea/libraries/Gradle__org_scala_lang_scala_library_2_11_1.xml new file mode 100644 index 00000000..0e82aac5 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_library_2_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_parser_combinators_2_11_1_0_1.xml b/.idea/libraries/Gradle__org_scala_lang_scala_parser_combinators_2_11_1_0_1.xml new file mode 100644 index 00000000..a1c9557d --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_parser_combinators_2_11_1_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_reflect_2_11_1.xml b/.idea/libraries/Gradle__org_scala_lang_scala_reflect_2_11_1.xml new file mode 100644 index 00000000..4b535113 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_reflect_2_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_swing_2_11_1_0_1.xml b/.idea/libraries/Gradle__org_scala_lang_scala_swing_2_11_1_0_1.xml new file mode 100644 index 00000000..60fb03f4 --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_swing_2_11_1_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_scala_lang_scala_xml_2_11_1_0_2.xml b/.idea/libraries/Gradle__org_scala_lang_scala_xml_2_11_1_0_2.xml new file mode 100644 index 00000000..c54c3d2d --- /dev/null +++ b/.idea/libraries/Gradle__org_scala_lang_scala_xml_2_11_1_0_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_5_16.xml b/.idea/libraries/Gradle__tv_twitch_twitch_5_16.xml new file mode 100644 index 00000000..54857349 --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_5_16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_32.xml b/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_32.xml new file mode 100644 index 00000000..12661b86 --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_32.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_64.xml b/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_64.xml new file mode 100644 index 00000000..5c44c6cf --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_external_platform_4_5_natives_windows_64.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_osx.xml b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_osx.xml new file mode 100644 index 00000000..d6338b7c --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_osx.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_32.xml b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_32.xml new file mode 100644 index 00000000..ce7805f5 --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_32.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_64.xml b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_64.xml new file mode 100644 index 00000000..2beafaec --- /dev/null +++ b/.idea/libraries/Gradle__tv_twitch_twitch_platform_5_16_natives_windows_64.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..5f8ff066 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..9c71d037 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..02637b5b --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,978 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1437621239197 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ForgeCraft.iml b/ForgeCraft.iml new file mode 100644 index 00000000..613269a0 --- /dev/null +++ b/ForgeCraft.iml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ForgeCraft.ipr b/ForgeCraft.ipr new file mode 100644 index 00000000..9dc3d934 --- /dev/null +++ b/ForgeCraft.ipr @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6 + + + + + + + + + + + + + diff --git a/ForgeCraft.iws b/ForgeCraft.iws new file mode 100644 index 00000000..051c30de --- /dev/null +++ b/ForgeCraft.iws @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class b/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class index 74ad0b08..01bc5b25 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class and b/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class 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 0ab624d8..13d85410 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/1.tree b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree deleted file mode 100644 index ed024b1f..00000000 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree and /dev/null 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 6ca29b29..b7056e54 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.debug.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs index 94c56761..b94a4cb1 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=\n\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 12ec3689..d4a29076 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,14 @@ -#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.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 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 index 65922257..41a6209c 100644 --- 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 @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_VM_XML=\n\n\n\n\n\n +org.eclipse.jdt.launching.PREF_VM_XML=\n\n\n\n\n\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 f6fdb7d8..6ea51ee6 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,3 +1,4 @@ +content_assist_number_of_computers=18 content_assist_proposals_background=18,18,18 content_assist_proposals_foreground=252,252,252 eclipse.preferences.version=1 diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs index 316ef6f3..e009325b 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -1,4 +1,3 @@ -#Sun Jun 05 18:58:05 CEST 2011 -spacesForTabs=true eclipse.preferences.version=1 overviewRuler_migration=migrated_3.1 +spacesForTabs=true 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 6da5dc73..0910615d 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=1434100492460 +platformState=1437259392565 quickStart=false tipsAndTricks=true diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs index 6316221b..8d9c76ca 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -1,3 +1,5 @@ ENABLED_DECORATORS=org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.SymlinkDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false, PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; eclipse.preferences.version=1 +editors=\n\n\n\n\n\n\n\n\n\n +resourcetypes=\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml index 1208f602..6655c8c7 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml +++ b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -1,24 +1,24 @@ - - + + + + + - - - - - + + - - + + diff --git a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 63dc9506..c90db9f6 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,14 +1,15 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + topLevel + shellMaximized @@ -90,31 +91,31 @@ - - + + - - + + newtablook - + - + newtablook org.eclipse.e4.secondaryNavigationStack - + - + newtablook org.eclipse.e4.secondaryDataStack - + @@ -140,15 +141,39 @@ View categoryTag:Help - - + + newtablook org.eclipse.e4.primaryDataStack EditorStack + + + 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 @@ -172,14 +197,14 @@ categoryTag:General - + View categoryTag:General ViewMenu menuContribution:menu - + View @@ -194,8 +219,14 @@ categoryTag:General + View categoryTag:General + + ViewMenu + menuContribution:menu + + View @@ -213,7 +244,7 @@ ViewMenu menuContribution:menu - + View @@ -239,7 +270,7 @@ ViewMenu menuContribution:menu - + View @@ -256,12 +287,15 @@ Draggable - + toolbarSeparator + + Draggable + Draggable @@ -277,7 +311,7 @@ Draggable - + toolbarSeparator @@ -1946,6 +1980,10 @@ + + + + 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 index 089507de..d307e812 100644 --- 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 @@ -9,11 +9,6 @@ - - .link0 - 2 - /home/kitsufattop/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1448-1.7.10/start - .link1 2 diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index index ab3baa93..f1a73f02 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache index 41c77a16..321dcf1b 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 index 47b7ad21..e3a5b4e4 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache index 16ca1654..d3c6a5e7 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 index a1813db7..346e508c 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -32,14 +32,14 @@ INDEX VERSION 1.127+/home/kitsudesktop/Development/ForgeCraft/eclipse/.metadata/ 477019728.index 953586732.index 2779764988.index -3973669341.index 1739000648.index +3973669341.index 2102142672.index 3591913134.index 135292806.index 1155683227.index -944496423.index 208370467.index +944496423.index 742522455.index 62093115.index 1491957848.index @@ -47,8 +47,8 @@ INDEX VERSION 1.127+/home/kitsudesktop/Development/ForgeCraft/eclipse/.metadata/ 1913109094.index 378217139.index 276287408.index -2268700320.index 3471536732.index +2268700320.index 4268974357.index 120211678.index 1773673397.index diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat index 761339af..0d4f24fe 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.ui/dialog_settings.xml b/eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index 083396f1..0b26fe42 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,19 @@
- + - +
+
+
+
+ +
+
+
+
+
diff --git a/eclipse/.metadata/.plugins/org.eclipse.team.cvs.core/.running b/eclipse/.metadata/.plugins/org.eclipse.team.cvs.core/.running deleted file mode 100644 index e69de29b..00000000 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 7bef4ab1..7bd1bf38 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -12,4 +12,6 @@ +
+
diff --git a/eclipse/.metadata/version.ini b/eclipse/.metadata/version.ini index b4fd95f9..7214a800 100644 --- a/eclipse/.metadata/version.ini +++ b/eclipse/.metadata/version.ini @@ -1,3 +1,3 @@ -#Tue Jul 21 23:05:58 EDT 2015 +#Thu Jul 23 18:07:23 EDT 2015 org.eclipse.core.runtime=2 org.eclipse.platform=4.4.2.v20150204-1700 diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java index 3d3a0608..5f206a02 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java @@ -111,8 +111,8 @@ public class RendererRegistry { MinecraftForgeClient.registerItemRenderer(ModItems.forgeHammer, new IRForgeHammer()); MinecraftForgeClient.registerItemRenderer(ModItems.inlayHammer, new IRInlayHammer()); - MinecraftForgeClient.registerItemRenderer(ModItems.itemModelArrow, new ItemRendererModelArrow()); - MinecraftForgeClient.registerItemRenderer(ModItems.itemIronTippedModelArrow, new ItemRendererITModelArrow()); + //MinecraftForgeClient.registerItemRenderer(ModItems.itemModelArrow, new ItemRendererModelArrow()); + //MinecraftForgeClient.registerItemRenderer(ModItems.itemIronTippedModelArrow, new ItemRendererITModelArrow()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.emptySoftCrucible), new ItemRendererSECrucible());