summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance5057 <Lance5057@gmail.com>2015-02-04 00:45:45 -0600
committerLance5057 <Lance5057@gmail.com>2015-02-04 00:45:45 -0600
commitcdeef8cde725e48f514848d0eea4bdd84b641472 (patch)
tree487a209e9987e5a831818848006c5ba6b2b9ef09
parent001ee053d5cc1f1e1f878a088a7005af93174792 (diff)
Final push for 1.1!
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties.lockbin17 -> 17 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileHashes.binbin2043024 -> 2043136 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileSnapshots.binbin8496980 -> 8496980 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/taskArtifacts.binbin59331 -> 59331 bytes
-rw-r--r--.gradle/gradle.log2
-rw-r--r--src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png (renamed from src/main/resources/assets/tinker/textures/items/broadsword/queensgold_broadsword_accessory.png)bin226 -> 226 bytes
-rw-r--r--src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.pngbin223 -> 0 bytes
7 files changed, 1 insertions, 1 deletions
diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock
index b7dfac8..94c03be 100644
--- a/.gradle/2.0/taskArtifacts/cache.properties.lock
+++ b/.gradle/2.0/taskArtifacts/cache.properties.lock
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin
index 0d5fc07..9851f55 100644
--- a/.gradle/2.0/taskArtifacts/fileHashes.bin
+++ b/.gradle/2.0/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
index b431474..2b2f4a2 100644
--- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin
+++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
index 6515d0e..f640fdc 100644
--- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin
+++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
index 2edddec..6c8542a 100644
--- a/.gradle/gradle.log
+++ b/.gradle/gradle.log
@@ -34,4 +34,4 @@
BUILD SUCCESSFUL
-Total time: 47.033 secs
+Total time: 40.356 secs
diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_broadsword_accessory.png b/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png
index 142e3a6..142e3a6 100644
--- a/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_broadsword_accessory.png
+++ b/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png
Binary files differ
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png b/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png
deleted file mode 100644
index 2975dc2..0000000
--- a/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png
+++ /dev/null
Binary files differ