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 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(); /// /// 检查命名空间名称是否合法 /// /// - /// 合法的命名空间名称只包括小写字母、数字、_、.、- + /// 合法的命名空间名称只包括小写字母、数字、_、.、-; + /// 也允许在合法命名空间后追加 -CFPA- 与作者名,作者名可包含大小写英文字母、数字、-、_、. 和空格。 /// /// 待校验的命名空间名称 /// 若合法,返回