From 9a3814ed9b7cdf6e2af20061b594c3cc54b27e33 Mon Sep 17 00:00:00 2001 From: Kakarot <57848836+GhzGarage@users.noreply.github.com> Date: Thu, 17 Feb 2022 21:24:55 -0600 Subject: [PATCH 01/15] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 1d9dfa0..b1801dd 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,16 @@ ### [Official QBCore Documentation](https://qbcore-framework.github.io/qb-docs/) +# Sonoran Software +![Sonoran Software Partnership](https://sonoransoftware.com/assets/images/promotional/partners/qb_banner_coupon.png) +## QB Core is officially partnered with Sonoran Software! +Sonoran Software offers: +* [The most advanced, integrated CAD software](https://sonorancad.com/kakarot) +* [Complete community management software](https://sonorancms.com/kakarot) +* [In-depth radio communications simulator](https://sonoranradio.com/kakarot) +* [Premium server hosting](https://sonoranservers.com/kakarot) + +Use code `KAKAROT` for 20% off your first month at checkout! # License From 3cb435b7371dbcb7147ae58d55e97a99d89ce0e9 Mon Sep 17 00:00:00 2001 From: Kakarot <57848836+GhzGarage@users.noreply.github.com> Date: Thu, 17 Feb 2022 21:26:48 -0600 Subject: [PATCH 02/15] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b1801dd..b0e11be 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,8 @@ ### [Official QBCore Documentation](https://qbcore-framework.github.io/qb-docs/) -# Sonoran Software -![Sonoran Software Partnership](https://sonoransoftware.com/assets/images/promotional/partners/qb_banner_coupon.png) -## QB Core is officially partnered with Sonoran Software! + +## QBCore is officially partnered with Sonoran Software! Sonoran Software offers: * [The most advanced, integrated CAD software](https://sonorancad.com/kakarot) * [Complete community management software](https://sonorancms.com/kakarot) @@ -13,6 +12,9 @@ Sonoran Software offers: Use code `KAKAROT` for 20% off your first month at checkout! +# Sonoran Software +![Sonoran Software Partnership](https://sonoransoftware.com/assets/images/promotional/partners/qb_banner_coupon.png) + # License QBCore Framework From ca826e1499256354bf203cc46d53fc72a348fbf0 Mon Sep 17 00:00:00 2001 From: Muhammed Developer <56224780+muhammed10100@users.noreply.github.com> Date: Sat, 19 Feb 2022 09:34:01 +0300 Subject: [PATCH 03/15] feat (locale/tr): Added turkish locale. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Türkçe Karakter Yer Almakta --- locale/tr.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 locale/tr.lua diff --git a/locale/tr.lua b/locale/tr.lua new file mode 100644 index 0000000..b66ab2c --- /dev/null +++ b/locale/tr.lua @@ -0,0 +1,25 @@ +local Translations = { + error = { + not_online = 'Oyuncu çevrimiçi değil', + wrong_format = 'Yanlış birim', + missing_args = 'Her argüman girilmedi (x, y, z)', + missing_args2 = 'Tüm argümanlar doldurulmalıdır!', + no_access = 'Bu komuta erişim yok', + company_too_poor = 'İşvereniniz bozuk', + item_not_exist = 'Öğe mevcut değil', + too_heavy = 'Envanter çok dolu' + }, + success = {}, + info = { + received_paycheck = 'Maaş çekinizi aldınız $%{value}', + job_info = 'İş: %{value} | Seviye: %{value2} | Görev: %{value3}', + gang_info = 'Çete: %{value} | Seviye: %{value2}', + on_duty = 'Şimdi görev başındasın!', + off_duty = 'Şimdi görevden alındın!' + } +} + +Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true +}) From 94a1f437343393be82b7ce8c7fc7113db3748c1f Mon Sep 17 00:00:00 2001 From: MonkeyWhisper <82112471+MonkeyWhisper@users.noreply.github.com> Date: Fri, 18 Feb 2022 22:36:57 -0800 Subject: [PATCH 04/15] feat (locale/es): Added spanish. * updated spanish Sounded weird * Update es.lua --- locale/es.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locale/es.lua b/locale/es.lua index 9986991..0133ea0 100644 --- a/locale/es.lua +++ b/locale/es.lua @@ -2,6 +2,8 @@ local Translations = { error = { not_online = 'El jugador no está conectado!', wrong_format = 'Formato incorrecto!', + missing_args = 'No todos los argumentos estan presente! (x, y, z)', + missing_args2 = 'Todos los argumentos tienen que estar presente!', missing_args = 'No todos los argumentos estan presentes! (x, y, z)', missing_args2 = 'Todos los argumentos deben estar presentes!', no_access = 'No tienes acceso a este comando!', @@ -13,7 +15,7 @@ local Translations = { info = { received_paycheck = 'Has recibido tu pago de $%{value}', job_info = 'Trabajo: %{value} | Grado: %{value2} | Estado: %{value3}', - gang_info = 'Banda: %{value} | Grado: %{value2}', + gang_info = 'Pandilla: %{value} | Grado: %{value2}', on_duty = 'Ahora estás en servicio!', off_duty = 'Ahora estás fuera de servicio!' } From 93be2817b12e0ccceed5bc3328600abe17d506b8 Mon Sep 17 00:00:00 2001 From: Casper <71441748+JajarGaming@users.noreply.github.com> Date: Sat, 19 Feb 2022 08:37:54 +0200 Subject: [PATCH 05/15] feat (locale/lv): Added latvian. I'm personally a native speaker and I can approve this is correct. --- locale/lv.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 locale/lv.lua diff --git a/locale/lv.lua b/locale/lv.lua new file mode 100644 index 0000000..c7b4c38 --- /dev/null +++ b/locale/lv.lua @@ -0,0 +1,25 @@ +local Translations = { + error = { + not_online = 'Spēlētājs nav online', + wrong_format = 'Nepareizs formāts', + missing_args = 'Ne visi argumenti tika ievadīti (x, y, z)', + missing_args2 = 'Visiem argumentiem ir jābut aizpildītiem!', + no_access = 'Nav piekļuve šai commandai', + company_too_poor = 'Jūsu darba vedējs ir nabadzīgs', + item_not_exist = 'Šī lieta nēeksistē', + too_heavy = 'Inventārs ir pārāk pilns' + }, + success = {}, + info = { + received_paycheck = 'Jūs esat saņēmuši savu algu par $%{value}', + job_info = 'Darbs: %{value} | Pakāpe: %{value2} | Pienākums: %{value3}', + gang_info = 'Banda: %{value} | Pakāpe: %{value2}', + on_duty = 'Jūs tagad esat dienestā!', + off_duty = 'Jūs tagad esat atbrīvots no dienesta!' + } +} + +Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true +}) From 394d723eae28395c5f559811c6f2200a9d82c853 Mon Sep 17 00:00:00 2001 From: Chaini <28576404+chainiDV@users.noreply.github.com> Date: Sat, 19 Feb 2022 08:03:25 +0100 Subject: [PATCH 06/15] feat(qb-core/player): Added server-side event onJobUpdate (#516) Added server-side event onJobUpdate so scripts can listen on server if any player changed their job. It's safer than redirecting client event to server again. --- server/player.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/server/player.lua b/server/player.lua index f9ed6ad..1a15ae3 100644 --- a/server/player.lua +++ b/server/player.lua @@ -196,6 +196,7 @@ function QBCore.Player.CreatePlayer(PlayerData) end self.Functions.UpdatePlayerData() + TriggerEvent('QBCore:Server:OnJobUpdate', self.PlayerData.source, self.PlayerData.job) TriggerClientEvent('QBCore:Client:OnJobUpdate', self.PlayerData.source, self.PlayerData.job) return true end From f58478b61f856ca5b53f08d679d0ea05847380b7 Mon Sep 17 00:00:00 2001 From: Brady F Date: Sat, 19 Feb 2022 01:09:23 -0600 Subject: [PATCH 07/15] feat (server/player): Added Job update on duty update (#519) * Trigger Job Update on Duty Update * Add server event --- server/player.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/player.lua b/server/player.lua index 1a15ae3..9609875 100644 --- a/server/player.lua +++ b/server/player.lua @@ -234,6 +234,8 @@ function QBCore.Player.CreatePlayer(PlayerData) self.Functions.SetJobDuty = function(onDuty) self.PlayerData.job.onduty = onDuty self.Functions.UpdatePlayerData() + TriggerEvent('QBCore:Server:OnJobUpdate', self.PlayerData.source, self.PlayerData.job) + TriggerClientEvent('QBCore:Client:OnJobUpdate', self.PlayerData.source, self.PlayerData.job) end self.Functions.SetMetaData = function(meta, val) From 67b1e20a9299125272b5d8a7f57cde6512087696 Mon Sep 17 00:00:00 2001 From: wert Date: Tue, 1 Mar 2022 15:03:28 +0000 Subject: [PATCH 08/15] tweak(index.html): Fix css/js href --- html/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/index.html b/html/index.html index 3d39174..4415f61 100644 --- a/html/index.html +++ b/html/index.html @@ -31,8 +31,8 @@ defer > - - + +
Date: Tue, 1 Mar 2022 13:19:41 -0500 Subject: [PATCH 09/15] Update HTML to reflect new location of assets --- html/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/html/index.html b/html/index.html index 3d39174..a229080 100644 --- a/html/index.html +++ b/html/index.html @@ -19,7 +19,7 @@ type="text/css" /> - - - + + +
- \ No newline at end of file + From e9e0cffd67153e24bd0def93669df6e66b63ff64 Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:11:19 +1100 Subject: [PATCH 10/15] Create auto_assign.yml --- .github/auto_assign.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/auto_assign.yml diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml new file mode 100644 index 0000000..60f6e88 --- /dev/null +++ b/.github/auto_assign.yml @@ -0,0 +1,19 @@ +# Set to true to add reviewers to pull requests +addReviewers: true + +# Set to true to add assignees to pull requests +addAssignees: false + +# A list of reviewers to be added to pull requests (GitHub user name) +reviewers: + - IdrisDose + - reviewerB + - reviewerC + +# A list of keywords to be skipped the process that add reviewers if pull requests include it +skipKeywords: + - wip + +# A number of reviewers added to the pull request +# Set 0 to add all the reviewers (default: 0) +numberOfReviewers: 0 From deee263c4ae3abc140a4e87f203f6933aa7b4254 Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:16:36 +1100 Subject: [PATCH 11/15] Update auto_assign.yml --- .github/auto_assign.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 60f6e88..dba7f55 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -7,9 +7,7 @@ addAssignees: false # A list of reviewers to be added to pull requests (GitHub user name) reviewers: - IdrisDose - - reviewerB - - reviewerC - + # A list of keywords to be skipped the process that add reviewers if pull requests include it skipKeywords: - wip From de27d316fb013275ecd03f89dd9247936a618471 Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:25:34 +1100 Subject: [PATCH 12/15] Update auto_assign.yml --- .github/auto_assign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index dba7f55..674c250 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -2,7 +2,7 @@ addReviewers: true # Set to true to add assignees to pull requests -addAssignees: false +addAssignees: author # A list of reviewers to be added to pull requests (GitHub user name) reviewers: From 44a5bd4ab74f3e393116148191a179445e96622e Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:34:34 +1100 Subject: [PATCH 13/15] Update auto_assign.yml --- .github/auto_assign.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 674c250..dc85570 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -7,6 +7,7 @@ addAssignees: author # A list of reviewers to be added to pull requests (GitHub user name) reviewers: - IdrisDose + - @qb-core/maintenance # A list of keywords to be skipped the process that add reviewers if pull requests include it skipKeywords: From 40f16a836e04b9aff8c975f92d176e1e3a36f43c Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:35:33 +1100 Subject: [PATCH 14/15] Update auto_assign.yml --- .github/auto_assign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index dc85570..56dec88 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -7,7 +7,7 @@ addAssignees: author # A list of reviewers to be added to pull requests (GitHub user name) reviewers: - IdrisDose - - @qb-core/maintenance + - qbcore-framework/maintenance # A list of keywords to be skipped the process that add reviewers if pull requests include it skipKeywords: From 423e959f3847716a63b0324f63a29f386bf19919 Mon Sep 17 00:00:00 2001 From: Idris Dev Date: Sun, 6 Mar 2022 21:36:23 +1100 Subject: [PATCH 15/15] Update Number 10? --- .github/auto_assign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 56dec88..5838509 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -7,7 +7,7 @@ addAssignees: author # A list of reviewers to be added to pull requests (GitHub user name) reviewers: - IdrisDose - - qbcore-framework/maintenance + - /maintenance # A list of keywords to be skipped the process that add reviewers if pull requests include it skipKeywords: