Merge remote-tracking branch 'origin/master' into master

2022-09-05 23:36:31 +07:00 · 2022-09-05 23:36:31 +07:00 · 86eaec61f4
commit 86eaec61f4
parent f2b0f966ec c608ade2da
4 changed files with 18 additions and 0 deletions
--- a/src/main/resources/assets/overdrive_that_matters/models/block/ph_block.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/ph_block.json
@ -0,0 +1,6 @@
+{
+    "parent": "block/block",
+    "textures": {
+        "texture": "overdrive_that_matters:block/ph_kitty"
+    }
+}
--- a/src/main/resources/assets/overdrive_that_matters/models/item/ph_item.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/ph_item.json
@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "texture": "overdrive_that_matters:block/ph_kitty"
+    }
+}
--- a/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json
@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "overdrive_that_matters:block/ph_kitty"
+    }
+}
--- a/src/main/resources/assets/overdrive_that_matters/textures/block/ph_kitty.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/block/ph_kitty.png