diff --git a/build.properties b/build.properties index cfa38cf0..22d60b77 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Thu Jul 16 18:31:47 EDT 2015 +#Fri Jul 17 12:10:49 EDT 2015 mod_name=BloodMagic forge_version=10.13.4.1448-1.7.10 ccc_version=1.0.4.29 @@ -9,5 +9,5 @@ guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B +build_number=8 mc_version=1.7.10 -build_number=7 diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_air.png b/src/main/resources/assets/bloodutils/textures/blocks/area_air.png deleted file mode 100644 index 4fe5519d..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_air.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_air.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_air.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_air.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png b/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png deleted file mode 100644 index 831839fd..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_darkness.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png b/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png deleted file mode 100644 index 137ad65d..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_earth.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png b/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png deleted file mode 100644 index 230033d4..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_fire.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_light.png b/src/main/resources/assets/bloodutils/textures/blocks/area_light.png deleted file mode 100644 index d8650ad5..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_light.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_light.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_light.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_light.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png b/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png deleted file mode 100644 index bc3382dd..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_rainbow.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_water.png b/src/main/resources/assets/bloodutils/textures/blocks/area_water.png deleted file mode 100644 index 1b60e8c9..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/area_water.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/area_water.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/area_water.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/area_water.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/block_bloodDiamond.png b/src/main/resources/assets/bloodutils/textures/blocks/block_bloodDiamond.png deleted file mode 100644 index 0ad1e531..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/block_bloodDiamond.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/block_bloodIron.png b/src/main/resources/assets/bloodutils/textures/blocks/block_bloodIron.png deleted file mode 100644 index 1ad95d99..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/block_bloodIron.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/builder.png b/src/main/resources/assets/bloodutils/textures/blocks/builder.png deleted file mode 100644 index 4c5c6192..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/builder.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/discoball.png b/src/main/resources/assets/bloodutils/textures/blocks/discoball.png deleted file mode 100644 index 576c0289..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/discoball.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/discoball.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/discoball.png.mcmeta deleted file mode 100644 index df255549..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/discoball.png.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 6, - 5, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/essence_darkness.png b/src/main/resources/assets/bloodutils/textures/blocks/essence_darkness.png deleted file mode 100644 index 8af84933..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/essence_darkness.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/essence_light.png b/src/main/resources/assets/bloodutils/textures/blocks/essence_light.png deleted file mode 100644 index df123cf2..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/essence_light.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png b/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png deleted file mode 100644 index 07f0ee69..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png.mcmeta b/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png.mcmeta deleted file mode 100644 index 4275d180..00000000 --- a/src/main/resources/assets/bloodutils/textures/blocks/essence_rainbow.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 8, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/blocks/progress.png b/src/main/resources/assets/bloodutils/textures/blocks/progress.png deleted file mode 100644 index ccf8b1f4..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/blocks/progress.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/gui/altar.png b/src/main/resources/assets/bloodutils/textures/gui/altar.png deleted file mode 100644 index d287d05d..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/gui/altar.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/gui/crafting.png b/src/main/resources/assets/bloodutils/textures/gui/crafting.png deleted file mode 100644 index eee97376..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/gui/crafting.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/gui/front.png b/src/main/resources/assets/bloodutils/textures/gui/front.png deleted file mode 100644 index 67c7bf1b..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/gui/front.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/gui/guide.png b/src/main/resources/assets/bloodutils/textures/gui/guide.png deleted file mode 100644 index f99e309d..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/gui/guide.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/bloodShard_royal.png b/src/main/resources/assets/bloodutils/textures/items/bloodShard_royal.png deleted file mode 100644 index 30f584f9..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/bloodShard_royal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/diamond_blood.png b/src/main/resources/assets/bloodutils/textures/items/diamond_blood.png deleted file mode 100644 index 1d5cf9c6..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/diamond_blood.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_air.png b/src/main/resources/assets/bloodutils/textures/items/gem_air.png deleted file mode 100644 index 1c16c230..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_air.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_air.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_air.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_air.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png b/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png deleted file mode 100644 index 04d44fc1..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_darkness.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_earth.png b/src/main/resources/assets/bloodutils/textures/items/gem_earth.png deleted file mode 100644 index a8108ae9..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_earth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_earth.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_earth.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_earth.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_empty.png b/src/main/resources/assets/bloodutils/textures/items/gem_empty.png deleted file mode 100644 index fab0d2a7..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_empty.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_fire.png b/src/main/resources/assets/bloodutils/textures/items/gem_fire.png deleted file mode 100644 index 66b0cf83..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_fire.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_fire.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_fire.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_fire.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_light.png b/src/main/resources/assets/bloodutils/textures/items/gem_light.png deleted file mode 100644 index 3cad4c54..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_light.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_light.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_light.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_light.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png b/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png deleted file mode 100644 index 2ee41e32..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_rainbow.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_water.png b/src/main/resources/assets/bloodutils/textures/items/gem_water.png deleted file mode 100644 index f042df5e..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/gem_water.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/gem_water.png.mcmeta b/src/main/resources/assets/bloodutils/textures/items/gem_water.png.mcmeta deleted file mode 100644 index 3ca39cc0..00000000 --- a/src/main/resources/assets/bloodutils/textures/items/gem_water.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 3, - 2, - 1, - 0 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodutils/textures/items/guide.png b/src/main/resources/assets/bloodutils/textures/items/guide.png deleted file mode 100644 index b7cb1d99..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/guide.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/iron_blood.png b/src/main/resources/assets/bloodutils/textures/items/iron_blood.png deleted file mode 100644 index 5e7ed49b..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/iron_blood.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/sigil_advancedDivination.png b/src/main/resources/assets/bloodutils/textures/items/sigil_advancedDivination.png deleted file mode 100644 index 0afc91cb..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/sigil_advancedDivination.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/sigil_ritual.png b/src/main/resources/assets/bloodutils/textures/items/sigil_ritual.png deleted file mode 100644 index 235e6c53..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/sigil_ritual.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/items/tool_creative.png b/src/main/resources/assets/bloodutils/textures/items/tool_creative.png deleted file mode 100644 index 3722483e..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/items/tool_creative.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/misc/screenshots/t1.png b/src/main/resources/assets/bloodutils/textures/misc/screenshots/t1.png deleted file mode 100644 index 35ac670f..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/misc/screenshots/t1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/misc/tab.png b/src/main/resources/assets/bloodutils/textures/misc/tab.png deleted file mode 100644 index 4226a378..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/misc/tab.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/models/model_guide.png b/src/main/resources/assets/bloodutils/textures/models/model_guide.png deleted file mode 100644 index dba3d662..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/models/model_guide.png and /dev/null differ diff --git a/src/main/resources/assets/bloodutils/textures/models/model_reviver.png b/src/main/resources/assets/bloodutils/textures/models/model_reviver.png deleted file mode 100644 index 96b286ac..00000000 Binary files a/src/main/resources/assets/bloodutils/textures/models/model_reviver.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_blood.png b/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_blood.png deleted file mode 100644 index d52684dc..00000000 Binary files a/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_blood.png and /dev/null differ