From f0cb36f118c2fe9201d17fcea57f4f8870aa66e0 Mon Sep 17 00:00:00 2001
From: linmeideli <2558527373@qq.com>
Date: Thu, 20 Aug 2026 12:14:26 +0800
Subject: [PATCH] merge

---
 marketplace/plugins.json | 39 +++++++++++++++++++++++++++++++++++++++
 src/Empostor.sln         |  3 +++
 2 files changed, 42 insertions(+)

diff --git a/marketplace/plugins.json b/marketplace/plugins.json
index 62774bc..a72ae16 100644
--- a/marketplace/plugins.json
+++ b/marketplace/plugins.json
@@ -174,5 +174,44 @@
         "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Reactor.Empostor.dll"
       }
     ]
+  },
+  {
+    "id": "cn.hayashiume.chatfilter",
+    "name": "Chat Filter",
+    "description": "Filter the message depend on the banwords",
+    "author": "HayashiUme",
+    "versions": [
+      {
+        "version": "2.0.0",
+        "empostor_version": "2.0.0",
+        "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.ChatFilter.dll"
+      }
+    ]
+  },
+  {
+    "id": "cn.hayashiume.discordwebhook",
+    "name": "Discord Webhook",
+    "description": "Send lobby and admin message to dicord by webhook",
+    "author": "HayashiUme",
+    "versions": [
+      {
+        "version": "2.0.0",
+        "empostor_version": "2.0.0",
+        "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.DiscordWebhook.dll"
+      }
+    ]
+  },
+  {
+    "id": "cn.hayashiume.playerstats",
+    "name": "Player Stats",
+    "description": "Stat player logs with #stats command",
+    "author": "HayashiUme",
+    "versions": [
+      {
+        "version": "2.0.0",
+        "empostor_version": "2.0.0",
+        "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.PlayerStats.dll"
+      }
+    ]
   }
 ]
diff --git a/src/Empostor.sln b/src/Empostor.sln
index 3084470..e81c376 100644
--- a/src/Empostor.sln
+++ b/src/Empostor.sln
@@ -274,6 +274,9 @@ Global
 		{FE6D40CC-4BE5-4E38-9DCA-E6832709FE3F} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
 		{9D67CAC6-D296-404C-9189-2FF9B86D287C} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
 		{D05FE3E6-1BD9-4D32-89EB-5DE02A785EF8} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
+		{70582074-88B9-419C-85ED-46536AE2D6AA} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
+		{AF4C4FF8-47C8-4E89-9DD4-3BD1781E18CD} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
+		{2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DAF5625C-7E46-4DCC-AF2C-11D20D965454}