Merge branch 'main' into SpawnablePriorityQueue

Registry/AssetProcessorPlatformConfig.setreg

@@ -24,13 +24,13 @@
                 "Platform pc": {
                     "tags": "tools,renderer,dx12,vulkan,null"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer,vulkan"
                 },
                 "Platform ios": {
                     "tags": "mobile,renderer,metal"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer,metal,null"
                 },
                 // this is an example of a headless platform that has no renderer.   
@@ -43,9 +43,9 @@
                 // To enable any additional platform, just uncomment the appropriate line below.
                 "Platforms": {
                     //"pc": "enabled",
-                    //"es3": "enabled",
+                    //"android": "enabled",
                     //"ios": "enabled",
-                    //"osx_gl": "enabled",
+                    //"mac": "enabled",
                     //"server": "enabled"
                 },
                 // ---- The number of worker jobs, 0 means use the number of Logical Cores
@@ -95,11 +95,11 @@
                 //  "exclude": "(comma seperated platform tags or identifiers)"
                 // }
                 // For example if you want to include a scan folder only for platforms that have the platform tags tools and renderer 
-                // but omit it for platform osx_gl, you will have a scanfolder rule like
+                // but omit it for platform mac, you will have a scanfolder rule like
                 // "ScanFolder (unique identifier)": {
                 // "watch": "@ROOT@/foo",
                 // "include": "tools, renderer",
-                // "exclude": "osx_gl"
+                // "exclude": "mac"
                 // }
 
                 "ScanFolder Game": {

Registry/bootstrap.setreg

@@ -8,9 +8,9 @@
                 "ios_remote_filesystem": 0,
                 "mac_remote_filesystem": 0,
                 "assets": "pc",
-                "android_assets": "es3",
+                "android_assets": "android",
                 "ios_assets": "ios",
-                "mac_assets": "osx_gl",
+                "mac_assets": "mac",
                 "allowed_list": "",
                 "remote_ip": "127.0.0.1",
                 "remote_port": 45643,

Registry/sceneassetimporter.setreg

@@ -0,0 +1,16 @@
+{
+	"O3DE":
+	{
+		"SceneAPI":
+		{
+			"AssetImporter":
+			{
+				"SupportedFileTypeExtensions":
+				[
+					".fbx",
+					".stl"
+				]
+			}
+		}
+	}
+}