From 0c98e043051b511048d97a76387a5712e99da4d0 Mon Sep 17 00:00:00 2001
From: r4isen1920 <r4isen1920@gmail.com>
Date: Mon, 27 May 2024 20:04:48 +0900
Subject: [PATCH] Merge branch

---
 source/general/manifest/manifest.1.json | 12 ++++++------
 source/general/manifest/manifest.2.json |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/source/general/manifest/manifest.1.json b/source/general/manifest/manifest.1.json
index 598b1c71..d1600712 100644
--- a/source/general/manifest/manifest.1.json
+++ b/source/general/manifest/manifest.1.json
@@ -39,10 +39,10 @@
           "title": "Minimum Engine Version"
         },
         "pack_scope": {
+          "title": "Pack Scope",
           "type": "string",
-          "enum": ["world"],
-          "description": "When defined, this pack can only be activated in the Add-Ons section of the world, and not the Global Resources options.",
-          "title": "Pack Scope"
+          "description": "This is the scope of the pack. This is only for resource packs",
+          "enum": ["global", "world", "any"]
         },
         "lock_template_options": { "type": "boolean", "description": "UNDOCUMENTED: lock template options.", "title": "Lock Template Options" },
         "base_game_version": { "$ref": "../Version.json", "description": "UNDOCUMENTED: base game version.", "title": "Base Game Version" }
@@ -135,9 +135,9 @@
       "description": "UNDOCUMENTED: metadata.",
       "product_type": {
         "type": "string",
-        "enum": ["addon"],
-        "description": "This field defines the type of the pack. Currently, it is required for Marketplace Add-Ons.",
-        "title": "Product Type"
+        "title": "Product Type",
+        "description": "The type of product this pack is. This is used to determine how the pack is displayed in the store.",
+        "enum": ["", "addon"]
       },
       "title": "Metadata"
     }
diff --git a/source/general/manifest/manifest.2.json b/source/general/manifest/manifest.2.json
index 197265c3..bf56b0c7 100644
--- a/source/general/manifest/manifest.2.json
+++ b/source/general/manifest/manifest.2.json
@@ -156,12 +156,6 @@
           "title": "Version",
           "description": "This is the version of your pack in the format [majorVersion, minorVersion, revision].",
           "oneOf": [{ "$ref": "../Version.json" }, { "$ref": "../semver.json" }]
-        },
-        "pack_scope": {
-          "type": "string",
-          "enum": ["world"],
-          "description": "When defined, this pack can only be activated in the Add-Ons section of the world, and not the Global Resources options.",
-          "title": "Pack Scope"
         }
       }
     },