Merge branch 'trunk' of github.com:qqMelon/keyroller into trunk

qqMelon · Nov 23, 2024 · a698ec4 · a698ec4
2 parents 2918bfb + 876fc9c
commit a698ec4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,9 @@ env:
 jobs:
   release:
     runs-on: ubuntu-latest
-    environment: Default
+    permissions:
+      contents: write
+    environment: release
     steps:
       - name: Clone project
         uses: actions/checkout@v1

diff --git a/.luacheckrc b/.luacheckrc
@@ -4,7 +4,7 @@ unused_args = false
 allow_defined_top = true
 unused = false
 shadowing = false
-max_line_length = 120
+max_line_length = 130
 
 exclude_files = {
 	"KeyRoller/Libs/",

diff --git a/KeyRoller.lua b/KeyRoller.lua
@@ -112,12 +112,14 @@ local function UpdateKeyList(content)
     end
 
     local formattedDisplay = ""
+    local returnStr = "\n"
     for player, key in pairs(playerKeys) do
         if key.level >= minKeyLevel and key.level <= maxKeyLevel then
             formattedDisplay =
-                formattedDisplay .. string.format("%s: %s +%d", player, key.dungeon, key.level) .. "\n" .. "\n"
+                formattedDisplay .. string.format("%s: %s +%d %s %s", player, key.dungeon, key.level, returnStr, returnStr)
         end
     end
+    text:SetJustifyH("LEFT");
     text:SetPoint("TOPLEFT", 0, 0)
     text:SetText(formattedDisplay)
     content:SetHeight(math.max(20, 0))