Merge develop to master

.github/workflows/lua_linter.yaml

@@ -2,9 +2,33 @@ name: lint
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    paths:
+      - "lua/**"
+    types: [opened, synchronize]
   workflow_call:
 
+# partially taken from wiremod/wire/master/.github/workflows/lint.yml
 jobs:
-  lua-lint:
-    uses: FPtje/GLuaFixer/.github/workflows/glualint.yml@master
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Get any changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v41
+        with:
+          files: |
+            **.lua
+
+      - name: Download GluaFixer
+        if: steps.changed-files.outputs.any_changed
+        run: |
+          curl -o glualint.zip -L https://github.com/FPtje/GLuaFixer/releases/download/1.28.0/glualint-1.28.0-x86_64-linux.zip
+          unzip glualint.zip
+
+      - name: Lint Code
+        if: steps.changed-files.outputs.any_changed
+        run: |
+          ./glualint ${{ steps.changed-files.outputs.all_changed_files }}

.github/workflows/update_workshop.yaml

@@ -8,19 +8,15 @@ on:
   workflow_dispatch:
 
 jobs:
-  linter:
-    uses: CapsAdmin/pac3/.github/workflows/lua_linter.yaml@develop
-
   update-workshop:
       if: github.repository == 'CapsAdmin/pac3'
-      # needs: linter
       runs-on: ubuntu-latest
       steps:
         - name: Checkout
-          uses: actions/checkout@v2
+          uses: actions/checkout@v4
 
         - name: Publish to Steam Workshop
-          uses: vurv78/gmod-upload@v0.1.3
+          uses: PAC3-Server/gmod-upload@master
           env:
             STEAM_USERNAME: ${{ secrets.STEAM_NAME }}
             STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}

README.md

@@ -16,4 +16,3 @@ Some links to check out:
 * [discord server](https://discord.gg/utpR3gJ "Join PAC3 Discord Server") 
 
 ---
-