move 1.15 from other repo

krulunio · Jul 25, 2021 · b4c1f50 · b4c1f50
1 parent 5ac2e21
commit b4c1f50
Show file tree

Hide file tree

Showing 59 changed files with 33 additions and 4,420 deletions.
diff --git a/assets/minecraft/blockstates/granite_wall.json b/assets/minecraft/blockstates/granite_wall.json
@@ -1,90 +1,19 @@
 {
-  "multipart": [
-    {
-      "when": {
-        "up": "true"
-      },
-      "apply": {
-        "model": "minecraft:block/granite_wall_post"
-      }
-    },
-    {
-      "when": {
-        "north": "low"
-      },
-      "apply": {
-        "uvlock": true,
-        "model": "minecraft:block/granite_wall_side_z"
-      }
-    },
-    {
-      "when": {
-        "east": "low"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 90,
-        "model": "minecraft:block/granite_wall_side_x"
-      }
-    },
-    {
-      "when": {
-        "south": "low"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 180,
-        "model": "minecraft:block/granite_wall_side_z"
-      }
-    },
-    {
-      "when": {
-        "west": "low"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 270,
-        "model": "minecraft:block/granite_wall_side_x"
-      }
-    },
-    {
-      "when": {
-        "north": "tall"
-      },
-      "apply": {
-        "uvlock": true,
-        "model": "minecraft:block/granite_wall_side_tall"
-      }
-    },
-    {
-      "when": {
-        "east": "tall"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 90,
-        "model": "minecraft:block/granite_wall_side_tall"
-      }
-    },
-    {
-      "when": {
-        "south": "tall"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 180,
-        "model": "minecraft:block/granite_wall_side_tall"
-      }
-    },
-    {
-      "when": {
-        "west": "tall"
-      },
-      "apply": {
-        "uvlock": true,
-        "y": 270,
-        "model": "minecraft:block/granite_wall_side_tall"
-      }
-    }
-  ]
-}
+    "multipart": [
+        {   "when": { "up": "true" },
+            "apply": { "model": "block/granite_wall_post" }
+        },
+        {   "when": { "north": "true" },
+            "apply": { "model": "block/granite_wall_side_z", "uvlock": true }
+        },
+        {   "when": { "east": "true" },
+            "apply": { "model": "block/granite_wall_side_x", "y": 90, "uvlock": true }
+        },
+        {   "when": { "south": "true" },
+            "apply": { "model": "block/granite_wall_side_z", "y": 180, "uvlock": true }
+        },
+        {   "when": { "west": "true" },
+            "apply": { "model": "block/granite_wall_side_x", "y": 270, "uvlock": true }
+        }
+    ]
+}
diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json
diff --git a/assets/minecraft/models/block/diorite_wall_side_tall.json b/assets/minecraft/models/block/diorite_wall_side_tall.json
diff --git a/assets/minecraft/models/block/gold_block.json b/assets/minecraft/models/block/gold_block.json
@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_column",
+    "textures": {
+        "end": "block/gold_block_top",
+        "side": "block/gold_block_side"
+    }
+}
diff --git a/assets/minecraft/models/block/gold_ore.json b/assets/minecraft/models/block/gold_ore.json
@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_column",
+    "textures": {
+        "end": "block/gold_ore_top",
+        "side": "block/gold_ore_side"
+    }
+}
diff --git a/assets/minecraft/textures/block/crimson_door_bottom.png b/assets/minecraft/textures/block/crimson_door_bottom.png
diff --git a/assets/minecraft/textures/block/crimson_door_top.png b/assets/minecraft/textures/block/crimson_door_top.png
diff --git a/assets/minecraft/textures/block/crimson_fungus.png b/assets/minecraft/textures/block/crimson_fungus.png
diff --git a/assets/minecraft/textures/block/crimson_nylium.png b/assets/minecraft/textures/block/crimson_nylium.png
diff --git a/assets/minecraft/textures/block/crimson_nylium_side.png b/assets/minecraft/textures/block/crimson_nylium_side.png
diff --git a/assets/minecraft/textures/block/crimson_planks.png b/assets/minecraft/textures/block/crimson_planks.png
diff --git a/assets/minecraft/textures/block/crimson_roots.png b/assets/minecraft/textures/block/crimson_roots.png
diff --git a/assets/minecraft/textures/block/crimson_roots_pot.png b/assets/minecraft/textures/block/crimson_roots_pot.png
diff --git a/assets/minecraft/textures/block/crimson_stem.png b/assets/minecraft/textures/block/crimson_stem.png
diff --git a/assets/minecraft/textures/block/crimson_stem_top.png b/assets/minecraft/textures/block/crimson_stem_top.png
diff --git a/assets/minecraft/textures/block/crimson_trapdoor.png b/assets/minecraft/textures/block/crimson_trapdoor.png
diff --git a/assets/minecraft/textures/block/door_wood_lower.png b/assets/minecraft/textures/block/door_wood_lower.png
diff --git a/assets/minecraft/textures/block/door_wood_upper.png b/assets/minecraft/textures/block/door_wood_upper.png
diff --git a/assets/minecraft/textures/block/gold_block_side.png b/assets/minecraft/textures/block/gold_block_side.png
diff --git a/assets/minecraft/textures/block/gold_block_top.png b/assets/minecraft/textures/block/gold_block_top.png
diff --git a/assets/minecraft/textures/block/gold_ore_side.png b/assets/minecraft/textures/block/gold_ore_side.png
diff --git a/assets/minecraft/textures/block/gold_ore_top.png b/assets/minecraft/textures/block/gold_ore_top.png
diff --git a/assets/minecraft/textures/block/nether_sprouts.png b/assets/minecraft/textures/block/nether_sprouts.png
diff --git a/assets/minecraft/textures/block/nether_wart_block.png b/assets/minecraft/textures/block/nether_wart_block.png
diff --git a/assets/minecraft/textures/block/shroomlight.png b/assets/minecraft/textures/block/shroomlight.png
diff --git a/assets/minecraft/textures/block/stripped_warped_stem_top.png b/assets/minecraft/textures/block/stripped_warped_stem_top.png
diff --git a/assets/minecraft/textures/block/warped_door_bottom.png b/assets/minecraft/textures/block/warped_door_bottom.png
diff --git a/assets/minecraft/textures/block/warped_door_top.png b/assets/minecraft/textures/block/warped_door_top.png
diff --git a/assets/minecraft/textures/block/warped_fungus.png b/assets/minecraft/textures/block/warped_fungus.png
diff --git a/assets/minecraft/textures/block/warped_nylium.png b/assets/minecraft/textures/block/warped_nylium.png
diff --git a/assets/minecraft/textures/block/warped_nylium_side.png b/assets/minecraft/textures/block/warped_nylium_side.png
diff --git a/assets/minecraft/textures/block/warped_planks.png b/assets/minecraft/textures/block/warped_planks.png
diff --git a/assets/minecraft/textures/block/warped_roots.png b/assets/minecraft/textures/block/warped_roots.png
diff --git a/assets/minecraft/textures/block/warped_roots_pot.png b/assets/minecraft/textures/block/warped_roots_pot.png
diff --git a/assets/minecraft/textures/block/warped_wart_block.png b/assets/minecraft/textures/block/warped_wart_block.png
diff --git a/assets/minecraft/textures/block/weeping_vines.png b/assets/minecraft/textures/block/weeping_vines.png
diff --git a/assets/minecraft/textures/block/weeping_vines_plant.png b/assets/minecraft/textures/block/weeping_vines_plant.png
diff --git a/assets/minecraft/textures/entity/hoglin.png b/assets/minecraft/textures/entity/hoglin.png
diff --git a/assets/minecraft/textures/entity/piglin/piglin.png b/assets/minecraft/textures/entity/piglin/piglin.png
diff --git a/assets/minecraft/textures/entity/piglin/piglin_brute.png b/assets/minecraft/textures/entity/piglin/piglin_brute.png
diff --git a/assets/minecraft/textures/entity/piglin/zombified_piglin.png b/assets/minecraft/textures/entity/piglin/zombified_piglin.png
diff --git a/assets/minecraft/textures/entity/zoglin.png b/assets/minecraft/textures/entity/zoglin.png
diff --git a/assets/minecraft/textures/gui/widgets.png b/assets/minecraft/textures/gui/widgets.png
diff --git a/assets/minecraft/textures/item/diamond_boots.png b/assets/minecraft/textures/item/diamond_boots.png
diff --git a/assets/minecraft/textures/item/diamond_leggings.png b/assets/minecraft/textures/item/diamond_leggings.png
diff --git a/assets/minecraft/textures/item/nether_sprouts.png b/assets/minecraft/textures/item/nether_sprouts.png
diff --git a/assets/minecraft/textures/item/netherite_axe.png b/assets/minecraft/textures/item/netherite_axe.png
diff --git a/assets/minecraft/textures/item/netherite_boots.png b/assets/minecraft/textures/item/netherite_boots.png
diff --git a/assets/minecraft/textures/item/netherite_chestplate.png b/assets/minecraft/textures/item/netherite_chestplate.png
diff --git a/assets/minecraft/textures/item/netherite_helmet.png b/assets/minecraft/textures/item/netherite_helmet.png
diff --git a/assets/minecraft/textures/item/netherite_hoe.png b/assets/minecraft/textures/item/netherite_hoe.png
diff --git a/assets/minecraft/textures/item/netherite_leggings.png b/assets/minecraft/textures/item/netherite_leggings.png
diff --git a/assets/minecraft/textures/item/netherite_pickaxe.png b/assets/minecraft/textures/item/netherite_pickaxe.png
diff --git a/assets/minecraft/textures/item/netherite_shovel.png b/assets/minecraft/textures/item/netherite_shovel.png
diff --git a/assets/minecraft/textures/models/armor/diamond_layer_1.png b/assets/minecraft/textures/models/armor/diamond_layer_1.png
diff --git a/assets/minecraft/textures/models/armor/diamond_layer_2.png b/assets/minecraft/textures/models/armor/diamond_layer_2.png
diff --git a/assets/minecraft/textures/models/armor/netherite_layer_1.png b/assets/minecraft/textures/models/armor/netherite_layer_1.png
diff --git a/assets/minecraft/textures/models/armor/netherite_layer_2.png b/assets/minecraft/textures/models/armor/netherite_layer_2.png
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
 	"pack": {
-		"pack_format": 6,
+		"pack_format": 5,
 		"description": "A community 32x32 pack."
 	},
 	"language":{