Merge branch 'master' into Ender-Main

Dablakbandit · Feb 4, 2024 · b99f2b1 · b99f2b1
2 parents 2030700 + c6fcf4f
commit b99f2b1
Show file tree

Hide file tree

Showing 5 changed files with 1,339 additions and 4 deletions.
diff --git a/assets/minecraft/models/item/arrow.json b/assets/minecraft/models/item/arrow.json
@@ -142,7 +142,7 @@
 {"predicate": {"custom_model_data":139},"model":"ms:clutter/cauldron_green_liquid"},
 {"predicate": {"custom_model_data":140},"model":"ms:clutter/cauldron_biohazard"},
 {"predicate": {"custom_model_data":141},"model":"ms:clutter/manhole_cover_west_ardougne"},
-{"predicate": {"custom_model_data":142},"model":"ms:stone_pickaxe/bank/bankchestclosed"},
+{"predicate": {"custom_model_data":142},"model":"item/empty"},
 {"predicate": {"custom_model_data":143},"model":"item/empty"},
 {"predicate": {"custom_model_data":144},"model":"item/empty"},
 {"predicate": {"custom_model_data":145},"model":"item/empty"},

diff --git a/assets/ms/models/clutter/candle_stand_black.json b/assets/ms/models/clutter/candle_stand_black.json
@@ -1,7 +1,8 @@
 {
-	"parent": "ms:diamond_pickaxe/misc/candle_stand",
+	"parent": "ms:clutter/cauldron_green_liquid",
 	"textures": {
-		"0": "item/custom/tools/wood/rotten",
-		"1": "item/custom/altar"
+		"0": "item/custom/ironhat",
+		"4": "item/custom/colors/green_dark",
+		"particle": "item/custom/ironhat"
 	}
 }
diff --git a/assets/ms/models/clutter/cauldron_biohazard.json b/assets/ms/models/clutter/cauldron_biohazard.json
@@ -0,0 +1,8 @@
+{
+	"parent": "ms:clutter/cauldron_green_liquid",
+	"textures": {
+		"0": "item/custom/ironhat",
+		"4": "item/custom/colors/opal_color",
+		"particle": "item/custom/ironhat"
+	}
+}