Merge branch 'master' of https://github.com/Cmb-Minigames/CmbMinigame…

…sResources

assets/cmbminigames/models/cosmetic/gd_head.json

@@ -0,0 +1,42 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [64, 64],
+	"textures": {
+		"0": "cmbminigames:block/cosmetic/gd_head/texture",
+		"1": "block/yellow_concrete",
+		"particle": "cmbminigames:block/cosmetic/gd_head/texture"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 4, 4.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 8, 4.5], "texture": "#0"},
+				"south": {"uv": [0, 4.5, 4, 9], "texture": "#0"},
+				"west": {"uv": [4, 4.5, 8, 9], "texture": "#0"},
+				"up": {"uv": [12, 4, 8, 0], "texture": "#0"},
+				"down": {"uv": [12, 4, 8, 8], "texture": "#0"}
+			}
+		},
+		{
+			"from": [17, -1, -1],
+			"to": [-1, 17, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [45, -1, -1]},
+			"faces": {
+				"north": {"uv": [0, 0, 4.5, 4.5], "texture": "#1"},
+				"east": {"uv": [0, 4.5, 4.5, 9], "texture": "#1"},
+				"south": {"uv": [4.5, 0, 9, 4.5], "texture": "#1"},
+				"west": {"uv": [4.5, 4.5, 9, 9], "texture": "#1"},
+				"up": {"uv": [4.5, 13.5, 0, 9], "texture": "#1"},
+				"down": {"uv": [13.5, 0, 9, 4.5], "texture": "#1"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"rotation": [11, 24, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

assets/cmbminigames/models/item/rocket_launcher.json

@@ -1,12 +1,12 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "cmbminigames:block/rl_1",
-		"1": "cmbminigames:block/rl_2",
-		"2": "cmbminigames:block/rl_3",
-		"3": "cmbminigames:block/rl_4",
+		"0": "cmbminigames:block/minigame/rocket/rl_1",
+		"1": "cmbminigames:block/minigame/rocket/rl_2",
+		"2": "cmbminigames:block/minigame/rocket/rl_3",
+		"3": "cmbminigames:block/minigame/rocket/rl_4",
 		"4": "block/black_concrete",
-		"particle": "cmbminigames:block/rl_1"
+		"particle": "cmbminigames:block/minigame/rocket/rl_1"
 	},
 	"elements": [
 		{

assets/cmbminigames/models/item/star_shower.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "cmbminigames:item/star_shower"
+        "layer0": "cmbminigames:item/star_shower2"
     }
 }

assets/minecraft/models/item/leather_horse_armor.json

@@ -27,6 +27,12 @@
                 "custom_model_data": 4
             },
             "model": "cmbminigames:cosmetic/cat_ears"
+        },
+        {
+            "predicate":{
+                "custom_model_data": 5
+            },
+            "model": "cmbminigames:cosmetic/gd_head"
         }
     ]
 }