Merge pull request #5 from tyonakaisan/NatuMaturi-Part2

NatuMaturiPart2
morinoparty · Jul 22, 2024 · a8122af · a8122af
2 parents fa6ae34 + 8a53eb0
commit a8122af
Show file tree

Hide file tree

Showing 13 changed files with 518 additions and 4 deletions.
diff --git a/assets/minecraft/font/default.json b/assets/minecraft/font/default.json
@@ -532,6 +532,11 @@
 			"chars": [
 				"\uE198"
 			]
+		},
+		{
+			"credit": "Includes Negative Space Font Copyright (c) 2020 AmberW licensed under Creative Commons Attribution 4.0 International",
+			"type": "reference",
+			"id": "space:default"
 		}
 	]
 }
diff --git a/assets/minecraft/font/negative_spaces.ttf b/assets/minecraft/font/negative_spaces.ttf
diff --git a/assets/minecraft/models/item/feather.json b/assets/minecraft/models/item/feather.json
@@ -44,6 +44,7 @@
         { "predicate": {"custom_model_data": 30}, "model": "item/interi/fu-lin"},
         { "predicate": {"custom_model_data": 31}, "model": "item/interi/senkou"},
         { "predicate": {"custom_model_data": 32}, "model": "item/interi/butasenkou"},
-        { "predicate": {"custom_model_data": 33}, "model": "item/fish/ponyo"}
+        { "predicate": {"custom_model_data": 33}, "model": "item/fish/ponyo"},
+        { "predicate": {"custom_model_data": 34}, "model": "item/trophy/archery-trophy"}
     ]
 }
diff --git a/assets/minecraft/models/item/paper.json b/assets/minecraft/models/item/paper.json
@@ -8,6 +8,8 @@
       {"predicate": {"custom_model_data": 2}, "model": "item/ticket/login-ticket"},
       {"predicate": {"custom_model_data": 3}, "model": "item/combat/inarinomaekake"},
       {"predicate": {"custom_model_data": 4}, "model": "item/ticket/daily-quest-ticket"},
-      {"predicate": {"custom_model_data": 5}, "model": "item/ticket/stamprally"}
-   ]
-  }
+      {"predicate": {"custom_model_data": 5}, "model": "item/ticket/stamprally"},
+      {"predicate": {"custom_model_data": 6}, "model": "item/ticket/syateki-easy-ticket"},
+      {"predicate": {"custom_model_data": 7}, "model": "item/ticket/syateki-hard-ticket"}
+  ]
+}
diff --git a/assets/minecraft/models/item/ticket/syateki-easy-ticket.json b/assets/minecraft/models/item/ticket/syateki-easy-ticket.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "item/ticket/syateki-easy-ticket"
+  }
+}
diff --git a/assets/minecraft/models/item/ticket/syateki-hard-ticket.json b/assets/minecraft/models/item/ticket/syateki-hard-ticket.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "item/ticket/syateki-hard-ticket"
+  }
+}