Merge branch 'master' into 1.17

src/main/resources/carpet.mixins.json

@@ -166,6 +166,8 @@
     "BlockItem_scarpetEventMixin",
     "PlayerManager_scarpetEventsMixin",
     "PlayerInventory_scarpetEventMixin",
+    "ScoreboardObjective_scarpetMixin",
+    "Scoreboard_scarpetMixin",
     "TradeOutputSlot_scarpetEventMixin",
 
     "ChunkTicketManager_scarpetMixin",

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.4.21",
+  "version": "${version}",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",