Merge branch 'master' into iiiiiiac

UnrealMultiple · Nov 23, 2024 · a3abbe3 · a3abbe3
2 parents dc6dfbb + d5ab772
commit a3abbe3
Show file tree

Hide file tree

Showing 616 changed files with 33,734 additions and 6,319 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,7 +1,7 @@
-name: 请求新功能 | Request New Feature
-description: 提交一个本仓库插件BUG | Submit a bug for this repository plugin
+name: 请求新功能(建议) | Request New Feature(Suggestion)
+description: 请求一个插件的新功能(建议) | Request a new plugin feature (or suggestion)
 title: '[建议|Suggestion] '
-labels: suggest
+labels: enhancement
 body:
   - type: markdown
     attributes:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,12 +21,12 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.DEPLOY_KEY }}
 
-      - name: 初始化.NET 6
+      - name: 初始化.NET 8
         uses: actions/setup-dotnet@v4
         env:
           DOTNET_CLI_UI_LANGUAGE: zh-CN
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.404
 
       - name: 安装构建依赖
         shell: pwsh
@@ -63,7 +63,14 @@ jobs:
           Copy-Item out/**/*.dll bin/ServerPlugins/
           Copy-Item SubmoduleAssembly/*.dll bin/ServerPlugins/
           Set-Location bin
-          ./TShock.Server -dump-plugins-list-only
+          New-Item -Name manifests -ItemType Directory
+          foreach ($p in @(Get-ChildItem ../src/**/*.csproj)) {
+            $manifestPath = Join-Path $p.DirectoryName manifest.json
+            if (Test-Path $manifestPath -PathType Leaf) {
+              Copy-Item $manifestPath $(Join-Path manifests "$($p.Basename).json")
+            }
+          }
+          ./TShock.Server -dump-plugins-list-only ./manifests
           Set-Location ../
           New-Item -Path out/Target -Name Plugins -ItemType Directory
           $ErrorActionPreference = "SilentlyContinue"
