That's one heck of a commit you've got there...

I may have got a bit behind with version control. A lot behind, in fact. Maybe I'll go back and split this sometime - then again, I probably won't. But hey, at least it's here!
This commit is contained in:
Electroblob77
2019-08-18 00:04:18 +01:00
parent 2680d02304
commit f37812be3e
1564 changed files with 47652 additions and 12984 deletions
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_earth"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_earth_0",
"rune": "ebwizardry:blocks/runestone_earth_1",
"overlay": "ebwizardry:blocks/runestone_earth_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_earth_0",
"rune": "ebwizardry:blocks/runestone_earth_2",
"overlay": "ebwizardry:blocks/runestone_earth_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_earth_0",
"rune": "ebwizardry:blocks/runestone_earth_3",
"overlay": "ebwizardry:blocks/runestone_earth_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_earth_0",
"rune": "ebwizardry:blocks/runestone_earth_4",
"overlay": "ebwizardry:blocks/runestone_earth_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_earth",
"top": "ebwizardry:blocks/runestone_earth_0",
"bottom": "ebwizardry:blocks/runestone_earth_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_earth_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_fire"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_fire_0",
"rune": "ebwizardry:blocks/runestone_fire_1",
"overlay": "ebwizardry:blocks/runestone_fire_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_fire_0",
"rune": "ebwizardry:blocks/runestone_fire_2",
"overlay": "ebwizardry:blocks/runestone_fire_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_fire_0",
"rune": "ebwizardry:blocks/runestone_fire_3",
"overlay": "ebwizardry:blocks/runestone_fire_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_fire_0",
"rune": "ebwizardry:blocks/runestone_fire_4",
"overlay": "ebwizardry:blocks/runestone_fire_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_fire",
"top": "ebwizardry:blocks/runestone_fire_0",
"bottom": "ebwizardry:blocks/runestone_fire_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_fire_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_healing"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_healing_0",
"rune": "ebwizardry:blocks/runestone_healing_1",
"overlay": "ebwizardry:blocks/runestone_healing_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_healing_0",
"rune": "ebwizardry:blocks/runestone_healing_2",
"overlay": "ebwizardry:blocks/runestone_healing_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_healing_0",
"rune": "ebwizardry:blocks/runestone_healing_3",
"overlay": "ebwizardry:blocks/runestone_healing_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_healing_0",
"rune": "ebwizardry:blocks/runestone_healing_4",
"overlay": "ebwizardry:blocks/runestone_healing_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_healing",
"top": "ebwizardry:blocks/runestone_healing_0",
"bottom": "ebwizardry:blocks/runestone_healing_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_healing_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_ice"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_ice_0",
"rune": "ebwizardry:blocks/runestone_ice_1",
"overlay": "ebwizardry:blocks/runestone_ice_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_ice_0",
"rune": "ebwizardry:blocks/runestone_ice_2",
"overlay": "ebwizardry:blocks/runestone_ice_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_ice_0",
"rune": "ebwizardry:blocks/runestone_ice_3",
"overlay": "ebwizardry:blocks/runestone_ice_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_ice_0",
"rune": "ebwizardry:blocks/runestone_ice_4",
"overlay": "ebwizardry:blocks/runestone_ice_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_ice",
"top": "ebwizardry:blocks/runestone_ice_0",
"bottom": "ebwizardry:blocks/runestone_ice_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_ice_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_lightning"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_lightning_0",
"rune": "ebwizardry:blocks/runestone_lightning_1",
"overlay": "ebwizardry:blocks/runestone_lightning_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_lightning_0",
"rune": "ebwizardry:blocks/runestone_lightning_2",
"overlay": "ebwizardry:blocks/runestone_lightning_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_lightning_0",
"rune": "ebwizardry:blocks/runestone_lightning_3",
"overlay": "ebwizardry:blocks/runestone_lightning_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_lightning_0",
"rune": "ebwizardry:blocks/runestone_lightning_4",
"overlay": "ebwizardry:blocks/runestone_lightning_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_lightning",
"top": "ebwizardry:blocks/runestone_lightning_0",
"bottom": "ebwizardry:blocks/runestone_lightning_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_lightning_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_necromancy"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_necromancy_0",
"rune": "ebwizardry:blocks/runestone_necromancy_1",
"overlay": "ebwizardry:blocks/runestone_necromancy_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_necromancy_0",
"rune": "ebwizardry:blocks/runestone_necromancy_2",
"overlay": "ebwizardry:blocks/runestone_necromancy_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_necromancy_0",
"rune": "ebwizardry:blocks/runestone_necromancy_3",
"overlay": "ebwizardry:blocks/runestone_necromancy_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_necromancy_0",
"rune": "ebwizardry:blocks/runestone_necromancy_4",
"overlay": "ebwizardry:blocks/runestone_necromancy_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_necromancy",
"top": "ebwizardry:blocks/runestone_necromancy_0",
"bottom": "ebwizardry:blocks/runestone_necromancy_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_necromancy_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/obsidian_crust_0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/obsidian_crust_1"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/obsidian_crust_2"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/obsidian_crust_3"
}
}
@@ -0,0 +1,27 @@
{
"parent": "block/block",
"textures": {
"particle": "#rune"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "up" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" }
}
}
]
}
@@ -0,0 +1,30 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" }
}
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ebwizardry:blocks/crystal_block_sorcery"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_sorcery_0",
"rune": "ebwizardry:blocks/runestone_sorcery_1",
"overlay": "ebwizardry:blocks/runestone_sorcery_1_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_sorcery_0",
"rune": "ebwizardry:blocks/runestone_sorcery_2",
"overlay": "ebwizardry:blocks/runestone_sorcery_2_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_sorcery_0",
"rune": "ebwizardry:blocks/runestone_sorcery_3",
"overlay": "ebwizardry:blocks/runestone_sorcery_3_overlay"
}
}
@@ -0,0 +1,8 @@
{
"parent": "ebwizardry:block/runestone",
"textures": {
"side": "ebwizardry:blocks/runestone_sorcery_0",
"rune": "ebwizardry:blocks/runestone_sorcery_4",
"overlay": "ebwizardry:blocks/runestone_sorcery_4_overlay"
}
}
@@ -0,0 +1,9 @@
{
"parent": "ebwizardry:block/runestone_pedestal",
"textures": {
"side": "ebwizardry:blocks/runestone_pedestal_sorcery",
"top": "ebwizardry:blocks/runestone_sorcery_0",
"bottom": "ebwizardry:blocks/runestone_sorcery_0",
"overlay": "ebwizardry:blocks/runestone_pedestal_sorcery_overlay"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_1"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_2"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_3"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_4"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_5"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_6"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_lower_7"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_1"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_2"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_3"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_4"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_5"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_6"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "ebwizardry:blocks/thorns_upper_7"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_anchoring"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_arcane_defence"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_auto_shield"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_banishing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_channeling"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_fire_cloaking"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_fire_protection"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_glide"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_ice_immunity"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_ice_protection"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_lich"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_potential"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_recovery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_resurrection"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_transience"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_warding"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_wisdom"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/amulet_wither_immunity"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/astral_diamond"
}
}
@@ -1,6 +0,0 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "ebwizardry:items/wand_basic_lightning"
}
}
@@ -1,6 +0,0 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "ebwizardry:items/wand_basic_necromancy"
}
}
@@ -1,6 +0,0 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "ebwizardry:items/wand_basic_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_abseiling"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_auto_smelt"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_experience_tome"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_feeding"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_flight"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_growth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_haggler"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_lava_walking"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_light"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_minion_health"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_minion_variants"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_silk_touch"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ebwizardry:items/charm_stop_time"
}
}

Some files were not shown because too many files have changed in this diff Show More