Merge branch 'main' of https://github.com/ThatGuyJacobee/Elite-Gaming-FiveM

.replxx_history

@@ -0,0 +1,2 @@
+### 2025-06-02 06:35:32.721
+txaEvent "announcement" "{\"message\":\"peacetime  for 3mins\",\"author\":\"KingBitch\"}"

autofetch-script/fetch-script.js

@@ -10,7 +10,7 @@ const app = express();
 app.use(cookieParser());
 app.use(cors());
 app.use(express.json({limit: '50mb'}));
-app.listen(5000);
+app.listen(5069);
 
 // POST listener from GitHub
 console.log("Started fetch listener successfully...")

components.json

@@ -6,7 +6,6 @@
   "citizen:server:net",
   "citizen:scripting:core",
   "citizen:scripting:lua",
-  "citizen:scripting:lua54",
   "conhost:server",
   "citizen:server:main",
   "citizen:server:instance",

resources/Fire-Script/whitelist.json

@@ -1 +1 @@
-{"steam:110000112db6102":true,"steam:110000147619e76":true,"steam:110000131ff8eae":true,"steam:11000010e6980a7":true,"steam:11000013c64f700":true}
+{"steam:11000013c64f700":true,"steam:11000014684169a":true,"steam:110000112db6102":true,"steam:1100001698dbf6b":true,"steam:110000131ff8eae":true,"steam:110000147619e76":true,"steam:11000010e6980a7":true}

resources/[ERS]/night_discordapi/config/config.lua

@@ -12,19 +12,31 @@
 Config = {
     -- No own bot? Leave `Discord_Bot_Token = "",` as it is and invite ours » https://discord.com/oauth2/authorize?client_id=956690799385522237&permissions=1024&scope=bot
     -- If you do have a bot: define your BOT token below, inbetween the quotation marks: "your_bot_token_here",
-    Discord_Bot_Token = "",
+    Discord_Bot_Token = "NzUxOTY4NTY3MzA5NzYyNjgw.GzVJ9D.kAxZs0UBN-XxcSJPBRqo6zrp1L_KsjoBHibYYE",
     Discord_Guild_Names = {
-        ["989438923925229598"] = "Nights Software", -- Your primary server/guild ID (legacy scripts will get information regarding this guild)
+        ["361895986198609920"] = "Elite Group", -- Your primary server/guild ID (legacy scripts will get information regarding this guild)
         -- ["1001055923912653544"] = "My Community Discord", -- Add another guild. Make sure to invite the bot into this guild.
     },
     Discord_Role_Names = { -- Add Discord roles by their role ID here, name them how you want but make sure to MATCH the NAMES in other configs of our resources.
         -- Example:
-        ["989863231482916874"] = "Administrator",
-        ["963138401656242206"] = "Your_Police_Role",
-        ["744819251814334485"] = "Your_Ambulance_Role",
-        ["744819251788906505"] = "Your_Fire_Role",
-        ["1002578457823297536"] = "Allowlisted",
-        ["468677647228363421"] = "Banned",
+        ["Civilian I"] = "813907383892967424",
+		["Civilian II"] = "876585455615889450",
+		["Civilian III"] = "876585456387629066",
+		["Civilian IV"] = "876585900946128936",
+		["Civilian V"] = "876585431901294663",
+        ["First Responders"] = "807381508167565352",
+        ["CALFIRE"] = "807381509195300905",
+        ["CHP"] = "807381508859887667",
+		["EG | Helper"] = "538822780662054963",
+		["EG | Staff"] = "608583076037001225",
+		["EG | Sr. Staff"] = "789551229549281331",
+		["EG | Moderator"] = "517060882686279701",
+		["EG | Sr. Moderator"] = "789538166536798248",
+		["EG | Admin"] = "635155687688634399",
+		["EG | Sr. Admin"] = "556158473981788176",
+		["EG | Head of Staff"] = "650653280275267591",
+		["EG | Server Developer"] = "671141073728307228",
+		["EG | Owner"] = "361899298209923075",
     },
     Discord_API_Log_Level = 0, -- Level 0 - Only shows INFO, ERROR and WARN messages | Any higher level will include DEBUG messages
 }

resources/fivepd/config.json

@@ -1,8 +1,8 @@
 {
   "db": "mysql",
   "database": {
-    "username": "root",
-    "password": "Elite_Gaming_13",
+    "username": "egrp-fivem",
+    "password": "HIKy3DXk%DQfa7^PxgK%G56aU96vBc0Y",
     "host": "localhost",
     "port": 3306,
     "database": "fivepd"

resources/vMenu/vmenu.log

@@ -22,3 +22,13 @@ Your ban id: afd274e2-146e-4407-b68a-34f0edf1c24c until 09/09/2024 09:11:38.]
 [	21-12-2024 01:10:49	] [KICK ACTION] Player: ~r~ ¦ 1A-80 has kicked: stefangoodloe for: You have been kicked. Reason: Staff disrespect.
 [	23-12-2024 20:20:17	] [KICK ACTION] Player: ~r~ ¦ 1A-80 has kicked: JUST ALEX for: You have been kicked. Reason:  .
 [	27-12-2024 05:27:24	] [KICK ACTION] Player: ~r~ ¦ 1A-80 has kicked: Z3 for: You have been kicked. Reason: Using offensive slurs will not be toleraled.
+[	31-05-2025 13:00:05	] [KICK ACTION] Player: ~r~ ¦ 168 | Kevin T. has kicked: ~p~ dojaacart for: You have been kicked. Reason: AFK gn.
+[	02-06-2025 08:26:34	] [KICK ACTION] Player: Max Rodriguez has kicked: alantewood58 for: You have been kicked. Reason: no rp.
+[	02-06-2025 08:26:42	] [KICK ACTION] Player: Max Rodriguez has kicked: VQWOODAH for: You have been kicked. Reason: no rp.
+[	03-06-2025 10:20:59	] [KICK ACTION] Player: Max Rodriguez has kicked: M. Martinez for: You have been kicked. Reason: FAILRP NO RP.
+[	15-06-2025 08:17:22	] [KICK ACTION] Player: Max Rodriguez has kicked: ~y~ Freeman ~y~ for: You have been kicked. Reason: staff disrespect.
+[	21-06-2025 09:07:38	] [KICK ACTION] Player: Max Rodriguez has kicked: truly for: You have been kicked. Reason: bye.
+[	02-07-2025 04:32:41	] [KICK ACTION] Player: Max Rodriguez has kicked:  Dante B. for: You have been kicked. Reason: fu.
+[	08-07-2025 20:29:27	] [KICK ACTION] Player: 1A has kicked: ! 101 | Rocky | SSRP  for: You have been kicked. Reason: f u.
+[	09-07-2025 10:32:46	] [KICK ACTION] Player: 1A has kicked: E-313 | J. Dillan | SASP for: You have been kicked. Reason: f u.
+[	16-07-2025 02:17:53	] [KICK ACTION] Player: 1A has kicked: M.Banks for: You have been kicked. Reason: ban.

server.cfg

@@ -49,7 +49,7 @@ setr SCREENSHOT_BASIC_TOKEN 9dfc22d9d7a9ff2
 ensure mysql-async
 ensure oxmysql
 
-set mysql_connection_string "server=localhost;uid=root;password=Elite_Gaming_13;database=fivem"
+set mysql_connection_string "server=localhost;uid=egrp-fivem;password=HIKy3DXk%DQfa7^PxgK%G56aU96vBc0Y;database=fivem"
 //set mysql_connection_string "server=localhost;uid=root;password=Elite_Gaming_13;database=elitebot"
 
 #[-----Scripts With MySQL-----]