Merge branch 'main' of https://github.com/Qbox-project/qbx_nitro

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = false
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = true
+indent_size = 4

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -48,9 +48,9 @@ body:
   - type: input
     id: updated
     attributes:
-      label: Last Updated
-      description: When have you last updated?
-      placeholder: e.g. last week, today
+      label: Current Version
+      description: What version of the resource are you currently using?
+      placeholder: e.g. v1.3.0, v1.4.0
     validations:
       required: true
   - type: input
@@ -61,10 +61,3 @@ body:
       placeholder: e.g. zdiscord, qb-target
     validations:
       required: true
-  - type: input
-    id: renamed
-    attributes:
-      label: Resource Rename
-      description: Have you renamed this resource from `qb-` to something custom?
-    validations:
-      required: true

.github/workflows/discord-commit.yml

@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4
     - name: Discord Webhook
       uses: ChatDisabled/discord-commits@main
       with:
         id: ${{ secrets.WEBHOOK_ID }}
-        token: ${{ secrets.WEBHOOK_TOKEN }}
+        token: ${{ secrets.WEBHOOK_TOKEN }}

.github/workflows/discord-release.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4
     - name: Github Releases To Discord
-      uses: SethCohen/github-releases-to-discord@v1.13.1
+      uses: SethCohen/github-releases-to-discord@v1.15.0
       with:
         webhook_url: ${{ secrets.WEBHOOK_URL }}
         color: "15852866"
         username: ${{ github.event.repository.name }}
         avatar_url: "https://i.imgur.com/Eh1yiLI.png"
-        footer_timestamp: true
+        footer_timestamp: true

.github/workflows/issues-project.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get App Token
-        uses: actions/create-github-app-token@v1.6.1
+        uses: actions/create-github-app-token@v1
         id: generate_token
         with:
           app-id: ${{ secrets.APP_ID }}

.github/workflows/lint.yml

@@ -5,18 +5,18 @@ jobs:
     name: Lint Resource
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Lint
         uses: iLLeniumStudios/fivem-lua-lint-action@v2
         with:
           capture: "junit.xml"
           args: "-t --formatter JUnit"
-          extra_libs: ox_lib+mysql+qblocales+qbox+qbox_playerdata+qbox_utils+qbox_utils_sv+qbox_utils_cl
+          extra_libs: ox_lib+mysql+qblocales+qbox+qbox_playerdata+qbox_lib
       - name: Generate Lint Report
         if: always()
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           report_paths: "**/junit.xml"
           check_name: Linting Report

.github/workflows/release-action.yml

@@ -11,7 +11,7 @@ jobs:
         runs-on: "ubuntu-latest"
         steps:
             - name: Checkout Repository
-              uses: actions/checkout@v4.1.1
+              uses: actions/checkout@v4
               with:
                 fetch-depth: 0
                 ref: ${{ github.event.repository.default_branch }}
@@ -28,16 +28,16 @@ jobs:
                 zip -r ./${{ github.event.repository.name }}.zip ./${{ github.event.repository.name }}
 
             - name: Get App Token
-              uses: actions/create-github-app-token@v1.6.1
+              uses: actions/create-github-app-token@v1
               id: generate_token
               with:
                 app-id: ${{ secrets.APP_ID }}
                 private-key: ${{ secrets.PRIVATE_KEY }}
 
             - name: Create Release
-              uses: 'marvinpinto/action-automatic-releases@latest'
+              uses: marvinpinto/action-automatic-releases@latest
               with:
                 title: ${{ github.ref_name }}
                 repo_token: '${{ steps.generate_token.outputs.token }}'
                 prerelease: false
-                files: ${{ github.event.repository.name }}.zip
+                files: ${{ github.event.repository.name }}.zip

.github/workflows/release.yml

@@ -12,29 +12,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get App Token
-        uses: actions/create-github-app-token@v1.6.1
+        uses: actions/create-github-app-token@v1
         id: generate_token
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.PRIVATE_KEY }}
 
       - name: Checkout Repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
         with:
           token: ${{ steps.generate_token.outputs.token }}
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: Bump manifest version
         run: node .github/actions/bump-manifest-version.js
         env:
           TGT_RELEASE_VERSION: ${{ inputs.version }}
 
       - name: Push manifest change
-        uses: EndBug/add-and-commit@latest
+        uses: EndBug/add-and-commit@v9
         with:
           add: fxmanifest.lua
           push: true
@@ -43,4 +43,4 @@ jobs:
       - name: Push Git Tag
         run: |
           git tag ${{ inputs.version }}
-          git push origin ${{ inputs.version }}
+          git push origin ${{ inputs.version }}

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "sumneko.lua",
+        "overextended.cfxlua-vscode",
+        "ihyajb.qbcore-code-snippets",
+        "EditorConfig.EditorConfig",
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "Lua.runtime.nonstandardSymbol": ["/**/", "`", "+=", "-=", "*=", "/="],
+    "Lua.runtime.version": "Lua 5.4",
+    "Lua.diagnostics.globals": [
+        "lib",
+        "cache",
+        "QBX",
+        "locale",
+        "qbx"
+    ]
+}