From 99bff96de9121d8127c2bba8a925c5def95ceeb6 Mon Sep 17 00:00:00 2001
From: edayot <pro.e.dayot@gmail.com>
Date: Tue, 26 Nov 2024 18:59:06 +0100
Subject: [PATCH 1/3] using new item model definition + bump libs

---
 smithed_libraries/packs/actionbar/beet.yaml           |  2 +-
 .../crafter/assets/minecraft/models/item/furnace.json | 11 -----------
 .../crafter/assets/smithed.crafter/items/table.json   |  6 ++++++
 smithed_libraries/packs/crafter/beet.yaml             |  9 ++++++---
 smithed_libraries/packs/custom-block/beet.yaml        |  3 ++-
 5 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 smithed_libraries/packs/crafter/assets/minecraft/models/item/furnace.json
 create mode 100644 smithed_libraries/packs/crafter/assets/smithed.crafter/items/table.json

diff --git a/smithed_libraries/packs/actionbar/beet.yaml b/smithed_libraries/packs/actionbar/beet.yaml
index bea0242..c393e52 100644
--- a/smithed_libraries/packs/actionbar/beet.yaml
+++ b/smithed_libraries/packs/actionbar/beet.yaml
@@ -2,7 +2,7 @@ extend: "@smithed_libraries/common.yaml"
 
 id: smithed.actionbar
 name: Smithed Actionbar
-version: "0.5.0"
+version: "0.6.0"
 description: Native Actionbar Library for Smithed
 
 data_pack:
diff --git a/smithed_libraries/packs/crafter/assets/minecraft/models/item/furnace.json b/smithed_libraries/packs/crafter/assets/minecraft/models/item/furnace.json
deleted file mode 100644
index ef033cb..0000000
--- a/smithed_libraries/packs/crafter/assets/minecraft/models/item/furnace.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "parent": "minecraft:block/furnace",
-    "overrides": [{
-        "predicate": {
-          "custom_model_data": 4250001
-        },
-        "model": "smithed.crafter:item/table"
-      }
-    ]
-  }
-  
\ No newline at end of file
diff --git a/smithed_libraries/packs/crafter/assets/smithed.crafter/items/table.json b/smithed_libraries/packs/crafter/assets/smithed.crafter/items/table.json
new file mode 100644
index 0000000..bb8257a
--- /dev/null
+++ b/smithed_libraries/packs/crafter/assets/smithed.crafter/items/table.json
@@ -0,0 +1,6 @@
+{
+    "model": {
+        "type": "model",
+        "model": "smithed.crafter:item/table"
+    }
+}
\ No newline at end of file
diff --git a/smithed_libraries/packs/crafter/beet.yaml b/smithed_libraries/packs/crafter/beet.yaml
index 14ea706..a0c23f3 100644
--- a/smithed_libraries/packs/crafter/beet.yaml
+++ b/smithed_libraries/packs/crafter/beet.yaml
@@ -2,7 +2,7 @@ extend: "@smithed_libraries/common.yaml"
 
 id: smithed.crafter
 name: Smithed Crafter
-version: "0.5.0"
+version: "0.6.0"
 description: Native Library for Smithed
 author: TheNuclearNexus
 minecraft: "1.21"
@@ -10,14 +10,17 @@ minecraft: "1.21"
 data_pack:
   name: Smithed Crafter
   load: .
+  pack_format: 61
 
 resource_pack:
   name: Smithed Crafter RP
   load: .
+  pack_format: 46
 
 require:
   - smithed_libraries.plugins.companion_mod
   - bolt
+  - beet.contrib.unknown_files
 
 pipeline:
   - mecha
@@ -31,5 +34,5 @@ pipeline:
 
 meta:
   depends_on: # used for metadata
-    custom-block: "0.5.0"
-  minecraft_version: "1.21.3"
+    custom-block: "0.6.0"
+  minecraft_version: "1.21.4-pre3"
diff --git a/smithed_libraries/packs/custom-block/beet.yaml b/smithed_libraries/packs/custom-block/beet.yaml
index 8bc5c02..8286613 100644
--- a/smithed_libraries/packs/custom-block/beet.yaml
+++ b/smithed_libraries/packs/custom-block/beet.yaml
@@ -2,13 +2,14 @@ extend: "@smithed_libraries/common.yaml"
 
 id: smithed.custom_block
 name: Smithed Custom Block
-version: "0.5.0"
+version: "0.6.0"
 description: Native Custom Block Library for Smithed
 minecraft: "1.21"
 
 data_pack:
   name: Smithed Custom Block
   load: .
+  pack_format: 61
 
 require:
   - bolt

From 87a6a12b9fc526e365c1a712466f93d8403fc0e2 Mon Sep 17 00:00:00 2001
From: edayot <pro.e.dayot@gmail.com>
Date: Tue, 26 Nov 2024 19:07:55 +0100
Subject: [PATCH 2/3] update workflow version

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d58ccd..e2ab6ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 env:
-  MC_VERSION: '1.21.3'
+  MC_VERSION: '1.21.4'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
 
 jobs:

From cbf3c160d3ea018509007fe43dcf38702172424c Mon Sep 17 00:00:00 2001
From: edayot <pro.e.dayot@gmail.com>
Date: Tue, 3 Dec 2024 17:38:17 +0100
Subject: [PATCH 3/3] fix: correct minecraft version

---
 smithed_libraries/packs/crafter/beet.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smithed_libraries/packs/crafter/beet.yaml b/smithed_libraries/packs/crafter/beet.yaml
index a0c23f3..02e1813 100644
--- a/smithed_libraries/packs/crafter/beet.yaml
+++ b/smithed_libraries/packs/crafter/beet.yaml
@@ -35,4 +35,4 @@ pipeline:
 meta:
   depends_on: # used for metadata
     custom-block: "0.6.0"
-  minecraft_version: "1.21.4-pre3"
+  minecraft_version: "1.21.4"