merge conflict 2

This commit is contained in:
2022-08-03 09:33:14 -04:00
parent 09c81a117a
commit a0d866d838
284 changed files with 292 additions and 360 deletions

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:acacia_slab"
}
],
"result": {
"item": "vplus:vertical_acacia_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:andesite_slab"
}
],
"result": {
"item": "vplus:vertical_andesite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:birch_slab"
}
],
"result": {
"item": "vplus:vertical_birch_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:blackstone_slab"
}
],
"result": {
"item": "vplus:vertical_blackstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:brick_slab"
}
],
"result": {
"item": "vplus:vertical_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:cobblestone_slab"
}
],
"result": {
"item": "vplus:vertical_cobblestone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:crimson_slab"
}
],
"result": {
"item": "vplus:vertical_crimson_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:cut_red_sandstone_slab"
}
],
"result": {
"item": "vplus:vertical_cut_red_sandstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:cut_sandstone_slab"
}
],
"result": {
"item": "vplus:vertical_cut_sandstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:dark_oak_slab"
}
],
"result": {
"item": "vplus:vertical_dark_oak_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:dark_prismarine_slab"
}
],
"result": {
"item": "vplus:vertical_dark_prismarine_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:diorite_slab"
}
],
"result": {
"item": "vplus:vertical_diorite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:end_stone_brick_slab"
}
],
"result": {
"item": "vplus:vertical_end_stone_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:granite_slab"
}
],
"result": {
"item": "vplus:vertical_granite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:jungle_slab"
}
],
"result": {
"item": "vplus:vertical_jungle_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:mossy_cobblestone_slab"
}
],
"result": {
"item": "vplus:vertical_mossy_cobblestone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:mossy_stone_brick_slab"
}
],
"result": {
"item": "vplus:vertical_mossy_stone_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:nether_brick_slab"
}
],
"result": {
"item": "vplus:vertical_nether_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:oak_slab"
}
],
"result": {
"item": "vplus:vertical_oak_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:polished_andesite_slab"
}
],
"result": {
"item": "vplus:vertical_polished_andesite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:polished_blackstone_brick_slab"
}
],
"result": {
"item": "vplus:vertical_polished_blackstone_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:polished_blackstone_slab"
}
],
"result": {
"item": "vplus:vertical_polished_blackstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:polished_diorite_slab"
}
],
"result": {
"item": "vplus:vertical_polished_diorite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:polished_granite_slab"
}
],
"result": {
"item": "vplus:vertical_polished_granite_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:prismarine_brick_slab"
}
],
"result": {
"item": "vplus:vertical_prismarine_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:prismarine_slab"
}
],
"result": {
"item": "vplus:vertical_prismarine_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:purpur_slab"
}
],
"result": {
"item": "vplus:vertical_purpur_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:quartz_slab"
}
],
"result": {
"item": "vplus:vertical_quartz_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:red_nether_brick_slab"
}
],
"result": {
"item": "vplus:vertical_red_nether_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:red_sandstone_slab"
}
],
"result": {
"item": "vplus:vertical_red_sandstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:sandstone_slab"
}
],
"result": {
"item": "vplus:vertical_sandstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:smooth_quartz_slab"
}
],
"result": {
"item": "vplus:vertical_smooth_quartz_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:smooth_sandstone_slab"
}
],
"result": {
"item": "vplus:vertical_smooth_sandstone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:smooth_stone_slab"
}
],
"result": {
"item": "vplus:vertical_smooth_stone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:spruce_slab"
}
],
"result": {
"item": "vplus:vertical_spruce_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:stone_brick_slab"
}
],
"result": {
"item": "vplus:vertical_stone_brick_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:stone_slab"
}
],
"result": {
"item": "vplus:vertical_stone_slab"
}
}

View File

@@ -0,0 +1,11 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:warped_slab"
}
],
"result": {
"item": "vplus:vertical_warped_slab"
}
}