From 67060294a695860abb73dd2c1f2999d7202da94c Mon Sep 17 00:00:00 2001
From: kitsushadow <spikespiegel19@gmail.com>
Date: Sat, 18 Jul 2015 01:54:42 -0400
Subject: [PATCH] update?

---
 .../2.0/taskArtifacts/cache.properties.lock   | Bin 17 -> 17 bytes
 .gradle/2.0/taskArtifacts/fileHashes.bin      | Bin 257625 -> 257625 bytes
 .gradle/2.0/taskArtifacts/fileSnapshots.bin   | Bin 2141128 -> 2141128 bytes
 .gradle/2.0/taskArtifacts/taskArtifacts.bin   | Bin 31523 -> 31523 bytes
 .gradle/gradle.log                            |  36 +++---------------
 .settings/org.eclipse.jdt.core.prefs          |   2 +-
 6 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock
index 189cdfff2b690a71134b888c4241a1dd90712f47..e062a1289db2e748b3816117f895272744c2ae2e 100644
GIT binary patch
literal 17
VcmZS9*&j0BY(s<!0~l!T1OO_x1SS9g

literal 17
VcmZS9*&j0BY(s<!0~lz|2LLLa1PlNG

diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin
index d421afeb95e8e8c30cab72d76e3fc8aba73addd5..bc85aa0beb5eae2fc2b3957cdb631397847e54e6 100644
GIT binary patch
delta 118
zcmcb4hyUgs{)R1#WwIjkcSTt+fPqgmi2BNNn{9fREMpXs3}YflX5#8g6Q}=>Wpvkw
w_fii1zV|vurg(1KY}PqH85kJ-5auvtgH->ki}Y?!mtzECrtRr+%%9E!0ATqe%m4rY

delta 118
zcmcb4hyUgs{)R1#WwIiL1s4x6fPqgmh*C*?Q!u?tmN5!RhA|N&<8bKd^XWfi8QnF6
wI#=rEzj$%CbK!mIAj6MW7#JA+5auvtgH(SD_epI}mtzECrtRr+%%9E!03aAA4gdfE

diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
index 3b296fd0598dcf113585cb25decdc27649666826..aa6731097a58bedaeda4e181c3c06ad2580bd395 100644
GIT binary patch
delta 417
zcmX?cy@~Mz5KoXX^Y3I}V2}V}APCR~5}{xwL%<9m9R^|hWCH1MsQ5b|T{tnQhUM5T
z{gWFX+KNy7z&}||!iuAL=0T><wlgdyCrCI<-XU>7;HbUNB9{ocT@a1_3nv#yKG>Wg
zHG^@ogp7oM&%gYfEZ(XQ5Lv%tlO1FfCRfN92qcLtI>`6xXbDuC(c}d(83F~rryf^5
zyCNGZC^bnoK%jQ_QD?(ifn`t=R3|6Mim=QVGztJSPG30h17@&z&3q4X=f)4s!kYs;
zUb9VJ7~sho<hoZddUBwTEMv;#F9GSSX$2Nl&p`ZUgMfB}07f8Y0%B$$W&vVWAZ7z%
zb|B^eVoo6D0%C3;<^f_}Am#&NejpYAVnHAl0%Bnx76D>WAQl5+aUhleVo4yD0%B<(
TmH}c}AeIAS`RxV)3NxYst{8jl

delta 431
zcmX?cy@~Mz5KoXX^HXJDV2}V}An-c|BtpPUh5&6K9SULl8v*HXD0?B0E}9rr!@|y=
zeP`oCTk(k>_$SLrSaGySDSj&7r<^r8LBc^`LbjsMvDB&ap_)1;&yYAVxkB=Wz}E@=
zTO}Xl@IWL2W^DG5TEHk^w)5q#K9-qBp~|HuKaf@saGaW3yr=f|PN>p%lLcfH1bi#?
zHz~KBa)t={WKPzQv6x&TlQ8*%jK|~*Sss?N_mr|HC&-GhgviAH1v5DBMy>`qbmNC+
z;mrXauh}>pfw~<T8MjW}7^5{g$Ddo!e}!-{`(}Apu&EwKv!W*l`p8bc>+`#LVL<!B
z07f8Y0%B$$W&vVWAZ7z%b|B^eVoo6D0%C3;<^f_}Am#&NejpYAVnHAl0%Bnx76D>W
jAQl5+aUhleVo4yD0%B<(mH}c}AeIAS`Rxk>6x5>uLY<2*

diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
index 31f477064372c99c4ff64571d386e5d7a11a3ab9..97cf8f157ce3747a3fead19cc42f746405b8c784 100644
GIT binary patch
delta 160
zcmZ4djdAfe#tqkk1n#mcMb%GO5Y;gKQq(28&(@PdYBpaBl48_g0D{NU?;Ss5%)r3-
z8i*f*Ftd)=M8S+#^Myn`Pru^*diBem$s5A;CiD6UPF4*I*gQGJ38K@;vh@sD=VG9)
z*&xg;cR`k0rDV#kOa3N(jaL3o4oqeY(Vu)T++%Z3m=Gfe$Ue=seu2$;5nq)6;7>Z&

delta 170
zcmZ4djdAfe#tqkkHYWv3F$!cGtT`V&dtPX$1iSnW!^7t${||PbtQ%}9&Hw}nWue+<
zj2RdhUjy-D5N6(N9O}d<C~^PY?(19GU&v^Bhriu6Q+dy1#t^;9yncd{ABO~hwMug7
zNr1I325OrP!pxgR!i5+Gb*4UQsmyQiNUNDrnP@oM?7*ZD{mFO3MJGQDGv)wU+VWGn
KYqMU&S0w;XnL7^v

diff --git a/.gradle/gradle.log b/.gradle/gradle.log
index 9ef93fb7..0c5b7f2a 100644
--- a/.gradle/gradle.log
+++ b/.gradle/gradle.log
@@ -5,37 +5,11 @@
  R4wk, ZeuX, IngisKahn, bspkrs
  MCP Data version : unknown
 ****************************
-: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
-:jar
-:compileTestJava UP-TO-DATE
-:processTestResources UP-TO-DATE
-:testClasses UP-TO-DATE
-:test UP-TO-DATE
-:extractMcpData UP-TO-DATE
-:getVersionJson
-:extractUserDev UP-TO-DATE
-:genSrgs SKIPPED
-:reobf
-:assemble
-:check UP-TO-DATE
-:build
+:eclipseClasspath
+:eclipseJdt
+:eclipseProject
+:eclipse
 
 BUILD SUCCESSFUL
 
-<<<<<<< HEAD
-Total time: 9.983 secs
-=======
-Total time: 13.559 secs
->>>>>>> 16825054b0ee5f4bff3059db84297822fc100352
+Total time: 5.443 secs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 24631e36..299be789 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Mon Jul 13 00:27:19 EDT 2015
+#Sat Jul 18 01:54:27 EDT 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve