Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,17 +1,12 @@
 {
    "gem_name": "PrefabBuilder",
-    "GemFormatVersion": 4,
-    "Uuid": "88500802311C4793B03484BE2091B607",
-    "Name": "PrefabBuilder",
-    "DisplayName": "PrefabBuilder",
-    "Version": "0.1.0",
-    "Summary": "Asset Processor builder module for Prefabs",
-    "Tags": ["Prefabs"],
-    "IconPath": "preview.png",
-    "Modules": [ 
-        {
-            "Name": "Editor",
-            "Type": "EditorModule"
-        }
-    ]
+    "display_name": "Prefab Builder",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Code",
+    "summary": "The Prefab Builder Gem provides an Asset Processor module for prefabs, which are complex assets built by combining smaller entities.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Assets", "Utility", "Core"],
+    "icon_path": "preview.png",
+    "requirements": ""
 }