merge conflict 2

temp/itemmodels/vertical_acacia_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_acacia_slab"
+}

temp/itemmodels/vertical_andesite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_andesite_slab"
+}

temp/itemmodels/vertical_birch_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_birch_slab"
+}

temp/itemmodels/vertical_blackstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_blackstone_slab"
+}

temp/itemmodels/vertical_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_brick_slab"
+}

temp/itemmodels/vertical_cobblestone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_cobblestone_slab"
+}

temp/itemmodels/vertical_crimson_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_crimson_slab"
+}

temp/itemmodels/vertical_cut_red_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_cut_red_sandstone_slab"
+}

temp/itemmodels/vertical_cut_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_cut_sandstone_slab"
+}

temp/itemmodels/vertical_dark_oak_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_dark_oak_slab"
+}

temp/itemmodels/vertical_dark_prismarine_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_dark_prismarine_slab"
+}

temp/itemmodels/vertical_diorite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_diorite_slab"
+}

temp/itemmodels/vertical_end_stone_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_end_stone_brick_slab"
+}

temp/itemmodels/vertical_granite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_granite_slab"
+}

temp/itemmodels/vertical_jungle_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_jungle_slab"
+}

temp/itemmodels/vertical_mossy_cobblestone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_mossy_cobblestone_slab"
+}

temp/itemmodels/vertical_mossy_stone_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_mossy_stone_brick_slab"
+}

temp/itemmodels/vertical_nether_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_nether_brick_slab"
+}

temp/itemmodels/vertical_oak_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_oak_slab"
+}

temp/itemmodels/vertical_polished_andesite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_polished_andesite_slab"
+}

temp/itemmodels/vertical_polished_blackstone_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_polished_blackstone_brick_slab"
+}

temp/itemmodels/vertical_polished_blackstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_polished_blackstone_slab"
+}

temp/itemmodels/vertical_polished_diorite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_polished_diorite_slab"
+}

temp/itemmodels/vertical_polished_granite_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_polished_granite_slab"
+}

temp/itemmodels/vertical_prismarine_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_prismarine_slab"
+}

temp/itemmodels/vertical_prismarine_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_prismarine_slab"
+}

temp/itemmodels/vertical_purpur_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_purpur_slab"
+}

temp/itemmodels/vertical_quartz_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_quartz_slab"
+}

temp/itemmodels/vertical_red_nether_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_red_nether_brick_slab"
+}

temp/itemmodels/vertical_red_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_red_sandstone_slab"
+}

temp/itemmodels/vertical_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_sandstone_slab"
+}

temp/itemmodels/vertical_smooth_quartz_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_smooth_quartz_slab"
+}

temp/itemmodels/vertical_smooth_red_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_smooth_red_sandstone_slab"
+}

temp/itemmodels/vertical_smooth_sandstone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_smooth_sandstone_slab"
+}

temp/itemmodels/vertical_smooth_stone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_smooth_stone_slab"
+}

temp/itemmodels/vertical_spruce_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_spruce_slab"
+}

temp/itemmodels/vertical_stone_brick_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_stone_brick_slab"
+}

temp/itemmodels/vertical_stone_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_stone_slab"
+}

temp/itemmodels/vertical_warped_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "vplus:block/vertical_warped_slab"
+}