Merge branch 'dev'

bridge-core · Aug 17, 2024 · a981069 · a981069
2 parents 69962e9 + 88cce96
commit a981069
Show file tree

Hide file tree

Showing 433 changed files with 1,910 additions and 15,636 deletions.
diff --git a/dist/minecraftBedrock/fileDefinitions.json b/dist/minecraftBedrock/fileDefinitions.json
diff --git a/packages/minecraftBedrock/experimentalGameplay.json b/packages/minecraftBedrock/experimentalGameplay.json
@@ -1,8 +1,4 @@
 [
-	{
-		"icon": "mdi-gift",
-		"id": "holidayCreatorFeatures"
-	},
 	{
 		"icon": "mdi-earth-box",
 		"id": "creationOfCustomBiomes"

diff --git a/packages/minecraftBedrock/fileDefinition/gameTest.json b/packages/minecraftBedrock/fileDefinition/gameTest.json
@@ -47,7 +47,7 @@
 		},
 		{
 			"moduleName": "@minecraft/server",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]stable/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
@@ -61,56 +61,26 @@
 		},
 		{
 			"moduleName": "@minecraft/server",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]-rc.1.21.20-preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
 						"module_name": "@minecraft/server",
 						"version": "1.13.0"
 					}
-				],
-				"targetVersion": [">=", "1.21.20"]
-			}
-		},
-		{
-			"moduleName": "@minecraft/server",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
-			"requires": {
-				"dependencies": [
-					{
-						"module_name": "@minecraft/server",
-						"version": "1.13.0-beta"
-					}
-				],
-				"experimentalGameplay": ["enableGameTestFramework"],
-				"targetVersion": [">=", "1.21.10"]
+				]
 			}
 		},
 		{
 			"moduleName": "@minecraft/server",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]-rc.1.21.10-preview.24/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
 						"module_name": "@minecraft/server",
 						"version": "1.12.0"
 					}
-				],
-				"targetVersion": [">=", "1.21.10"]
-			}
-		},
-		{
-			"moduleName": "@minecraft/server",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
-			"requires": {
-				"dependencies": [
-					{
-						"module_name": "@minecraft/server",
-						"version": "1.12.0-beta"
-					}
-				],
-				"experimentalGameplay": ["enableGameTestFramework"],
-				"targetVersion": [">=", "1.21.0"]
+				]
 			}
 		},
 		{
@@ -315,29 +285,14 @@
 		},
 		{
 			"moduleName": "@minecraft/server-ui",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]-rc.1.21.30-preview.22/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
 						"module_name": "@minecraft/server-ui",
 						"version": "1.2.0"
 					}
-				],
-				"targetVersion": [">=", "1.21.10"] // TODO Remove this check once 1.21.10 is stable.
-			}
-		},
-		{
-			// TODO Remove this once 1.21.10 is stable.
-			"moduleName": "@minecraft/server-ui",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
-			"requires": {
-				"dependencies": [
-					{
-						"module_name": "@minecraft/server-ui",
-						"version": "1.2.0-beta"
-					}
-				],
-				"experimentalGameplay": ["enableGameTestFramework"]
+				]
 			}
 		},
 		{

diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/blank/block.json b/packages/minecraftBedrock/preset/block/v1.16.100/blank/block.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/blank/clientBlock.json b/packages/minecraftBedrock/preset/block/v1.16.100/blank/clientBlock.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/blank/en_US.lang b/packages/minecraftBedrock/preset/block/v1.16.100/blank/en_US.lang
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/blank/manifest.json b/packages/minecraftBedrock/preset/block/v1.16.100/blank/manifest.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/blank/texture.png b/packages/minecraftBedrock/preset/block/v1.16.100/blank/texture.png
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/ore/block.json b/packages/minecraftBedrock/preset/block/v1.16.100/ore/block.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/ore/clientBlock.json b/packages/minecraftBedrock/preset/block/v1.16.100/ore/clientBlock.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/ore/en_US.lang b/packages/minecraftBedrock/preset/block/v1.16.100/ore/en_US.lang
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/ore/feature.json b/packages/minecraftBedrock/preset/block/v1.16.100/ore/feature.json
diff --git a/packages/minecraftBedrock/preset/block/v1.16.100/ore/featureRule.json b/packages/minecraftBedrock/preset/block/v1.16.100/ore/featureRule.json