merge conflict 2
This commit is contained in:
8
temp/blockmodels/vertical_acacia_slab.json
Normal file
8
temp/blockmodels/vertical_acacia_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/acacia_planks",
|
||||
"top": "minecraft:block/acacia_planks",
|
||||
"side": "minecraft:block/acacia_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_andesite_slab.json
Normal file
8
temp/blockmodels/vertical_andesite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/andesite",
|
||||
"top": "minecraft:block/andesite",
|
||||
"side": "minecraft:block/andesite"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_birch_slab.json
Normal file
8
temp/blockmodels/vertical_birch_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/birch_planks",
|
||||
"top": "minecraft:block/birch_planks",
|
||||
"side": "minecraft:block/birch_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_blackstone_slab.json
Normal file
8
temp/blockmodels/vertical_blackstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/blackstone_top",
|
||||
"top": "minecraft:block/blackstone_top",
|
||||
"side": "minecraft:block/blackstone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_brick_slab.json
Normal file
8
temp/blockmodels/vertical_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/bricks",
|
||||
"top": "minecraft:block/bricks",
|
||||
"side": "minecraft:block/bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_cobblestone_slab.json
Normal file
8
temp/blockmodels/vertical_cobblestone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/cobblestone",
|
||||
"top": "minecraft:block/cobblestone",
|
||||
"side": "minecraft:block/cobblestone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_crimson_slab.json
Normal file
8
temp/blockmodels/vertical_crimson_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/crimson_planks",
|
||||
"top": "minecraft:block/crimson_planks",
|
||||
"side": "minecraft:block/crimson_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_cut_red_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_cut_red_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/red_sandstone_top",
|
||||
"top": "minecraft:block/red_sandstone_top",
|
||||
"side": "minecraft:block/cut_red_sandstone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_cut_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_cut_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/sandstone_top",
|
||||
"top": "minecraft:block/sandstone_top",
|
||||
"side": "minecraft:block/cut_sandstone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_dark_oak_slab.json
Normal file
8
temp/blockmodels/vertical_dark_oak_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/dark_oak_planks",
|
||||
"top": "minecraft:block/dark_oak_planks",
|
||||
"side": "minecraft:block/dark_oak_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_dark_prismarine_slab.json
Normal file
8
temp/blockmodels/vertical_dark_prismarine_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/dark_prismarine",
|
||||
"top": "minecraft:block/dark_prismarine",
|
||||
"side": "minecraft:block/dark_prismarine"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_diorite_slab.json
Normal file
8
temp/blockmodels/vertical_diorite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/diorite",
|
||||
"top": "minecraft:block/diorite",
|
||||
"side": "minecraft:block/diorite"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_end_stone_brick_slab.json
Normal file
8
temp/blockmodels/vertical_end_stone_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/end_stone_bricks",
|
||||
"top": "minecraft:block/end_stone_bricks",
|
||||
"side": "minecraft:block/end_stone_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_granite_slab.json
Normal file
8
temp/blockmodels/vertical_granite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/granite",
|
||||
"top": "minecraft:block/granite",
|
||||
"side": "minecraft:block/granite"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_jungle_slab.json
Normal file
8
temp/blockmodels/vertical_jungle_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/jungle_planks",
|
||||
"top": "minecraft:block/jungle_planks",
|
||||
"side": "minecraft:block/jungle_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_mossy_cobblestone_slab.json
Normal file
8
temp/blockmodels/vertical_mossy_cobblestone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/mossy_cobblestone",
|
||||
"top": "minecraft:block/mossy_cobblestone",
|
||||
"side": "minecraft:block/mossy_cobblestone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_mossy_stone_brick_slab.json
Normal file
8
temp/blockmodels/vertical_mossy_stone_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/mossy_stone_bricks",
|
||||
"top": "minecraft:block/mossy_stone_bricks",
|
||||
"side": "minecraft:block/mossy_stone_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_nether_brick_slab.json
Normal file
8
temp/blockmodels/vertical_nether_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/nether_bricks",
|
||||
"top": "minecraft:block/nether_bricks",
|
||||
"side": "minecraft:block/nether_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_oak_slab.json
Normal file
8
temp/blockmodels/vertical_oak_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/oak_planks",
|
||||
"top": "minecraft:block/oak_planks",
|
||||
"side": "minecraft:block/oak_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_petrified_oak_slab.json
Normal file
8
temp/blockmodels/vertical_petrified_oak_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/oak_planks",
|
||||
"top": "minecraft:block/oak_planks",
|
||||
"side": "minecraft:block/oak_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_polished_andesite_slab.json
Normal file
8
temp/blockmodels/vertical_polished_andesite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/polished_andesite",
|
||||
"top": "minecraft:block/polished_andesite",
|
||||
"side": "minecraft:block/polished_andesite"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/polished_blackstone_bricks",
|
||||
"top": "minecraft:block/polished_blackstone_bricks",
|
||||
"side": "minecraft:block/polished_blackstone_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_polished_blackstone_slab.json
Normal file
8
temp/blockmodels/vertical_polished_blackstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/polished_blackstone",
|
||||
"top": "minecraft:block/polished_blackstone",
|
||||
"side": "minecraft:block/polished_blackstone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_polished_diorite_slab.json
Normal file
8
temp/blockmodels/vertical_polished_diorite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/polished_diorite",
|
||||
"top": "minecraft:block/polished_diorite",
|
||||
"side": "minecraft:block/polished_diorite"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_polished_granite_slab.json
Normal file
8
temp/blockmodels/vertical_polished_granite_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/polished_granite",
|
||||
"top": "minecraft:block/polished_granite",
|
||||
"side": "minecraft:block/polished_granite"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_prismarine_brick_slab.json
Normal file
8
temp/blockmodels/vertical_prismarine_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/prismarine_bricks",
|
||||
"top": "minecraft:block/prismarine_bricks",
|
||||
"side": "minecraft:block/prismarine_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_prismarine_slab.json
Normal file
8
temp/blockmodels/vertical_prismarine_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/prismarine",
|
||||
"top": "minecraft:block/prismarine",
|
||||
"side": "minecraft:block/prismarine"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_purpur_slab.json
Normal file
8
temp/blockmodels/vertical_purpur_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/purpur_block",
|
||||
"top": "minecraft:block/purpur_block",
|
||||
"side": "minecraft:block/purpur_block"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_quartz_slab.json
Normal file
8
temp/blockmodels/vertical_quartz_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/quartz_block_top",
|
||||
"top": "minecraft:block/quartz_block_top",
|
||||
"side": "minecraft:block/quartz_block_side"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_red_nether_brick_slab.json
Normal file
8
temp/blockmodels/vertical_red_nether_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/red_nether_bricks",
|
||||
"top": "minecraft:block/red_nether_bricks",
|
||||
"side": "minecraft:block/red_nether_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_red_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_red_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/red_sandstone_bottom",
|
||||
"top": "minecraft:block/red_sandstone_top",
|
||||
"side": "minecraft:block/red_sandstone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/sandstone_bottom",
|
||||
"top": "minecraft:block/sandstone_top",
|
||||
"side": "minecraft:block/sandstone"
|
||||
}
|
||||
}
|
||||
25
temp/blockmodels/vertical_slab.json
Normal file
25
temp/blockmodels/vertical_slab.json
Normal file
@@ -0,0 +1,25 @@
|
||||
{ "parent": "block/block",
|
||||
"textures": {
|
||||
"particle": "#side"
|
||||
},
|
||||
"display": {
|
||||
"gui": {
|
||||
"rotation": [ 30, 315, -90 ],
|
||||
"translation": [ 0, 0, 0],
|
||||
"scale":[ 0.625, 0.625, 0.625 ]
|
||||
}
|
||||
},
|
||||
"elements": [
|
||||
{ "from": [ 0, 0, 0 ],
|
||||
"to": [ 16, 8, 16 ],
|
||||
"faces": {
|
||||
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "rotation": 90, "cullface": "down" },
|
||||
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "rotation": 90},
|
||||
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "rotation": 270, "cullface": "north" },
|
||||
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "rotation": 270, "cullface": "south" },
|
||||
"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" },
|
||||
"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
8
temp/blockmodels/vertical_smooth_quartz_slab.json
Normal file
8
temp/blockmodels/vertical_smooth_quartz_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/quartz_block_bottom",
|
||||
"top": "minecraft:block/quartz_block_bottom",
|
||||
"side": "minecraft:block/quartz_block_bottom"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_smooth_red_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_smooth_red_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/red_sandstone_top",
|
||||
"top": "minecraft:block/red_sandstone_top",
|
||||
"side": "minecraft:block/red_sandstone_top"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_smooth_sandstone_slab.json
Normal file
8
temp/blockmodels/vertical_smooth_sandstone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/sandstone_top",
|
||||
"top": "minecraft:block/sandstone_top",
|
||||
"side": "minecraft:block/sandstone_top"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_smooth_stone_slab.json
Normal file
8
temp/blockmodels/vertical_smooth_stone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/smooth_stone",
|
||||
"top": "minecraft:block/smooth_stone",
|
||||
"side": "minecraft:block/smooth_stone_slab_side"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_spruce_slab.json
Normal file
8
temp/blockmodels/vertical_spruce_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/spruce_planks",
|
||||
"top": "minecraft:block/spruce_planks",
|
||||
"side": "minecraft:block/spruce_planks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_stone_brick_slab.json
Normal file
8
temp/blockmodels/vertical_stone_brick_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/stone_bricks",
|
||||
"top": "minecraft:block/stone_bricks",
|
||||
"side": "minecraft:block/stone_bricks"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_stone_slab.json
Normal file
8
temp/blockmodels/vertical_stone_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/stone",
|
||||
"top": "minecraft:block/stone",
|
||||
"side": "minecraft:block/stone"
|
||||
}
|
||||
}
|
||||
8
temp/blockmodels/vertical_warped_slab.json
Normal file
8
temp/blockmodels/vertical_warped_slab.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "vplus:block/vertical_slab",
|
||||
"textures": {
|
||||
"bottom": "minecraft:block/warped_planks",
|
||||
"top": "minecraft:block/warped_planks",
|
||||
"side": "minecraft:block/warped_planks"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user