From b4b05403fda50307e2b35de91296ab9bb53c2baa Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Sat, 29 Apr 2017 22:20:58 -0500 Subject: Updated to TiCo 2.6.3 Added Zweihander Partially added Sheathe Partially added Crest Mount Partially added materials --- .../items/zweihander/_zweihander_blade.png | Bin 131 -> 0 bytes .../textures/items/zweihander/_zweihander_core.png | Bin 177 -> 0 bytes .../items/zweihander/_zweihander_guard.png | Bin 199 -> 0 bytes .../items/zweihander/_zweihander_handle.png | Bin 186 -> 0 bytes .../zweihander/beheading_zweihander_effect.png | Bin 261 -> 0 bytes .../items/zweihander/blaze_zweihander_effect.png | Bin 223 -> 0 bytes .../zweihander/bloodoath_zweihander_effect.png | Bin 638 -> 0 bytes .../bloodoath_zweihander_effect.png.mcmeta | 50 --------------------- .../zweihander/corpseivy_zweihander_effect.png | Bin 472 -> 0 bytes .../items/zweihander/diamond_zweihander_effect.png | Bin 146 -> 0 bytes .../items/zweihander/emerald_zweihander_effect.png | Bin 116 -> 0 bytes .../items/zweihander/flux_zweihander_effect.png | Bin 216 -> 0 bytes .../zweihander/greenmint_zweihander_blade.png | Bin 259 -> 0 bytes .../items/zweihander/greenmint_zweihander_core.png | Bin 264 -> 0 bytes .../zweihander/greenmint_zweihander_guard.png | Bin 272 -> 0 bytes .../zweihander/greenmint_zweihander_handle.png | Bin 280 -> 0 bytes .../zweihander/lapis_zweihander_effect (1).png | Bin 146 -> 0 bytes .../items/zweihander/lapis_zweihander_effect.png | Bin 146 -> 0 bytes .../zweihander/lava_zweihander_effect (1).png | Bin 141 -> 0 bytes .../items/zweihander/lava_zweihander_effect.png | Bin 141 -> 0 bytes .../zweihander/manacore_zweihander_effect.png | Bin 174 -> 0 bytes .../items/zweihander/moss_zweihander_effect.png | Bin 163 -> 0 bytes .../zweihander/necrotic_zweihander_effect.png | Bin 175 -> 0 bytes .../items/zweihander/piston_zweihander_effect.png | Bin 195 -> 0 bytes .../items/zweihander/quartz_zweihander_effect.png | Bin 173 -> 0 bytes .../items/zweihander/redmint_zweihander_blade.png | Bin 224 -> 0 bytes .../items/zweihander/redmint_zweihander_core.png | Bin 254 -> 0 bytes .../items/zweihander/redmint_zweihander_guard.png | Bin 261 -> 0 bytes .../items/zweihander/redmint_zweihander_handle.png | Bin 263 -> 0 bytes .../zweihander/redstone_zweihander_effect.png | Bin 137 -> 0 bytes .../zweihander/reinforced_zweihander_effect.png | Bin 191 -> 0 bytes .../zweihander/scabbing_zweihander_effect.png | Bin 255 -> 0 bytes .../items/zweihander/silk_zweihander_effect.png | Bin 187 -> 0 bytes .../items/zweihander/smite_zweihander_effect.png | Bin 307 -> 0 bytes .../items/zweihander/spider_zweihander_effect.png | Bin 162 -> 0 bytes .../zweihander/terracore_zweihander_effect.png | Bin 175 -> 0 bytes .../zweihander/textbook_zweihander_effect.png | Bin 143 -> 0 bytes 37 files changed, 50 deletions(-) delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png (limited to 'src/main/resources/assets/tinker/textures/items') diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png deleted file mode 100644 index 05ee7ad..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png deleted file mode 100644 index 9106565..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png deleted file mode 100644 index 70bf386..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png deleted file mode 100644 index edf805d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png deleted file mode 100644 index 64d883e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png deleted file mode 100644 index 8563571..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png deleted file mode 100644 index f2d35ef..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta b/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta deleted file mode 100644 index 191c85a..0000000 --- a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta +++ /dev/null @@ -1,50 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 3, - 2, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 2, - 3, - 3, - 3, - 3 - ] - } -} diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png deleted file mode 100644 index e77311c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png deleted file mode 100644 index 795efe6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png deleted file mode 100644 index 8164a71..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png deleted file mode 100644 index 804447e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png deleted file mode 100644 index 3e2ec7b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png deleted file mode 100644 index 7ce220b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png deleted file mode 100644 index 6e1980f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png deleted file mode 100644 index ecbe5f3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png deleted file mode 100644 index cfe6390..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png deleted file mode 100644 index cfe6390..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png deleted file mode 100644 index 454f57a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png deleted file mode 100644 index 454f57a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png deleted file mode 100644 index e0e79c9..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png deleted file mode 100644 index 9cd743a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png deleted file mode 100644 index 5f81bf4..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png deleted file mode 100644 index dc9af5a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png deleted file mode 100644 index 8cc7817..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png deleted file mode 100644 index edc328a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png deleted file mode 100644 index 98b5f54..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png deleted file mode 100644 index c0beeb3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png deleted file mode 100644 index 5e999d8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png deleted file mode 100644 index 4a601eb..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png deleted file mode 100644 index bb66d4e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png deleted file mode 100644 index 7e0551a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png deleted file mode 100644 index 92c910a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png deleted file mode 100644 index 830c2df..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png deleted file mode 100644 index df3bf8e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png deleted file mode 100644 index ebb74c2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png deleted file mode 100644 index d65cae8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png and /dev/null differ -- cgit v1.2.3