Exiled-EA merge

xNexusACS · Jan 5, 2023 · 1425dff · 1425dff
1 parent c651ca0
commit 1425dff
Show file tree

Hide file tree

Showing 789 changed files with 35,528 additions and 21,602 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
@@ -370,4 +370,7 @@ FodyWeavers.xsd
 NuGet.config
 
 # DocFX site
-_site/
+_site/
+
+# JSON Schemas
+JSON/
diff --git a/EXILED.props b/EXILED.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="$(BuildProperties) == '' OR $(BuildProperties) == 'true'">
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <PlatformTarget>x64</PlatformTarget>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -15,19 +15,19 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">5.3.2</Version>
+    <Version Condition="$(Version) == ''">6.0.0-beta.18</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
-    <PublicBeta>false</PublicBeta>
+    <PublicBeta>true</PublicBeta>
 
-    <HarmonyVersion>2.2.1</HarmonyVersion>
-    <YamlDotNetVersion>9.1.4</YamlDotNetVersion>
+    <HarmonyVersion>2.2.2</HarmonyVersion>
+    <YamlDotNetVersion>12.0.2</YamlDotNetVersion>
     <StyleCopVersion>1.1.118</StyleCopVersion>
-    <SemanticVersioningVersion>1.3.0</SemanticVersioningVersion>
+    <SemanticVersioningVersion>2.0.2</SemanticVersioningVersion>
 
     <Copyright>Copyright © $(Authors) 2020 - $([System.DateTime]::Now.ToString("yyyy"))</Copyright>
     <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/galaxy119/EXILED</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/galaxy119/EXILED</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Exiled-Team/EXILED</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Exiled-Team/EXILED</PackageProjectUrl>
     <PackageLicenseExpression>CC-BY-SA-3.0</PackageLicenseExpression>
 
     <DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>

diff --git a/EXILED.sln b/EXILED.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30225.117
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.Events", "Exiled.Events\Exiled.Events.csproj", "{1E6C4350-5067-4CE7-91DB-6420D027A4FC}"
 EndProject
@@ -17,83 +17,70 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.API", "Exiled.API\Ex
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.Example", "Exiled.Example\Exiled.Example.csproj", "{4F183633-0A36-408C-A42E-6FBA48751054}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.Bootstrap", "Exiled.Bootstrap\Exiled.Bootstrap.csproj", "{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.CustomItems", "Exiled.CustomItems\Exiled.CustomItems.csproj", "{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.Patcher", "Exiled.Patcher\Exiled.Patcher.csproj", "{B92E9671-71E6-4DDE-B085-062065110D0A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.CreditTags", "Exiled.CreditTags\Exiled.CreditTags.csproj", "{9FEBCAEA-EB51-46D0-BC04-F74789A40079}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CustomItems", "Exiled.CustomItems\Exiled.CustomItems.csproj", "{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CreditTags", "Exiled.CreditTags\Exiled.CreditTags.csproj", "{9FEBCAEA-EB51-46D0-BC04-F74789A40079}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CustomRoles", "Exiled.CustomRoles\Exiled.CustomRoles.csproj", "{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exiled.CustomRoles", "Exiled.CustomRoles\Exiled.CustomRoles.csproj", "{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Installer|Any CPU = Installer|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Programs|Any CPU = Programs|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E6C4350-5067-4CE7-91DB-6420D027A4FC}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1ABEC6CE-E209-4C38-AB45-2F3B7F6091CA}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
+		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Installer|Any CPU.Build.0 = Installer|Any CPU
 		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
-		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Programs|Any CPU.Build.0 = Programs|Any CPU
+		{10A8BFEC-B9E2-4119-BB21-2CF1EA820D19}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FFB9CEB-2956-4F62-88B3-6416DB8A8ED7}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFED2F89-8C43-40AE-84FF-8A0057D2FA5A}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46A0AFA9-D73A-4131-93EA-0CA7B7A1A101}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{4F183633-0A36-408C-A42E-6FBA48751054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4F183633-0A36-408C-A42E-6FBA48751054}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F183633-0A36-408C-A42E-6FBA48751054}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{4F183633-0A36-408C-A42E-6FBA48751054}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F183633-0A36-408C-A42E-6FBA48751054}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F183633-0A36-408C-A42E-6FBA48751054}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
-		{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8AB572FB-FBF2-4DC5-82CA-B04BB808AD03}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
-		{B92E9671-71E6-4DDE-B085-062065110D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B92E9671-71E6-4DDE-B085-062065110D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B92E9671-71E6-4DDE-B085-062065110D0A}.Release|Any CPU.ActiveCfg = Programs|Any CPU
-		{B92E9671-71E6-4DDE-B085-062065110D0A}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
-		{B92E9671-71E6-4DDE-B085-062065110D0A}.Programs|Any CPU.Build.0 = Programs|Any CPU
 		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7FBA3C1-6182-4E96-A33B-053EDDCC4F65}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Installer|Any CPU.ActiveCfg = Installer|Any CPU
 		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Programs|Any CPU.ActiveCfg = Programs|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Exiled.API/Enums/AdminToyType.cs b/Exiled.API/Enums/AdminToyType.cs
@@ -28,4 +28,4 @@ public enum AdminToyType
         /// </summary>
         ShootingTarget,
     }
-}
+}
diff --git a/Exiled.API/Enums/AmmoType.cs b/Exiled.API/Enums/AmmoType.cs
@@ -46,4 +46,4 @@ public enum AmmoType
         /// </summary>
         Ammo44Cal,
     }
-}
+}
diff --git a/Exiled.API/Enums/AuthenticationType.cs b/Exiled.API/Enums/AuthenticationType.cs
@@ -38,4 +38,4 @@ public enum AuthenticationType
         /// </summary>
         Unknown,
     }
-}
+}
diff --git a/Exiled.API/Enums/BaseCode.cs b/Exiled.API/Enums/BaseCode.cs
diff --git a/Exiled.API/Enums/BloodType.cs b/Exiled.API/Enums/BloodType.cs
@@ -10,8 +10,8 @@ namespace Exiled.API.Enums
     /// <summary>
     /// Unique identifier for the different types of blood decals.
     /// </summary>
-    /// <seealso cref="Features.Map.PlaceBlood(UnityEngine.Vector3, BloodType, float)"/>
-    /// <seealso cref="Features.Player.PlaceBlood(BloodType, float)"/>
+    /// <seealso cref="Features.Map.PlaceBlood(UnityEngine.Vector3, UnityEngine.Vector3)"/>
+    /// <seealso cref="Features.Player.PlaceBlood(UnityEngine.Vector3)"/>
     public enum BloodType
     {
         /// <summary>
@@ -34,4 +34,4 @@ public enum BloodType
         /// </summary>
         Faded,
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ public enum AdminToyType @@
             /// </summary>
             ShootingTarget,
         }
-    }
+    }