Merge branch 'main' into niamh.cuileann/aabbutils

Author: sweetniamhy

change/@minecraft-api-docs-generator-93c9370a-b673-46f8-8507-158d27ea9aac.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "build(dependabot): bump terminal-kit from 2.11.7 to 3.1.2",
+  "packageName": "@minecraft/api-docs-generator",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@minecraft-core-build-tasks-dd505528-8d15-4419-90ce-b77db3c0e979.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Add support for Minecraft Education (desktop and UWP version) for deployment",
+  "packageName": "@minecraft/core-build-tasks",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

package-lock.json

@@ -63,7 +63,7 @@
     "resolve-from": "^5.0.0",
     "runtypes": "^6.7.0",
     "semver": "^7.3.5",
-    "terminal-kit": "^2.5.6",
+    "terminal-kit": "^3.1.2",
     "toposort": "^2.0.2",
     "typescript": "~5.6.0",
     "word-wrap": "^1.2.3",

tools/api-docs-generator/package.json

@@ -9,5 +9,7 @@ export enum MinecraftProduct {
     PreviewGDK = 'PreviewGDK',
     Bedrock = 'BedrockUWP',
     Preview = 'PreviewUWP',
+    EducationUWP = 'EducationUWP',
+    EducationDesktop = 'EducationDesktop',
     Custom = 'Custom',
 }

tools/core-build-tasks/src/platforms/MinecraftProduct.ts

@@ -11,10 +11,14 @@ export const STANDARD_CLEAN_PATHS = [
     'APPDATA/Minecraft Bedrock/Users/Shared/games/com.mojang/development_resource_packs/PROJECT_NAME',
     'APPDATA/Minecraft Bedrock Preview/Users/Shared/games/com.mojang/development_behavior_packs/PROJECT_NAME',
     'APPDATA/Minecraft Bedrock Preview/Users/Shared/games/com.mojang/development_resource_packs/PROJECT_NAME',
+    'APPDATA/Minecraft Education Education/games/com.mojang/development_behavior_packs/PROJECT_NAME',
+    'APPDATA/Minecraft Education Education/games/com.mojang/development_resource_packs/PROJECT_NAME',
     'LOCALAPPDATA/Packages/Microsoft.MinecraftUWP_8wekyb3d8bbwe/LocalState/games/com.mojang/development_behavior_packs/PROJECT_NAME',
     'LOCALAPPDATA/Packages/Microsoft.MinecraftUWP_8wekyb3d8bbwe/LocalState/games/com.mojang/development_resource_packs/PROJECT_NAME',
     'LOCALAPPDATA/Packages/Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe/LocalState/games/com.mojang/development_behavior_packs/PROJECT_NAME',
     'LOCALAPPDATA/Packages/Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe/LocalState/games/com.mojang/development_resource_packs/PROJECT_NAME',
+    'LOCALAPPDATA/Packages/Microsoft.MinecraftEducationEdition_8wekyb3d8bbwe/LocalState/games/com.mojang/development_behavior_packs/PROJECT_NAME',
+    'LOCALAPPDATA/Packages/Microsoft.MinecraftEducationEdition_8wekyb3d8bbwe/LocalState/games/com.mojang/development_resource_packs/PROJECT_NAME',
 ];
 
 /**

tools/core-build-tasks/src/tasks/cleanCollateral.ts

@@ -23,6 +23,15 @@ export function getGameDeploymentRootPaths(): Record<MinecraftProduct, string |
                   'Packages/Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe/LocalState/games/com.mojang/'
               )
             : undefined,
+        EducationUWP: localAppDataPath
+            ? resolve(
+                  localAppDataPath,
+                  'Packages/Microsoft.MinecraftEducationEdition_8wekyb3d8bbwe/LocalState/games/com.mojang/'
+              )
+            : undefined,
+        EducationDesktop: appDataPath
+            ? resolve(appDataPath, 'Minecraft Education Edition/games/com.mojang/')
+            : undefined,
         Custom: customDeploymentPath ? customDeploymentPath : undefined,
     };
 }