From cdeef8cde725e48f514848d0eea4bdd84b641472 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Wed, 4 Feb 2015 00:45:45 -0600 Subject: Final push for 1.1! --- .gradle/2.0/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.0/taskArtifacts/fileHashes.bin | Bin 2043024 -> 2043136 bytes .gradle/2.0/taskArtifacts/fileSnapshots.bin | Bin 8496980 -> 8496980 bytes .gradle/2.0/taskArtifacts/taskArtifacts.bin | Bin 59331 -> 59331 bytes .gradle/gradle.log | 2 +- .../broadsword/queensgold_broadsword_accessory.png | Bin 226 -> 0 bytes .../broadsword/queensgold_sword_accessory.png | Bin 0 -> 226 bytes .../items/longsword/dogbearium_longsword_blade.png | Bin 223 -> 0 bytes 8 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/tinker/textures/items/broadsword/queensgold_broadsword_accessory.png create mode 100644 src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png delete mode 100644 src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index b7dfac8..94c03be 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 0d5fc07..9851f55 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 b431474..2b2f4a2 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/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 6515d0e..f640fdc 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 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_broadsword_accessory.png deleted file mode 100644 index 142e3a6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_broadsword_accessory.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png b/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png new file mode 100644 index 0000000..142e3a6 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/broadsword/queensgold_sword_accessory.png 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 Binary files a/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png and /dev/null differ -- cgit v1.2.3