From cd1c14b037c99465c5d6b42789e6edaff9511bd3 Mon Sep 17 00:00:00 2001
From: "Jonny_Bro (Nikita)" <48434875+JonnyBro@users.noreply.github.com>
Date: Fri, 29 Sep 2023 14:29:01 +0500
Subject: [PATCH] add conflicting addons

---
 beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
index 22bcd7e..472ca3c 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
@@ -47,7 +47,9 @@ local incompatible = {
 	["2635378860"] = true, -- MW/WZ Skydive/Parachute + Infil
 	["2919957168"] = true, -- Modern Warfare II - Takedowns & Revive System
 	["104815552"] = true, -- SmartSnap (how tho?)
-	["2600234804"] = true -- ASTW2 - Base Weapons
+	["2600234804"] = true, -- ASTW2 - Base Weapons
+	["2824714462"] = true, -- TFA Camera Shake
+	["3037375111"] = true -- Quick Slide With Legs
 }
 
 local warnpanel = {
@@ -162,4 +164,4 @@ if conflictlist.string ~= "" then
 		AEUI:AddPanel(warnpanel)
 		AEUI:AddPanel(conflictpanel)
 	end)
-end
\ No newline at end of file
+end