Merge branch '1.20_Crabs' of https://github.com/hybridlabs/hybrid-aqu…

…atic into 1.20_Crabs
hybridlabs · Feb 25, 2024 · 583a453 · 583a453
2 parents 53b1f31 + b9a938f
commit 583a453
Showing 1 changed file with 4 additions and 40 deletions.
diff --git a/src/main/resources/assets/hybrid-aquatic/geo/item/armor/diving_armor.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/item/armor/diving_armor.geo.json
@@ -11,22 +11,8 @@
 				"visible_bounds_offset": [0, 1.25, 0]
 			},
 			"bones": [
-				{
-					"name": "bipedHead",
-					"pivot": [0, 24, 0]
-				},
 				{
 					"name": "armorHead",
-					"parent": "bipedHead",
-					"pivot": [0, 24, 0]
-				},
-				{
-					"name": "bipedBody",
-					"pivot": [0, 24, 0]
-				},
-				{
-					"name": "armorBody",
-					"parent": "bipedBody",
 					"pivot": [0, 24, 0],
 					"cubes": [
 						{"origin": [-4.5, 23.5, -4.5], "size": [9, 9, 9], "uv": [0, 0]},
@@ -37,57 +23,35 @@
 						{"origin": [-2.5, 25.5, 4.5], "size": [5, 5, 1], "uv": [36, 6]}
 					]
 				},
-				{
-					"name": "bipedLeftArm",
-					"pivot": [-4, 22, 0]
-				},
 				{
 					"name": "armorLeftArm",
-					"parent": "bipedLeftArm",
 					"pivot": [-4, 22, 0]
 				},
 				{
-					"name": "bipedRightArm",
-					"pivot": [4, 22, 0]
+					"name": "armorBody",
+					"pivot": [0, 24, 0]
 				},
 				{
 					"name": "armorRightArm",
-					"parent": "bipedRightArm",
 					"pivot": [4, 22, 0]
 				},
 				{
-					"name": "bipedLeftLeg",
+					"name": "armorLeftBoot",
 					"pivot": [-2, 12, 0]
 				},
 				{
 					"name": "armorLeftLeg",
-					"parent": "bipedLeftLeg",
 					"pivot": [-2, 12, 0]
 				},
-				{
-					"name": "armorLeftBoot",
-					"parent": "bipedLeftLeg",
-					"pivot": [-2, 12, 0]
-				},
-				{
-					"name": "bipedRightLeg",
-					"pivot": [2, 12, 0]
-				},
 				{
 					"name": "armorRightLeg",
-					"parent": "bipedRightLeg",
 					"pivot": [2, 12, 0]
 				},
 				{
 					"name": "armorRightBoot",
-					"parent": "bipedRightLeg",
 					"pivot": [2, 12, 0]
-				},
-				{
-					"name": "bone",
-					"pivot": [8, 23.5, -8]
 				}
 			]
 		}
 	]
-}
+}