From 42f897c7654eb17e5e4af096f62fc9747eb61de4 Mon Sep 17 00:00:00 2001
From: 502y <53784463+502y@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:57:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(NS):=20=E6=B7=BB=E5=8A=A0=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E7=A0=81=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/packer/1.12.2.json                                      | 3 +++
 .../lang/en_us.lang                                            | 0
 .../lang/zh_cn.lang                                            | 0
 .../{ae2stuff => ae2stuff-CFPA-AE2 Stuff}/lang/en_us.lang      | 0
 .../{ae2stuff => ae2stuff-CFPA-AE2 Stuff}/lang/zh_cn.lang      | 0
 5 files changed, 3 insertions(+)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff => ae2stuff-CFPA-AE2 Stuff Unofficial}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff => ae2stuff-CFPA-AE2 Stuff Unofficial}/lang/zh_cn.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff => ae2stuff-CFPA-AE2 Stuff}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff => ae2stuff-CFPA-AE2 Stuff}/lang/zh_cn.lang (100%)

diff --git a/config/packer/1.12.2.json b/config/packer/1.12.2.json
index b084153c9137..e614cdc46241 100644
--- a/config/packer/1.12.2.json
+++ b/config/packer/1.12.2.json
@@ -50,5 +50,8 @@
             "……": "\u22ef\u22ef"
         },
         "destinationReplacement": {}
+    },
+    "rules": {
+        "ae2-stuff": "displayName"
     }
 }
\ No newline at end of file
diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff/lang/en_us.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff/lang/en_us.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff/lang/zh_cn.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff/lang/zh_cn.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff/lang/en_us.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff/lang/en_us.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff/lang/zh_cn.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff/lang/zh_cn.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang

From b517fcd574e49bc8b7630185204a84af06466266 Mon Sep 17 00:00:00 2001
From: 502y <53784463+502y@users.noreply.github.com>
Date: Sun, 14 Jun 2026 13:13:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(NS):=20=E9=87=8D=E5=91=BD=E5=90=8Dident?=
 =?UTF-8?q?ifier=E4=BB=A5=E9=81=BF=E5=85=8D=E7=A9=BA=E6=A0=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/en_us.lang                                               | 0
 .../lang/zh_cn.lang                                               | 0
 .../lang/en_us.lang                                               | 0
 .../lang/zh_cn.lang                                               | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff-CFPA-AE2 Stuff Unofficial => ae2stuff-CFPA-AE2_Stuff_Unofficial}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff-CFPA-AE2 Stuff Unofficial => ae2stuff-CFPA-AE2_Stuff_Unofficial}/lang/zh_cn.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff-CFPA-AE2 Stuff => ae2stuff-CFPA-AE2_Stuff}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff-CFPA-AE2 Stuff => ae2stuff-CFPA-AE2_Stuff}/lang/zh_cn.lang (100%)

diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/zh_cn.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/zh_cn.lang

From e9ead46064c29c761bf748549c9ffe957a063dd1 Mon Sep 17 00:00:00 2001
From: 502y <53784463+502y@users.noreply.github.com>
Date: Mon, 15 Jun 2026 09:29:58 +0800
Subject: [PATCH 3/3] fix(NS): modify regex

---
 .../lang/en_us.lang                                        | 0
 .../lang/zh_cn.lang                                        | 0
 .../lang/en_us.lang                                        | 0
 .../lang/zh_cn.lang                                        | 0
 src/Packer/Extensions/ContentExtension.cs                  | 7 ++++---
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff-CFPA-AE2_Stuff_Unofficial => ae2stuff-CFPA-AE2 Stuff Unofficial}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff-unofficial/1.12.2/{ae2stuff-CFPA-AE2_Stuff_Unofficial => ae2stuff-CFPA-AE2 Stuff Unofficial}/lang/zh_cn.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff-CFPA-AE2_Stuff => ae2stuff-CFPA-AE2 Stuff}/lang/en_us.lang (100%)
 rename projects/assets/ae2-stuff/1.12.2/{ae2stuff-CFPA-AE2_Stuff => ae2stuff-CFPA-AE2 Stuff}/lang/zh_cn.lang (100%)

diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/en_us.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/en_us.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/zh_cn.lang b/projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2_Stuff_Unofficial/lang/zh_cn.lang
rename to projects/assets/ae2-stuff-unofficial/1.12.2/ae2stuff-CFPA-AE2 Stuff Unofficial/lang/zh_cn.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/en_us.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/en_us.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/en_us.lang
diff --git a/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/zh_cn.lang b/projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang
similarity index 100%
rename from projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2_Stuff/lang/zh_cn.lang
rename to projects/assets/ae2-stuff/1.12.2/ae2stuff-CFPA-AE2 Stuff/lang/zh_cn.lang
diff --git a/src/Packer/Extensions/ContentExtension.cs b/src/Packer/Extensions/ContentExtension.cs
index 7b07838e938c..c63dc85f332d 100644
--- a/src/Packer/Extensions/ContentExtension.cs
+++ b/src/Packer/Extensions/ContentExtension.cs
@@ -27,14 +27,15 @@ public static string GetNamespace(this string path)
         }
 
 
-        [GeneratedRegex(@"^[a-z0-9_.-]+$", RegexOptions.Singleline)]
-        internal static partial Regex ValidNamespaceRegex();
+        [GeneratedRegex(@"^[a-z0-9_.-]+(?:-CFPA-[A-Za-z0-9_.\- ]+)?$", RegexOptions.Singleline)]
+        internal static partial Regex ValidNamespaceRegex();
 
         /// <summary>
         /// 检查命名空间名称是否合法
         /// </summary>
         /// <remarks>
-        /// 合法的命名空间名称只包括小写字母、数字、_、.、-
+        /// 合法的命名空间名称只包括小写字母、数字、_、.、-；
+        /// 也允许在合法命名空间后追加 -CFPA- 与作者名，作者名可包含大小写英文字母、数字、-、_、. 和空格。
         /// </remarks>
         /// <param name="namespaceName">待校验的命名空间名称</param>
         /// <returns>若合法，返回<see langword="true" /></returns>