From 03beb413d397cba6a4286cc28e85b23b6039c244 Mon Sep 17 00:00:00 2001
From: Mani <71591933+manipou@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:00:22 +0200
Subject: [PATCH 1/2] Added fivem-lua extension

---
 .gitmodules          | 4 ++++
 extensions.toml      | 4 ++++
 extensions/fivem-lua | 1 +
 3 files changed, 9 insertions(+)
 create mode 160000 extensions/fivem-lua

diff --git a/.gitmodules b/.gitmodules
index 5efa1ed3e9..abc67e81c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1434,6 +1434,10 @@
 	path = extensions/fish
 	url = https://github.com/hasit/zed-fish.git
 
+[submodule "extensions/fivem-lua"]
+	path = extensions/fivem-lua
+	url = https://github.com/manipou/fivem-lua-zed.git
+
 [submodule "extensions/fjord-theme"]
 	path = extensions/fjord-theme
 	url = https://github.com/fjord-themes/fjord-zed.git
diff --git a/extensions.toml b/extensions.toml
index 91ede7990a..b5487d5dea 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -1459,6 +1459,10 @@ version = "0.1.0"
 submodule = "extensions/fish"
 version = "0.1.0"
 
+[fivem-lua]
+submodule = "extensions/fivem-lua"
+version = "0.1.0"
+
 [fjord-theme]
 submodule = "extensions/fjord-theme"
 version = "0.1.5"
diff --git a/extensions/fivem-lua b/extensions/fivem-lua
new file mode 160000
index 0000000000..ccf4a9a1cc
--- /dev/null
+++ b/extensions/fivem-lua
@@ -0,0 +1 @@
+Subproject commit ccf4a9a1ccd0b04a430b9bd6e0fc6e6ac9023e28

From 84248617e06326b21034b9222c9004be50b8a21d Mon Sep 17 00:00:00 2001
From: Mani <71591933+manipou@users.noreply.github.com>
Date: Fri, 26 Jun 2026 17:13:27 +0200
Subject: [PATCH 2/2] Sync fivem-lua submodule overload capabilities

---
 extensions/fivem-lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/fivem-lua b/extensions/fivem-lua
index ccf4a9a1cc..2cc6b1e302 160000
--- a/extensions/fivem-lua
+++ b/extensions/fivem-lua
@@ -1 +1 @@
-Subproject commit ccf4a9a1ccd0b04a430b9bd6e0fc6e6ac9023e28
+Subproject commit 2cc6b1e3022c31e696f09410c87811aac071cd4d