diff --git a/.replxx_history b/.replxx_history new file mode 100644 index 000000000..b64f18611 --- /dev/null +++ b/.replxx_history @@ -0,0 +1,2 @@ +### 2025-06-02 06:35:32.721 +txaEvent "announcement" "{\"message\":\"peacetime for 3mins\",\"author\":\"KingBitch\"}" diff --git a/CoreRT.dll b/CoreRT.dll index 7f1dfc544..366de1328 100644 Binary files a/CoreRT.dll and b/CoreRT.dll differ diff --git a/FXServer.exe b/FXServer.exe index 5344074b8..650bf0c9f 100644 Binary files a/FXServer.exe and b/FXServer.exe differ diff --git a/autofetch-script/fetch-script.js b/autofetch-script/fetch-script.js index 4e48e2ba1..0cdec2abc 100644 --- a/autofetch-script/fetch-script.js +++ b/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...") diff --git a/botan.dll b/botan.dll index 22bac2351..2a80331ca 100644 Binary files a/botan.dll and b/botan.dll differ diff --git a/cfx_curl_x86_64.dll b/cfx_curl_x86_64.dll index 99359077d..69bd6f20c 100644 Binary files a/cfx_curl_x86_64.dll and b/cfx_curl_x86_64.dll differ diff --git a/citizen-devtools.dll b/citizen-devtools.dll index 9344e1317..ca827de8e 100644 Binary files a/citizen-devtools.dll and b/citizen-devtools.dll differ diff --git a/citizen-resources-core.dll b/citizen-resources-core.dll index 91a01f7f0..7c8529e3d 100644 Binary files a/citizen-resources-core.dll and b/citizen-resources-core.dll differ diff --git a/citizen-resources-metadata-lua.dll b/citizen-resources-metadata-lua.dll index 445f0cc2b..dcf354137 100644 Binary files a/citizen-resources-metadata-lua.dll and b/citizen-resources-metadata-lua.dll differ diff --git a/citizen-scripting-core.dll b/citizen-scripting-core.dll index 768d1f4a1..efef9426a 100644 Binary files a/citizen-scripting-core.dll and b/citizen-scripting-core.dll differ diff --git a/citizen-scripting-lua.dll b/citizen-scripting-lua.dll index 750c798c9..e8bc19eec 100644 Binary files a/citizen-scripting-lua.dll and b/citizen-scripting-lua.dll differ diff --git a/citizen-scripting-lua54.dll b/citizen-scripting-lua54.dll index a41076531..8c4f28a38 100644 Binary files a/citizen-scripting-lua54.dll and b/citizen-scripting-lua54.dll differ diff --git a/citizen-scripting-mono-v2.dll b/citizen-scripting-mono-v2.dll index f838c28fd..acd90b13d 100644 Binary files a/citizen-scripting-mono-v2.dll and b/citizen-scripting-mono-v2.dll differ diff --git a/citizen-scripting-mono.dll b/citizen-scripting-mono.dll index d55e8507e..1807e7f7c 100644 Binary files a/citizen-scripting-mono.dll and b/citizen-scripting-mono.dll differ diff --git a/citizen-scripting-node.dll b/citizen-scripting-node.dll index f2a2ae4c5..622d27df9 100644 Binary files a/citizen-scripting-node.dll and b/citizen-scripting-node.dll differ diff --git a/citizen-scripting-v8node.dll b/citizen-scripting-v8node.dll index 20d2e3217..7556710eb 100644 Binary files a/citizen-scripting-v8node.dll and b/citizen-scripting-v8node.dll differ diff --git a/citizen-server-fxdk.dll b/citizen-server-fxdk.dll index c0c1c5d25..8aab8f538 100644 Binary files a/citizen-server-fxdk.dll and b/citizen-server-fxdk.dll differ diff --git a/citizen-server-gui.dll b/citizen-server-gui.dll index 5e5673b94..ea878918f 100644 Binary files a/citizen-server-gui.dll and b/citizen-server-gui.dll differ diff --git a/citizen-server-impl.dll b/citizen-server-impl.dll index 403574666..253b44fa0 100644 Binary files a/citizen-server-impl.dll and b/citizen-server-impl.dll differ diff --git a/citizen-server-instance.dll b/citizen-server-instance.dll index 0de82a414..c3f3820cd 100644 Binary files a/citizen-server-instance.dll and b/citizen-server-instance.dll differ diff --git a/citizen-server-main.dll b/citizen-server-main.dll index 2f574e94e..9bd65a3d1 100644 Binary files a/citizen-server-main.dll and b/citizen-server-main.dll differ diff --git a/citizen-server-monitor.dll b/citizen-server-monitor.dll index 2a460afd2..85a27cace 100644 Binary files a/citizen-server-monitor.dll and b/citizen-server-monitor.dll differ diff --git a/citizen-server-net.dll b/citizen-server-net.dll index d699793a5..42a84bfef 100644 Binary files a/citizen-server-net.dll and b/citizen-server-net.dll differ diff --git a/citizen-server-state-fivesv.dll b/citizen-server-state-fivesv.dll index 3d51fc3be..b23d5af99 100644 Binary files a/citizen-server-state-fivesv.dll and b/citizen-server-state-fivesv.dll differ diff --git a/citizen-server-state-rdr3sv.dll b/citizen-server-state-rdr3sv.dll index 3df72ad11..c3de05ae9 100644 Binary files a/citizen-server-state-rdr3sv.dll and b/citizen-server-state-rdr3sv.dll differ diff --git a/components.json b/components.json index 4f1704f7a..61f91c699 100644 --- a/components.json +++ b/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", diff --git a/conhost-server.dll b/conhost-server.dll index 480883c22..d5689b1d6 100644 Binary files a/conhost-server.dll and b/conhost-server.dll differ diff --git a/debug-script.dll b/debug-script.dll index 3d89fa267..a2fd64256 100644 Binary files a/debug-script.dll and b/debug-script.dll differ diff --git a/devcon.dll b/devcon.dll index 2af9091f3..06103122b 100644 Binary files a/devcon.dll and b/devcon.dll differ diff --git a/http-client.dll b/http-client.dll index 51c5fc452..9921c1fb6 100644 Binary files a/http-client.dll and b/http-client.dll differ diff --git a/hypnonema.db b/hypnonema.db index ade4e6d5b..297e14240 100644 Binary files a/hypnonema.db and b/hypnonema.db differ diff --git a/imgui.dll b/imgui.dll index 281f4c4f7..e75f94cf4 100644 Binary files a/imgui.dll and b/imgui.dll differ diff --git a/net-base.dll b/net-base.dll index 54b7c9035..a336da02a 100644 Binary files a/net-base.dll and b/net-base.dll differ diff --git a/net-http-server.dll b/net-http-server.dll index 8a85f017c..db71136c4 100644 Binary files a/net-http-server.dll and b/net-http-server.dll differ diff --git a/net-packet.dll b/net-packet.dll index 9710ad5cd..abcebc189 100644 Binary files a/net-packet.dll and b/net-packet.dll differ diff --git a/net-tcp-server.dll b/net-tcp-server.dll index ff122718a..5724e37d5 100644 Binary files a/net-tcp-server.dll and b/net-tcp-server.dll differ diff --git a/nng.dll b/nng.dll index 3ce029b80..fb39dd808 100644 Binary files a/nng.dll and b/nng.dll differ diff --git a/node.dll b/node.dll index ee4efbf01..6d671346c 100644 Binary files a/node.dll and b/node.dll differ diff --git a/pool-sizes-state.dll b/pool-sizes-state.dll index 948714e93..97dfc7f8a 100644 Binary files a/pool-sizes-state.dll and b/pool-sizes-state.dll differ diff --git a/resources/Fire-Script/whitelist.json b/resources/Fire-Script/whitelist.json index aa94f7298..c48d16cb5 100644 --- a/resources/Fire-Script/whitelist.json +++ b/resources/Fire-Script/whitelist.json @@ -1 +1 @@ -{"steam:110000112db6102":true,"steam:110000147619e76":true,"steam:110000131ff8eae":true,"steam:11000010e6980a7":true,"steam:11000013c64f700":true} \ No newline at end of file +{"steam:11000013c64f700":true,"steam:11000014684169a":true,"steam:110000112db6102":true,"steam:1100001698dbf6b":true,"steam:110000131ff8eae":true,"steam:110000147619e76":true,"steam:11000010e6980a7":true} \ No newline at end of file diff --git a/resources/Timetrials/scores.txt b/resources/Timetrials/scores.txt index bcc38e719..6847cc950 100644 --- a/resources/Timetrials/scores.txt +++ b/resources/Timetrials/scores.txt @@ -1 +1 @@ -{"Airport Circuit":{"NULL":{"player":"ThatGuyJacobee","time":22916,"car":"NULL"},"P-996 LAZER":{"player":"ThatGuyJacobee","time":59216,"car":"P-996 LAZER"},"Neon":{"player":"ThunderBird","time":92652,"car":"Neon"}},"Race | North GP":{"Windsor Drop":{"player":"[C-81][GCF-145] R. Freeman","time":66673,"car":"Windsor Drop"},"SNOWMOBILE 2020":{"player":"ThatGuyJacobee","time":387242,"car":"SNOWMOBILE 2020"},"BMW M5":{"player":"Stormzy","time":115460,"car":"BMW M5"},"2014 Pierce prescue":{"player":"Klimek07","time":83300,"car":"2014 Pierce prescue"},"NULL":{"player":"SOGGYBEAN","time":42917,"car":"NULL"},"Mercedes AMG GTS":{"player":"Srgt Splooje","time":91546,"car":"Mercedes AMG GTS"}},"Race | Highway Sprint":{"NULL":{"player":"Travis O'Neil","time":27159,"car":"NULL"},"Formula 1":{"player":"shrekislove","time":115451,"car":"Formula 1"},"Ferrari 458":{"player":"ThatGuyJacobee","time":138033,"car":"Ferrari 458"},"Deveste Eight":{"player":"jb3794339","time":181173,"car":"Deveste Eight"},"Ferrari 488s":{"player":"shrekislove","time":188921,"car":"Ferrari 488s"},"Lamborghini Aventador AVJ":{"player":"Kaleb","time":240744,"car":"Lamborghini Aventador AVJ"},"Scramjet":{"player":"Travis O'Neil","time":200543,"car":"Scramjet"}},"Race | Timetrial Event - 04/04/21":{"Ford Velociraptor 6x6":{"player":"ThatGuyJacobee","time":132814,"car":"Ford Velociraptor 6x6"},"Chevrolet Silverado 1980":{"player":"King Rodriguez","time":156244,"car":"Chevrolet Silverado 1980"},"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":191695,"car":"Gauntlet Classic Custom"}},"Cannonball Run":{"NULL":{"player":"ThatGuyJacobee","time":81298,"car":"NULL"}},"Race | Cannonball Run":{"Scramjet":{"player":"C-199|T.Oneil|Deputy I","time":66921,"car":"Scramjet"},"2013 Dodge Charger":{"player":"vJack","time":263368,"car":"2013 Dodge Charger"}},"Race | Airport Drag Race":{"NULL":{"player":"DR-KingRodriguez","time":9270,"car":"NULL"}},"Airport Drag Race":{"NULL":{"player":"iwan.ralphs","time":7030,"car":"NULL"}},"Race | Sandy Airfield":{"NULL":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":4625,"car":"NULL"},"Audi S3 2015":{"player":"King Rodriguez","time":25742,"car":"Audi S3 2015"},"Dodge Charger 2014":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":202399,"car":"Dodge Charger 2014"},"Police Rancher":{"player":"~r~ ¦ 1A-80","time":8092,"car":"Police Rancher"},"F-22A":{"player":"Yalaina-DDR8","time":90697,"car":"F-22A"},"Itali GTO":{"player":"ThunderBird","time":20103,"car":"Itali GTO"},"Jeep TrackHawk 2018":{"player":"King Rodriguez","time":22887,"car":"Jeep TrackHawk 2018"},"School Bus":{"player":"227 | Adam | Senior Officer","time":81320,"car":"School Bus"},"Toyota Sienna 2021":{"player":"Max Rodriguez","time":34685,"car":"Toyota Sienna 2021"},"Kawasaki Ninja ZX10R":{"player":"C-200 | Noki | Deputy 1 | CIV","time":3621,"car":"Kawasaki Ninja ZX10R"},"Dodge Challenger RT 1970":{"player":"trucker","time":52056,"car":"Dodge Challenger RT 1970"},"Cougar MRAP":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":51309,"car":"Cougar MRAP"},"Scramjet":{"player":"C-199|T.Oneil|Deputy I","time":8264,"car":"Scramjet"},"Chevy Camaro20":{"player":"Max Rodriguez","time":32202,"car":"Chevy Camaro20"},"Corvette C7":{"player":"shrekislove","time":31909,"car":"Corvette C7"},"Chevrolet Silverado 2005 2dr":{"player":"herediaaldo4","time":26183,"car":"Chevrolet Silverado 2005 2dr"},"Harley Davidson":{"player":"Max Rodriguez","time":34914,"car":"Harley Davidson"},"BR8":{"player":"C-200 | Noki | Deputy 1 | CIV","time":25853,"car":"BR8"},"Mercedes AMG GTS":{"player":"vJack","time":19029,"car":"Mercedes AMG GTS"},"Chevy Silverado 1500 4dr Cab 2006":{"player":"herediaaldo4","time":29263,"car":"Chevy Silverado 1500 4dr Cab 2006"},"Cliffhanger":{"player":"Zoneil121","time":45601,"car":"Cliffhanger"},"Bugatti Chiron 2017":{"player":"King Rodriguez","time":22371,"car":"Bugatti Chiron 2017"},"Dodge Charger 2018tr":{"player":"ThunderBird","time":26779,"car":"Dodge Charger 2018tr"},"Jeep Grand Cherokee TrackhawkPD 2018":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":36165,"car":"Jeep Grand Cherokee TrackhawkPD 2018"},"Projen-C Sports":{"player":"C-200 | Noki | Deputy 1 | CIV","time":93333,"car":"Projen-C Sports"},"GMC Sierra Singlecab 2006":{"player":"herediaaldo4","time":34750,"car":"GMC Sierra Singlecab 2006"},"EGRP Sheriff PD":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":32983,"car":"EGRP Sheriff PD"},"BMW S 1000 RR":{"player":"C-200 | Noki | Deputy 1 | CIV","time":3221,"car":"BMW S 1000 RR"},"Dodge Ram 2dr 1500 srt 2010":{"player":"Max Rodriguez ","time":21999,"car":"Dodge Ram 2dr 1500 srt 2010"},"BMW i8":{"player":"King Rodriguez","time":24743,"car":"BMW i8"},"Ford Raptor F-150":{"player":"King Rodriguez","time":28515,"car":"Ford Raptor F-150"},"Kawasaki Ninja H2":{"player":"C-200 | Noki | Deputy 1 | CIV","time":4998,"car":"Kawasaki Ninja H2"},"Nero":{"player":"ThunderBird","time":34210,"car":"Nero"},"Formula 1":{"player":"vJack","time":15914,"car":"Formula 1"},"Dodge Challenger srt 2020 ":{"player":"herediaaldo4","time":22940,"car":"Dodge Challenger srt 2020 "},"Verlierer":{"player":"kiyin","time":31698,"car":"Verlierer"},"Oppressor":{"player":"C-200 | Noki | Deputy 1 | CIV","time":19491,"car":"Oppressor"},"Yamaha R6":{"player":"ThatGuyJacobee","time":28188,"car":"Yamaha R6"},"Dick Car":{"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","time":23469,"car":"Dick Car"},"Mini JCW 2020":{"player":"King Rodriguez","time":29879,"car":"Mini JCW 2020"},"Space Docker":{"player":"DyslexicStoner240.","time":29122,"car":"Space Docker"},"BMW M5 Plus":{"player":"King Rodriguez","time":18019,"car":"BMW M5 Plus"},"Ferrari 458":{"player":"Woltage.2","time":25352,"car":"Ferrari 458"},"Neon":{"player":"ThunderBird","time":28815,"car":"Neon"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":29921,"car":"Nissan Skyline GTR"},"2014 Dodge Charger":{"player":"King Rodriguez","time":29132,"car":"2014 Dodge Charger"},"2016 Ford Explorer":{"player":"King Rodriguez","time":26526,"car":"2016 Ford Explorer"}},"Lakeside Loop":{"NULL":{"player":"DR*KINGPORNHUB","time":206147,"car":"NULL"}},"Race | BCSO Training Course":{"NULL":{"player":"ThatGuyJacobee","time":100457,"car":"NULL"},"Schafter V12 (Armored)":{"player":"Bulvederis","time":53363,"car":"Schafter V12 (Armored)"},"2013 Dodge Charger":{"player":"vJack","time":94246,"car":"2013 Dodge Charger"},"Neon":{"player":"ThunderBird","time":105527,"car":"Neon"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":105983,"car":"Nissan Skyline GTR"},"2016 Dodge Ram":{"player":"vJack","time":119099,"car":"2016 Dodge Ram"},"Mercedes AMG GTS":{"player":"vJack","time":78151,"car":"Mercedes AMG GTS"}},"Race | Airport Circuit":{"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":83978,"car":"Nissan Skyline GTR"},"Formula 1":{"player":"vJack","time":42751,"car":"Formula 1"},"Ferrari 458":{"player":"ThatGuyJacobee","time":69880,"car":"Ferrari 458"}},"Observatory Loop":{"NULL":{"player":"ThatGuyJacobee","time":34126,"car":"NULL"}},"Race | Observatory Loop":{"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":76765,"car":"Gauntlet Classic Custom"},"Formula 1":{"player":"ThatGuyJacobee","time":54744,"car":"Formula 1"},"BMW M5":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":81837,"car":"BMW M5"},"Porsche 911 GT3RS":{"player":"[YJ-18] Sinapsey","time":106410,"car":"Porsche 911 GT3RS"},"Mazda Miata":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":79814,"car":"Mazda Miata"},"2013 Dodge Charger":{"player":"vJack","time":64004,"car":"2013 Dodge Charger"},"Ford F-150 Lightning 2022":{"player":"ThatGuyJacobee","time":68440,"car":"Ford F-150 Lightning 2022"},"NULL":{"player":"[YJ-18] Sinapsey","time":55388,"car":"NULL"},"Nissan Skyline GTR":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":67881,"car":"Nissan Skyline GTR"},"BMW M5 Plus":{"player":"[EGRP-02]King Rodriguez","time":70752,"car":"BMW M5 Plus"},"Mercedes AMG GTS":{"player":"vJack","time":56747,"car":"Mercedes AMG GTS"}},"Sandy Airfield":{"NULL":{"player":"ThatGuyJacobee","time":5607,"car":"NULL"},"Maverick":{"player":"vJack","time":29165,"car":"Maverick"},"Jester":{"player":"michael82","time":47982,"car":"Jester"},"Oppressor":{"player":"michael82","time":21360,"car":"Oppressor"},"BMX":{"player":"vJack","time":21014,"car":"BMX"},"Vigilante":{"player":"*ZbyniU*","time":6172,"car":"Vigilante"},"Neon":{"player":"ThunderBird","time":30312,"car":"Neon"},"FH-1 Hunter":{"player":"*ZbyniU*","time":36289,"car":"FH-1 Hunter"},"RE-7B":{"player":"*ZbyniU*","time":28456,"car":"RE-7B"}},"Race | Hillside Loop":{"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":230432,"car":"Gauntlet Classic Custom"},"Bronco Wildtrak 2021":{"player":"ThatGuyJacobee","time":210714,"car":"Bronco Wildtrak 2021"},"BMW M8 Widebody":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":195442,"car":"BMW M8 Widebody"}},"Race | Hollywood Hills":{"NULL":{"player":"ThatGuyJacobee","time":102048,"car":"NULL"},"Ford F-150 Lightning 2022":{"player":"ThatGuyJacobee","time":105278,"car":"Ford F-150 Lightning 2022"},"Ruiner 2000":{"player":"Travis O'Neil","time":140708,"car":"Ruiner 2000"},"Audi R8 V10":{"player":"ThatGuyJacobee","time":100677,"car":"Audi R8 V10"},"Mercedes AMG GTS":{"player":"vJack","time":85823,"car":"Mercedes AMG GTS"}},"Highway Sprint":{"NULL":{"player":"vJack","time":93300,"car":"NULL"}},"Race | Lakeside Loop":{"BMW S 1000 RR":{"player":"C-200 | Noki | Deputy 1 | CIV","time":21701,"car":"BMW S 1000 RR"},"Kawasaki Ninja ZX10R":{"player":"C-200 | Noki | Deputy 1 | CIV","time":28696,"car":"Kawasaki Ninja ZX10R"},"Adder":{"player":"Oli","time":30689,"car":"Adder"},"Bifta":{"player":"Who Dat","time":248420,"car":"Bifta"},"Ford Crown Vic 2011":{"player":"AnySpiderBat","time":231931,"car":"Ford Crown Vic 2011"},"EGRP Staff Buggy":{"player":"[EGRP-02]King Rodriguez","time":43710,"car":"EGRP Staff Buggy"},"SNOWMOBILE 2020":{"player":"[C-146] E. Cartman","time":107015,"car":"SNOWMOBILE 2020"},"NULL":{"player":"ThatGuyJacobee","time":196803,"car":"NULL"},"Ford Explorer 2020":{"player":"shrekislove","time":260276,"car":"Ford Explorer 2020"},"Ferrari 458":{"player":"ThatGuyJacobee","time":177461,"car":"Ferrari 458"},"Sheriff Cruiser":{"player":"Ole Stinky","time":153384,"car":"Sheriff Cruiser"}},"Race | Airport Drag":{"NULL":{"player":"B. LAO","time":12630,"car":"NULL"},"Formula 1":{"player":"King Rodriguez","time":7629,"car":"Formula 1"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":9693,"car":"Nissan Skyline GTR"},"BMW M5 Plus":{"player":"King Rodriguez","time":8652,"car":"BMW M5 Plus"},"Police Corvette 2019":{"player":"Woltage.2","time":14484,"car":"Police Corvette 2019"},"2010 Chevy Tahoe":{"player":"King Rodriguez","time":12821,"car":"2010 Chevy Tahoe"}},"North Rallycross ":{"Neon":{"player":"ThunderBird","time":351612,"car":"Neon"}},"Hollywood Hills":{"NULL":{"player":"Kryplos125","time":120053,"car":"NULL"}},"BCSO Training Course":{"Jester":{"player":"michael82","time":37835,"car":"Jester"},"NULL":{"player":"ThatGuyJacobee","time":26915,"car":"NULL"}},"North GP":{"NULL":{"player":"vJack","time":191650,"car":"NULL"},"Neon":{"player":"ThunderBird","time":354856,"car":"Neon"},"Baller":{"player":"dcapone00","time":410118,"car":"Baller"}}} \ No newline at end of file +{"Highway Sprint":{"NULL":{"time":93300,"player":"vJack","car":"NULL"}},"Observatory Loop":{"NULL":{"time":34126,"player":"ThatGuyJacobee","car":"NULL"}},"Race | Lakeside Loop":{"Ford Crown Vic 2011":{"time":231931,"player":"AnySpiderBat","car":"Ford Crown Vic 2011"},"Ford Explorer 2020":{"time":260276,"player":"shrekislove","car":"Ford Explorer 2020"},"NULL":{"time":41506,"player":"~p~ dojaacart","car":"NULL"},"Sheriff Cruiser":{"time":153384,"player":"Ole Stinky","car":"Sheriff Cruiser"},"Ferrari 458":{"time":177461,"player":"ThatGuyJacobee","car":"Ferrari 458"},"SNOWMOBILE 2020":{"time":107015,"player":"[C-146] E. Cartman","car":"SNOWMOBILE 2020"},"Adder":{"time":30689,"player":"Oli","car":"Adder"},"BMW S 1000 RR":{"time":21701,"player":"C-200 | Noki | Deputy 1 | CIV","car":"BMW S 1000 RR"},"EGRP Staff Buggy":{"time":43710,"player":"[EGRP-02]King Rodriguez","car":"EGRP Staff Buggy"},"Kawasaki Ninja ZX10R":{"time":28696,"player":"C-200 | Noki | Deputy 1 | CIV","car":"Kawasaki Ninja ZX10R"},"Bifta":{"time":248420,"player":"Who Dat","car":"Bifta"}},"Race | Highway Sprint":{"Ferrari 458":{"time":138033,"player":"ThatGuyJacobee","car":"Ferrari 458"},"Deveste Eight":{"time":181173,"player":"jb3794339","car":"Deveste Eight"},"Ferrari 488s":{"time":188921,"player":"shrekislove","car":"Ferrari 488s"},"Formula 1":{"time":115451,"player":"shrekislove","car":"Formula 1"},"NULL":{"time":27159,"player":"Travis O'Neil","car":"NULL"},"Scramjet":{"time":200543,"player":"Travis O'Neil","car":"Scramjet"},"Lamborghini Aventador AVJ":{"time":240744,"player":"Kaleb","car":"Lamborghini Aventador AVJ"}},"Sandy Airfield":{"Neon":{"time":30312,"player":"ThunderBird","car":"Neon"},"FH-1 Hunter":{"time":36289,"player":"*ZbyniU*","car":"FH-1 Hunter"},"Vigilante":{"time":6172,"player":"*ZbyniU*","car":"Vigilante"},"BMX":{"time":21014,"player":"vJack","car":"BMX"},"Oppressor":{"time":21360,"player":"michael82","car":"Oppressor"},"NULL":{"time":5607,"player":"ThatGuyJacobee","car":"NULL"},"Maverick":{"time":29165,"player":"vJack","car":"Maverick"},"RE-7B":{"time":28456,"player":"*ZbyniU*","car":"RE-7B"},"Jester":{"time":47982,"player":"michael82","car":"Jester"}},"Race | Hillside Loop":{"Bronco Wildtrak 2021":{"time":210714,"player":"ThatGuyJacobee","car":"Bronco Wildtrak 2021"},"Gauntlet Classic Custom":{"time":230432,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom"},"BMW M8 Widebody":{"time":195442,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"BMW M8 Widebody"}},"Race | Hollywood Hills":{"Ford F-150 Lightning 2022":{"time":105278,"player":"ThatGuyJacobee","car":"Ford F-150 Lightning 2022"},"Audi R8 V10":{"time":100677,"player":"ThatGuyJacobee","car":"Audi R8 V10"},"Ruiner 2000":{"time":140708,"player":"Travis O'Neil","car":"Ruiner 2000"},"Mercedes AMG GTS":{"time":85823,"player":"vJack","car":"Mercedes AMG GTS"},"NULL":{"time":102048,"player":"ThatGuyJacobee","car":"NULL"}},"Airport Circuit":{"P-996 LAZER":{"time":59216,"player":"ThatGuyJacobee","car":"P-996 LAZER"},"Neon":{"time":92652,"player":"ThunderBird","car":"Neon"},"NULL":{"time":22916,"player":"ThatGuyJacobee","car":"NULL"}},"Lakeside Loop":{"NULL":{"time":206147,"player":"DR*KINGPORNHUB","car":"NULL"}},"Race | North GP":{"BMW M5":{"time":115460,"player":"Stormzy","car":"BMW M5"},"SNOWMOBILE 2020":{"time":387242,"player":"ThatGuyJacobee","car":"SNOWMOBILE 2020"},"2014 Pierce prescue":{"time":83300,"player":"Klimek07","car":"2014 Pierce prescue"},"Windsor Drop":{"time":66673,"player":"[C-81][GCF-145] R. Freeman","car":"Windsor Drop"},"Mercedes AMG GTS":{"time":91546,"player":"Srgt Splooje","car":"Mercedes AMG GTS"},"NULL":{"time":42917,"player":"SOGGYBEAN","car":"NULL"}},"Hollywood Hills":{"NULL":{"time":120053,"player":"Kryplos125","car":"NULL"}},"Cannonball Run":{"NULL":{"time":81298,"player":"ThatGuyJacobee","car":"NULL"}},"Race | Airport Drag Race":{"NULL":{"time":9270,"player":"DR-KingRodriguez","car":"NULL"}},"BCSO Training Course":{"Jester":{"time":37835,"player":"michael82","car":"Jester"},"NULL":{"time":26915,"player":"ThatGuyJacobee","car":"NULL"}},"Race | BCSO Training Course":{"Neon":{"time":105527,"player":"ThunderBird","car":"Neon"},"NULL":{"time":100457,"player":"ThatGuyJacobee","car":"NULL"},"2016 Dodge Ram":{"time":119099,"player":"vJack","car":"2016 Dodge Ram"},"Schafter V12 (Armored)":{"time":53363,"player":"Bulvederis","car":"Schafter V12 (Armored)"},"Nissan Skyline GTR":{"time":105983,"player":"ThatGuyJacobee","car":"Nissan Skyline GTR"},"Mercedes AMG GTS":{"time":78151,"player":"vJack","car":"Mercedes AMG GTS"},"2013 Dodge Charger":{"time":94246,"player":"vJack","car":"2013 Dodge Charger"}},"Race | Sandy Airfield":{"Kawasaki Ninja ZX10R":{"time":3621,"player":"C-200 | Noki | Deputy 1 | CIV","car":"Kawasaki Ninja ZX10R"},"Jeep Grand Cherokee TrackhawkPD 2018":{"time":36165,"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","car":"Jeep Grand Cherokee TrackhawkPD 2018"},"Corvette C7":{"time":31909,"player":"shrekislove","car":"Corvette C7"},"GMC Sierra Singlecab 2006":{"time":34750,"player":"herediaaldo4","car":"GMC Sierra Singlecab 2006"},"Dodge Charger 2018tr":{"time":26779,"player":"ThunderBird","car":"Dodge Charger 2018tr"},"Dodge Challenger srt 2020 ":{"time":22940,"player":"herediaaldo4","car":"Dodge Challenger srt 2020 "},"Space Docker":{"time":29122,"player":"DyslexicStoner240.","car":"Space Docker"},"BMW M5 Plus":{"time":18019,"player":"King Rodriguez","car":"BMW M5 Plus"},"Dick Car":{"time":23469,"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","car":"Dick Car"},"BMW i8":{"time":24743,"player":"King Rodriguez","car":"BMW i8"},"Mercedes AMG GTS":{"time":19029,"player":"vJack","car":"Mercedes AMG GTS"},"Dodge Charger 2014":{"time":202399,"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","car":"Dodge Charger 2014"},"Toyota Sienna 2021":{"time":34685,"player":"Max Rodriguez","car":"Toyota Sienna 2021"},"Yamaha R6":{"time":28188,"player":"ThatGuyJacobee","car":"Yamaha R6"},"Mini JCW 2020":{"time":29879,"player":"King Rodriguez","car":"Mini JCW 2020"},"Harley Davidson":{"time":34914,"player":"Max Rodriguez","car":"Harley Davidson"},"Itali GTO":{"time":20103,"player":"ThunderBird","car":"Itali GTO"},"Formula 1":{"time":15914,"player":"vJack","car":"Formula 1"},"Jeep TrackHawk 2018":{"time":22887,"player":"King Rodriguez","car":"Jeep TrackHawk 2018"},"F-22A":{"time":90697,"player":"Yalaina-DDR8","car":"F-22A"},"Nissan Skyline GTR":{"time":29921,"player":"ThatGuyJacobee","car":"Nissan Skyline GTR"},"Cougar MRAP":{"time":51309,"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","car":"Cougar MRAP"},"Neon":{"time":28815,"player":"ThunderBird","car":"Neon"},"Chevrolet Silverado 2005 2dr":{"time":26183,"player":"herediaaldo4","car":"Chevrolet Silverado 2005 2dr"},"NULL":{"time":3173,"player":"~p~ dojaacart","car":"NULL"},"Chevy Silverado 1500 4dr Cab 2006":{"time":29263,"player":"herediaaldo4","car":"Chevy Silverado 1500 4dr Cab 2006"},"Dodge Ram 2dr 1500 srt 2010":{"time":21999,"player":"Max Rodriguez ","car":"Dodge Ram 2dr 1500 srt 2010"},"Police Rancher":{"time":8092,"player":"~r~ ¦ 1A-80","car":"Police Rancher"},"Audi S3 2015":{"time":25742,"player":"King Rodriguez","car":"Audi S3 2015"},"BR8":{"time":25853,"player":"C-200 | Noki | Deputy 1 | CIV","car":"BR8"},"Bugatti Chiron 2017":{"time":22371,"player":"King Rodriguez","car":"Bugatti Chiron 2017"},"Cliffhanger":{"time":45601,"player":"Zoneil121","car":"Cliffhanger"},"School Bus":{"time":81320,"player":"227 | Adam | Senior Officer","car":"School Bus"},"Kawasaki Ninja H2":{"time":4998,"player":"C-200 | Noki | Deputy 1 | CIV","car":"Kawasaki Ninja H2"},"Oppressor":{"time":19491,"player":"C-200 | Noki | Deputy 1 | CIV","car":"Oppressor"},"Projen-C Sports":{"time":93333,"player":"C-200 | Noki | Deputy 1 | CIV","car":"Projen-C Sports"},"Ford Raptor F-150":{"time":28515,"player":"King Rodriguez","car":"Ford Raptor F-150"},"Verlierer":{"time":31698,"player":"kiyin","car":"Verlierer"},"EGRP Sheriff PD":{"time":32983,"player":"C-197 | FP-410 | Tristan M. | Deputy I | Probi. FF","car":"EGRP Sheriff PD"},"Chevy Camaro20":{"time":32202,"player":"Max Rodriguez","car":"Chevy Camaro20"},"Nero":{"time":34210,"player":"ThunderBird","car":"Nero"},"Dodge Challenger RT 1970":{"time":52056,"player":"trucker","car":"Dodge Challenger RT 1970"},"Ferrari 458":{"time":25352,"player":"Woltage.2","car":"Ferrari 458"},"BMW S 1000 RR":{"time":3221,"player":"C-200 | Noki | Deputy 1 | CIV","car":"BMW S 1000 RR"},"Scramjet":{"time":8264,"player":"C-199|T.Oneil|Deputy I","car":"Scramjet"},"2016 Ford Explorer":{"time":26526,"player":"King Rodriguez","car":"2016 Ford Explorer"},"2014 Dodge Charger":{"time":29132,"player":"King Rodriguez","car":"2014 Dodge Charger"}},"Airport Drag Race":{"NULL":{"time":7030,"player":"iwan.ralphs","car":"NULL"}},"Race | Timetrial Event - 04/04/21":{"Ford Velociraptor 6x6":{"time":132814,"player":"ThatGuyJacobee","car":"Ford Velociraptor 6x6"},"Chevrolet Silverado 1980":{"time":156244,"player":"King Rodriguez","car":"Chevrolet Silverado 1980"},"Gauntlet Classic Custom":{"time":191695,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom"}},"Race | Airport Circuit":{"Omnis e-GT":{"time":94256,"player":"klimek PIXARP","car":"Omnis e-GT"},"Zentorno":{"time":87585,"player":"klimek PIXARP","car":"Zentorno"},"Formula 1":{"time":42751,"player":"vJack","car":"Formula 1"},"Nissan Skyline GTR":{"time":83978,"player":"ThatGuyJacobee","car":"Nissan Skyline GTR"},"Ferrari 458":{"time":69880,"player":"ThatGuyJacobee","car":"Ferrari 458"}},"Race | Airport Drag":{"Police Corvette 2019":{"time":14484,"player":"Woltage.2","car":"Police Corvette 2019"},"2010 Chevy Tahoe":{"time":12821,"player":"King Rodriguez","car":"2010 Chevy Tahoe"},"Zentorno":{"time":11976,"player":"klimek PIXARP","car":"Zentorno"},"BMW M5 Plus":{"time":8652,"player":"King Rodriguez","car":"BMW M5 Plus"},"Formula 1":{"time":7629,"player":"King Rodriguez","car":"Formula 1"},"Nissan Skyline GTR":{"time":9693,"player":"ThatGuyJacobee","car":"Nissan Skyline GTR"},"Omnis e-GT":{"time":12065,"player":"klimek PIXARP","car":"Omnis e-GT"},"NULL":{"time":12630,"player":"B. LAO","car":"NULL"}},"North Rallycross ":{"Neon":{"time":351612,"player":"ThunderBird","car":"Neon"}},"Race | Cannonball Run":{"Scramjet":{"time":66921,"player":"C-199|T.Oneil|Deputy I","car":"Scramjet"},"2013 Dodge Charger":{"time":263368,"player":"vJack","car":"2013 Dodge Charger"}},"North GP":{"Neon":{"time":354856,"player":"ThunderBird","car":"Neon"},"Baller":{"time":410118,"player":"dcapone00","car":"Baller"},"NULL":{"time":191650,"player":"vJack","car":"NULL"}},"Race | Observatory Loop":{"Porsche 911 GT3RS":{"time":106410,"player":"[YJ-18] Sinapsey","car":"Porsche 911 GT3RS"},"Mazda Miata":{"time":79814,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Mazda Miata"},"NULL":{"time":55388,"player":"[YJ-18] Sinapsey","car":"NULL"},"Ford F-150 Lightning 2022":{"time":68440,"player":"ThatGuyJacobee","car":"Ford F-150 Lightning 2022"},"BMW M5":{"time":81837,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"BMW M5"},"Gauntlet Classic Custom":{"time":76765,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom"},"BMW M5 Plus":{"time":70752,"player":"[EGRP-02]King Rodriguez","car":"BMW M5 Plus"},"Formula 1":{"time":54744,"player":"ThatGuyJacobee","car":"Formula 1"},"2013 Dodge Charger":{"time":64004,"player":"vJack","car":"2013 Dodge Charger"},"Mercedes AMG GTS":{"time":56747,"player":"vJack","car":"Mercedes AMG GTS"},"Nissan Skyline GTR":{"time":67881,"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Nissan Skyline GTR"}}} \ No newline at end of file diff --git a/resources/[ERS]/night_discordapi/config/config.lua b/resources/[ERS]/night_discordapi/config/config.lua index 47608c03a..47e314c5d 100644 --- a/resources/[ERS]/night_discordapi/config/config.lua +++ b/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 } diff --git a/resources/fivepd/config.json b/resources/fivepd/config.json index 202ec60ee..cce3addbf 100644 --- a/resources/fivepd/config.json +++ b/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" diff --git a/resources/vMenu/vmenu.log b/resources/vMenu/vmenu.log index 3618ce6d3..98fa6f066 100644 --- a/resources/vMenu/vmenu.log +++ b/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. diff --git a/scrbind-base.dll b/scrbind-base.dll index 19fe7de89..63ad03b29 100644 Binary files a/scrbind-base.dll and b/scrbind-base.dll differ diff --git a/scripting-server.dll b/scripting-server.dll index 5b7f11bc1..a6d1a70b7 100644 Binary files a/scripting-server.dll and b/scripting-server.dll differ diff --git a/server.cfg b/server.cfg index 2dd36345c..2b383760f 100644 --- a/server.cfg +++ b/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-----] diff --git a/svadhesive.dll b/svadhesive.dll index 8e7738ebc..f37e9de9e 100644 Binary files a/svadhesive.dll and b/svadhesive.dll differ diff --git a/vfs-core.dll b/vfs-core.dll index d31d962f8..27c8c4db1 100644 Binary files a/vfs-core.dll and b/vfs-core.dll differ diff --git a/vfs-impl-server.dll b/vfs-impl-server.dll index 83bcc85ef..902d26618 100644 Binary files a/vfs-impl-server.dll and b/vfs-impl-server.dll differ diff --git a/voip-server-mumble.dll b/voip-server-mumble.dll index 36d107c01..93e0a96a8 100644 Binary files a/voip-server-mumble.dll and b/voip-server-mumble.dll differ