Merge remote-tracking branch 'origin/main'

trackedout · Jan 12, 2025 · 1755d08 · 1755d08
2 parents 3b00d2c + 7bccf92
commit 1755d08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Brilliance Resourcepack/assets/do2/textures/gui/gui_water.png b/Brilliance Resourcepack/assets/do2/textures/gui/gui_water.png
diff --git a/Brilliance Resourcepack/assets/minecraft/font/default.json b/Brilliance Resourcepack/assets/minecraft/font/default.json
@@ -16,6 +16,10 @@
 			"type": "reference",
 			"id": "do2:cards"
 		},
+		{
+			"type": "reference",
+			"id": "do2:gui"
+		},
 		{
 			"type": "reference",
 			"id": "minecraft:include/space"

diff --git a/Brilliance Resourcepack/pack.mcmeta b/Brilliance Resourcepack/pack.mcmeta
@@ -1,7 +1,7 @@
 {
     "pack":{
         "pack_format":15,
-        "description":"Resource pack for §3Tracked Out's Decked Out§r. §b§ov0.12.4"
+        "description":"Resource pack for §3Tracked Out's Decked Out§r. §b§ov0.12.5"
     }
 
 }