Merge branch 'main' of https://git.devbeni.lol/MineDivinity/pack

.gitea/workflows/build-and-release.yml

@@ -77,33 +77,38 @@ jobs:
         git config --global user.email "actions@gitea"
         git remote set-url origin https://x:${{ secrets.TOKEN }}@git.devbeni.lol/MineDivinity/pack.git
 
-    - name: Delete existing tag if present
-      run: |
-        if git rev-parse v${{ env.VERSION }} >/dev/null 2>&1; then
-          git tag -d v${{ env.VERSION }}
-          git push --delete origin v${{ env.VERSION }} || true
-        fi
-
-    - name: Create Tag
-      run: |
-        git tag -a v${{ env.VERSION }} -m "Release v${{ env.VERSION }}"
-        git push origin v${{ env.VERSION }}
-
     - name: Commit updates
       run: |
-        git pull origin main
+        git pull origin main --rebase
         git add versions.txt pack/pack.mcmeta MineDivinity-Pack.zip MineDivinity-Pack.sha1.txt
         git commit -m "Update to version ${{ env.VERSION }} [skip ci]"
         git push origin main
 
+    - name: Delete existing release
+      run: |
+        RELEASE_ID=$(curl -s -H "Authorization: token ${{ secrets.TOKEN }}" "https://git.devbeni.lol/api/v1/repos/MineDivinity/pack/releases/tags/latest" | jq .id)
+        if [ "$RELEASE_ID" != "null" ] && [ ! -z "$RELEASE_ID" ]; then
+          echo "Deleting release with ID $RELEASE_ID"
+          curl -s -X DELETE -H "Authorization: token ${{ secrets.TOKEN }}" "https://git.devbeni.lol/api/v1/repos/MineDivinity/pack/releases/$RELEASE_ID"
+        else
+          echo "No existing 'latest' release found."
+        fi
+
+    - name: Update latest tag
+      run: |
+        git tag -d latest || true
+        git push --delete origin latest || true
+        git tag -a latest -m "Release v${{ env.VERSION }}"
+        git push origin latest
+
     - name: Create Release
       id: create-release
       uses: actions/create-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.TOKEN }}
       with:
-        tag_name: v${{ env.VERSION }}
-        release_name: MineDivinity Pack v${{ env.VERSION }}
+        tag_name: latest
+        release_name: MineDivinity Pack (Latest) v${{ env.VERSION }}
         body: |
           Minecraft Texture Pack Release
           Version: ${{ env.VERSION }}

pack/assets/minecraft/font/default.json

@@ -4,7 +4,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/admin.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -13,7 +13,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/admin+.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -22,7 +22,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/developer.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -31,7 +31,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/helper.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -40,7 +40,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/manager.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -49,7 +49,7 @@
             "type": "bitmap",
             "file": "minecraft:ranks/staff.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
@@ -58,43 +58,43 @@
             "type": "bitmap",
             "file": "minecraft:ranks/tulaj.png",
             "ascent": 7,
-            "height": 8,
+            "height": 7,
             "chars": [
                 ""
             ]
         },
         {
             "type": "bitmap",
-            "file": "minecraft:ranks/auth.png",
-            "ascent": 11,
-            "height": 16,
+            "file": "minecraft:gui/auth.png",
+            "ascent": 10,
+            "height": 11,
             "chars": [
                 ""
             ]
         },
         {
             "type": "bitmap",
-            "file": "minecraft:ranks/lobby.png",
-            "ascent": 11,
-            "height": 16,
+            "file": "minecraft:gui/lobby.png",
+            "ascent": 10,
+            "height": 11,
             "chars": [
                 ""
             ]
         },
         {
             "type": "bitmap",
-            "file": "minecraft:ranks/skyblock.png",
-            "ascent": 11,
-            "height": 16,
+            "file": "minecraft:gui/skyblock.png",
+            "ascent": 10,
+            "height": 11,
             "chars": [
                 ""
             ]
         },
         {
             "type": "bitmap",
-            "file": "minecraft:ranks/skypvp.png",
-            "ascent": 11,
-            "height": 16,
+            "file": "minecraft:gui/skypvp.png",
+            "ascent": 10,
+            "height": 11,
             "chars": [
                 ""
             ]

pack/pack.mcmeta

@@ -1,6 +1,17 @@
 {
   "pack": {
     "pack_format": 71,
-        "description": {"text": "MineDivinity Pack", "bold": true, "color": "#FF5555"}
+    "description": [
+      {
+        "text": "MineDivinity Pack ",
+        "bold": true,
+        "color": "#FF5555"
+      },
+      {
+        "text": "v1.2.3",
+        "bold": true,
+        "color": "#FFAA00"
+      }
+    ]
   }
 }

versions.txt

@@ -15,3 +15,9 @@ New version: 1.1.4
 New version: 1.1.5
 New version: 1.1.6
 New version: 1.1.7
+New version: 1.1.8
+New version: 1.1.9
+New version: 1.2.0
+New version: 1.2.1
+New version: 1.2.2
+New version: 1.2.3