diff --git a/.github/workflows/formatt-all.yml b/.github/workflows/formatt-all.yml index 5a88317c4..1a91ba84c 100644 --- a/.github/workflows/formatt-all.yml +++ b/.github/workflows/formatt-all.yml @@ -1,11 +1,18 @@ # Check Lua Formatting name: Check Lua Formatting -on: [push, pull_request] +on: + push: + branches: [ main ] + pull_request: + types: [ labeled ] jobs: stylua-check: name: Stylua Check runs-on: ubuntu-latest + permissions: + contents: write + if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.label.name == 'format_all') }} steps: - uses: actions/checkout@v4 - uses: JohnnyMorganz/stylua-action@v3 diff --git a/server-data/resources/[bpt_addons]/bpt_ammujob/locales/it.lua b/server-data/resources/[bpt_addons]/bpt_ammujob/locales/it.lua index c69f908a1..bda55c0ec 100644 --- a/server-data/resources/[bpt_addons]/bpt_ammujob/locales/it.lua +++ b/server-data/resources/[bpt_addons]/bpt_ammujob/locales/it.lua @@ -29,6 +29,6 @@ Locales["it"] = { ["blip_ammu"] = "Armeria.", ["ammu"] = "ammu", -- billing - ["bill_amount"] = "importo della fattura", - ["confirm"] = "Conferma", + ["bill_amount"] = "importo della fattura", + ["confirm"] = "Conferma", } \ No newline at end of file diff --git a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua index 78f662486..d9fe37f26 100644 --- a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua +++ b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua @@ -1,24 +1,24 @@ local blips = { --- Airports -- -{ title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 }, + -- Airports -- + { title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 }, --- Cayo Perico Island Blips -- --- Island Beach Party -{ title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 }, + -- Cayo Perico Island Blips -- + -- Island Beach Party + { title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 }, --- Island Weed Farm -{ title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 }, + -- Island Weed Farm + { title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 }, --- Island Helipad 1 -- -{ title = "Island Helipad", colour = 26, id = 542, x = 4890.52, y = -5736.66, z = 26.35 }, + -- Island Helipad 1 -- + { title = "Island Helipad", colour = 26, id = 542, x = 4890.52, y = -5736.66, z = 26.35 }, --- Island Mansion -- -{ title = "Island Mansion", colour = 30, id = 40, x = 5009.41, y = -5749.76, z = 32.85 }, + -- Island Mansion -- + { title = "Island Mansion", colour = 30, id = 40, x = 5009.41, y = -5749.76, z = 32.85 }, --- Island House -- -{ title = "Island House", colour = 7, id = 40, x = 5006.63, y = -5787.81, z = 22.56 }, -{ title = "Island House", colour = 7, id = 40, x = 5080.4, y = -5756.1, z = 21.62 }, -{ title = "Island House", colour = 7, id = 40, x = 5026.97, y = -5735.91, z = 17.87 }, + -- Island House -- + { title = "Island House", colour = 7, id = 40, x = 5006.63, y = -5787.81, z = 22.56 }, + { title = "Island House", colour = 7, id = 40, x = 5080.4, y = -5756.1, z = 21.62 }, + { title = "Island House", colour = 7, id = 40, x = 5026.97, y = -5735.91, z = 17.87 }, } Citizen.CreateThread(function()