Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

2025-06-15 02:49:12 +02:00 · 2025-06-15 02:49:12 +02:00 · 60f4656bc1
commit 60f4656bc1
parent 71eb99f271 0c5422ad86
21 changed files with 3255 additions and 3255 deletions
--- a/resources/[Developer]/[Max]/Duck_new_wartung/config.lua
+++ b/resources/[Developer]/[Max]/Duck_new_wartung/config.lua
@ -1,5 +1,5 @@
 Config = {
    DiscordWebhook = "https://discord.com/api/webhooks/1383151445532086442/02u3NBPWov8pfKj8B-F-lyr-BH54hPgdCgROUqe6aZmVxLDChYCSSbyGkC7YPUtUYWzi",
-    WartungsNachricht = "🔧 Wartungsarbeiten 🔧\nDer Server wird jetzt gewartet!",
+    WartungsNachricht = "🔧 Wartungsarbeiten 🔧\nDer Server wird jetzt gewartet! >> Connect solange nicht Möglich!",
    ErlaubteRolle = "admin" 
 }
--- a/resources/[inventory]/qs-inventory/html/images/Ecola.png
+++ b/resources/[inventory]/qs-inventory/html/images/Ecola.png
--- a/resources/[tools]/okokCrafting/.fxap
+++ b/resources/[tools]/okokCrafting/.fxap
--- a/resources/[tools]/okokCrafting/README.md
+++ b/resources/[tools]/okokCrafting/README.md
--- a/resources/[tools]/okokCrafting/cl_utils.lua
+++ b/resources/[tools]/okokCrafting/cl_utils.lua
--- a/resources/[tools]/okokCrafting/client.lua
+++ b/resources/[tools]/okokCrafting/client.lua
--- a/resources/[tools]/okokCrafting/config.lua
+++ b/resources/[tools]/okokCrafting/config.lua
--- a/resources/[tools]/okokCrafting/fxmanifest.lua
+++ b/resources/[tools]/okokCrafting/fxmanifest.lua
--- a/resources/[tools]/okokCrafting/locales/de.lua
+++ b/resources/[tools]/okokCrafting/locales/de.lua
--- a/resources/[tools]/okokCrafting/locales/en.lua
+++ b/resources/[tools]/okokCrafting/locales/en.lua
--- a/resources/[tools]/okokCrafting/locales/fr.lua
+++ b/resources/[tools]/okokCrafting/locales/fr.lua
--- a/resources/[tools]/okokCrafting/locales/gr.lua
+++ b/resources/[tools]/okokCrafting/locales/gr.lua
--- a/resources/[tools]/okokCrafting/locales/pt.lua
+++ b/resources/[tools]/okokCrafting/locales/pt.lua
--- a/resources/[test]/okokCrafting/okokcrafting.sql
+++ b/resources/[test]/okokCrafting/okokcrafting.sql
@ -0,0 +1,2 @@
+ALTER TABLE players ADD COLUMN xp LONGTEXT NULL;
+ALTER TABLE players ADD COLUMN okokcrafts LONGTEXT NULL;
--- a/resources/[tools]/okokCrafting/server.lua
+++ b/resources/[tools]/okokCrafting/server.lua
--- a/resources/[tools]/okokCrafting/sv_utils.lua
+++ b/resources/[tools]/okokCrafting/sv_utils.lua
--- a/resources/[tools]/okokCrafting/web/click.mp3
+++ b/resources/[tools]/okokCrafting/web/click.mp3
--- a/resources/[tools]/okokCrafting/web/scripts.js
+++ b/resources/[tools]/okokCrafting/web/scripts.js
--- a/resources/[tools]/okokCrafting/web/styles.css
+++ b/resources/[tools]/okokCrafting/web/styles.css
--- a/resources/[tools]/okokCrafting/web/ui.html
+++ b/resources/[tools]/okokCrafting/web/ui.html
--- a/resources/[tools]/okokCrafting/okokcrafting.sql
+++ b/resources/[tools]/okokCrafting/okokcrafting.sql
@ -1,2 +0,0 @@
-ALTER TABLE players ADD COLUMN xp LONGTEXT NULL;
-ALTER TABLE players ADD COLUMN okokcrafts LONGTEXT NULL;