From 84948bee3f1a1c72c327db9574de869db49181e2 Mon Sep 17 00:00:00 2001
From: "Github Action (authored by pmalacho-mit)"
 <pmalacho-mit@users.noreply.github.com>
Date: Wed, 24 Jul 2024 15:37:37 -0400
Subject: [PATCH] integrating music-creation

---
 extensions/src/common/extension/decorators/taggedTemplate.ts | 3 ++-
 scratch-packages/scratch-gui                                 | 2 +-
 scratch-packages/scratch-vm                                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/src/common/extension/decorators/taggedTemplate.ts b/extensions/src/common/extension/decorators/taggedTemplate.ts
index 748e323fc..43c9b091c 100644
--- a/extensions/src/common/extension/decorators/taggedTemplate.ts
+++ b/extensions/src/common/extension/decorators/taggedTemplate.ts
@@ -2,6 +2,7 @@ import { BlockMetadata, Argument, ReturnTypeByBlockType, ScratchBlockType, NoArg
 import { block } from "$common/extension/decorators/blocks";
 import { ExtensionInstance } from "..";
 import { TypedMethodDecorator } from ".";
+import type BlockUtility from "$scratch-vm/engine/block-utility";
 
 const process = (type: ScratchBlockType, strings: TemplateStringsArray, ...args: any[]) => {
     if (args.length === 0) return { type, text: strings[0], } satisfies NoArgsBlock;
@@ -41,7 +42,7 @@ namespace Argument {
     type TRemoveUtil<T extends any[]> = T extends [...infer R extends any[], BlockUtilityWithID] ? R : T;
     export type MapToScratch<T extends any[], Internal extends TRemoveUtil<T> = TRemoveUtil<T>> = {
         [k in keyof Internal]:
-        Internal[k] extends BlockUtilityWithID ? never :
+        Internal[k] extends (BlockUtilityWithID | BlockUtility) ? never :
         Internal[k] extends InlineImageSpecifier ? InlineImage :
         Argument<Internal[k]>
     }
diff --git a/scratch-packages/scratch-gui b/scratch-packages/scratch-gui
index fbe8572d0..811b05a7d 160000
--- a/scratch-packages/scratch-gui
+++ b/scratch-packages/scratch-gui
@@ -1 +1 @@
-Subproject commit fbe8572d066d06efbb121f135ab0537c8b6b8e8b
+Subproject commit 811b05a7d685b557288e544866c55cff7f437ce7
diff --git a/scratch-packages/scratch-vm b/scratch-packages/scratch-vm
index 14b9e9127..c6a0d0188 160000
--- a/scratch-packages/scratch-vm
+++ b/scratch-packages/scratch-vm
@@ -1 +1 @@
-Subproject commit 14b9e91273d6d291c877b66c332a1999729d9c59
+Subproject commit c6a0d018875bef999299db04523d334d7002a3ff