@@ -74,14 +81,14 @@ jobs:
           $ErrorActionPreference = "Continue"
           Copy-Item out/**/*.dll,out/**/*.pdb out/Target/Plugins/
           Copy-Item SubmoduleAssembly/* out/Target/Plugins/
-          Copy-Item bin/Plugins.json,README.md,Usage.txt,LICENSE out/Target/
-          python scripts/zip.py
+          Copy-Item bin/Plugins.json,README.md,README_EN.md,Usage.txt,LICENSE out/Target/
 
       - name: 上传临时插件包
         uses: actions/upload-artifact@v4
         with:
           name: Plugins
-          path: out/Plugins.zip
+          path: out/Target/*
+          compression-level: 9
 
       - name: 更新相关文件
         continue-on-error: true
@@ -92,16 +99,16 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           $Changed = [System.Object[]]::new(0)
-          foreach ($p in @(Get-ChildItem src/**/*.csproj))  {
+          foreach ($p in @(Get-ChildItem src/**/*.csproj)) {
             $pot = [System.IO.Path]::Combine($p.DirectoryName, "i18n", "template.pot")
             New-Item -Path $p.DirectoryName -Name i18n -ItemType Directory -Force
             dotnet tool run GetText.Extractor -u -o -s $p.FullName -t $pot
           }
           git add -N src/**/i18n/*.pot
-          foreach ($p in @((git diff --numstat).Split([System.Environment]::NewLine)))  {
+          foreach ($p in @(git diff --numstat)) {
             if (!$p.EndsWith(".pot")) { continue }
-            $d = $p.Split("`t")
-            if ($d[0] -le 2 -and $d[1] -le 2) {
+            $d = -split $p
+            if ([int]$d[0] -le 2 -and [int]$d[1] -le 2) {
               git checkout $d[2]
             } else {
               foreach ($t in @(Get-ChildItem $([System.IO.Path]::GetDirectoryName($d[2]))*.po)) {
@@ -124,6 +131,14 @@ jobs:
             git commit -m "自动更新$($Changed -Join ", ") [skip ci]"
             git push
           }
+      
+      - name: 下载临时插件包
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          name: Plugins
+          path: bin
+          skip_unpack: true
 
       - name: 同步其他平台
         continue-on-error: true
@@ -146,7 +161,7 @@ jobs:
         uses: mikepenz/release-changelog-builder-action@v5
         with:
           configuration: ".config/log_config.json"
-
+          
       - name: 发布插件包
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         uses: ncipollo/release-action@v1
@@ -166,6 +181,6 @@ jobs:
             ${{steps.external_changelog_second.outputs.changelog}}
             </details>
           artifacts: |
-            out/Plugins.zip
+            bin/Plugins.zip
           allowUpdates: true
           removeArtifacts: true
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "src/Submodules/TShockPlayerManager"]
 	path = src/Submodules/TShockPlayerManager
 	url = https://github.com/UnrealMultiple/TShockPlayerManager.git
+[submodule "src/Submodules/TrProtocol"]
+	path = src/Submodules/TrProtocol
+	url = https://github.com/UnrealMultiple/TrProtocol.git
diff --git a/Plugin.sln b/Plugin.sln
@@ -42,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RainbowChat", "src\RainbowC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CGive", "src\CGive\CGive.csproj", "{7A15E6B2-F299-4F07-8429-129119F4553C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisableGodMod", "src\DisableGodMod\DisableGodMod.csproj", "{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisableSurfaceProjectiles", "src\DisableSurfaceProjectiles\DisableSurfaceProjectiles.csproj", "{CD5A7945-D416-4DEE-8079-DF0B9B3652ED}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NormalDropsBags", "src\NormalDropsBags\NormalDropsBags.csproj", "{D169A104-9372-4DB4-AF39-B511087885A0}"
@@ -226,6 +224,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JourneyUnlock", "src\Journe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpPluginsList", "src\DumpPluginsList\DumpPluginsList.csproj", "{A29A93FC-6BAA-4533-BDFC-2AFD62F15756}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatusTextManager", "src\StatusTextManager\StatusTextManager.csproj", "{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DonotFuck", "src\DonotFuck\DonotFuck.csproj", "{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lagrange.XocMat.Adapter", "src\Lagrange.XocMat.Adapter\Lagrange.XocMat.Adapter.csproj", "{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ItemBox", "src\ItemBox\ItemBox.csproj", "{F1C47139-1211-4951-B922-BBF4BCEE36FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoAirItem", "src\AutoAirItem\AutoAirItem.csproj", "{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageRuleLoot", "src\DamageRuleLoot\DamageRuleLoot.csproj", "{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeRate", "src\TimeRate\TimeRate.csproj", "{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VotePlus", "src\VotePlus\VotePlus.csproj", "{CBCF4EE6-5634-44DC-ADA4-0941293104C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LazyAPI", "src\LazyAPI\LazyAPI.csproj", "{FDA7A806-41DA-469F-8290-347ACF613837}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoFish", "src\AutoFish\AutoFish.csproj", "{1225C358-E037-41BF-A249-C2AB071D80FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RebirthCoin", "src\RebirthCoin\RebirthCoin.csproj", "{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrProtocol", "src\Submodules\TrProtocol\TrProtocol\TrProtocol.csproj", "{E8AF3139-343C-4A0B-95F5-855C1A30189F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaiPacketDebug", "src\CaiPacketDebug\CaiPacketDebug.csproj", "{D6970958-D990-422B-B117-04B7C04C342E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ItemDecoration", "src\ItemDecoration\ItemDecoration.csproj", "{C4A6D861-D53D-447E-9948-A23A797E2C1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DwTP", "src\DwTP\DwTP.csproj", "{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -370,14 +398,6 @@ Global
 		{7A15E6B2-F299-4F07-8429-129119F4553C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A15E6B2-F299-4F07-8429-129119F4553C}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A15E6B2-F299-4F07-8429-129119F4553C}.Release|x64.Build.0 = Release|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Debug|x64.Build.0 = Debug|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Release|x64.ActiveCfg = Release|Any CPU
-		{5C7C65FD-E104-4BDA-B7E5-4FC1BF0D2F16}.Release|x64.Build.0 = Release|Any CPU
 		{CD5A7945-D416-4DEE-8079-DF0B9B3652ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD5A7945-D416-4DEE-8079-DF0B9B3652ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD5A7945-D416-4DEE-8079-DF0B9B3652ED}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1106,6 +1126,126 @@ Global
 		{A29A93FC-6BAA-4533-BDFC-2AFD62F15756}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A29A93FC-6BAA-4533-BDFC-2AFD62F15756}.Release|x64.ActiveCfg = Release|Any CPU
 		{A29A93FC-6BAA-4533-BDFC-2AFD62F15756}.Release|x64.Build.0 = Release|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Debug|x64.Build.0 = Debug|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Release|x64.ActiveCfg = Release|Any CPU
+		{139C13CE-6E45-44E4-AD7B-B28B3CE51D55}.Release|x64.Build.0 = Release|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8B882AE-D82E-4AA6-BAFF-17E9E1A04100}.Release|x64.Build.0 = Release|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF5C3B5E-D8CD-4292-8047-EF129C839BB2}.Release|x64.Build.0 = Release|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{F1C47139-1211-4951-B922-BBF4BCEE36FE}.Release|x64.Build.0 = Release|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E08099EC-478F-4B1A-9EBF-9EA8A27C52C9}.Release|x64.Build.0 = Release|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4BCB481-2C78-4D9A-BDB7-38A84FF440F3}.Release|x64.Build.0 = Release|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F8D4133-9A1B-42DD-A32E-DD6A77A07AC0}.Release|x64.Build.0 = Release|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Debug|x64.Build.0 = Debug|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Release|x64.ActiveCfg = Release|Any CPU
+		{CBCF4EE6-5634-44DC-ADA4-0941293104C9}.Release|x64.Build.0 = Release|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDA7A806-41DA-469F-8290-347ACF613837}.Release|x64.Build.0 = Release|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{1225C358-E037-41BF-A249-C2AB071D80FF}.Release|x64.Build.0 = Release|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Debug|x64.Build.0 = Debug|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Release|x64.ActiveCfg = Release|Any CPU
+		{87D2DF3A-5F8C-42A4-BA29-9D142E49572B}.Release|x64.Build.0 = Release|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Debug|x64.Build.0 = Debug|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Release|x64.ActiveCfg = Release|Any CPU
+		{E8AF3139-343C-4A0B-95F5-855C1A30189F}.Release|x64.Build.0 = Release|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6970958-D990-422B-B117-04B7C04C342E}.Release|x64.Build.0 = Release|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4A6D861-D53D-447E-9948-A23A797E2C1C}.Release|x64.Build.0 = Release|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Debug|x64.Build.0 = Debug|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Release|x64.ActiveCfg = Release|Any CPU
+		{2003D2E7-0A1C-4557-A0EE-F4E06B766B78}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE