Fix mod list merging
All checks were successful
Build and Release modpack / Create Release from tag (push) Successful in 8m19s

This commit is contained in:
2026-04-02 02:49:42 +02:00
parent 3bf4ade582
commit 7e783772dc
2 changed files with 15 additions and 14 deletions

View File

@@ -67,7 +67,7 @@ jobs:
git fetch origin +refs/heads/main
git checkout main
rm -rf ./minecraft/mods
cp -r /out/client/* .
cp -r /out/client/** .
git config user.name gitAutomationBot
git config user.email service+git@marquis.site
@@ -85,13 +85,13 @@ jobs:
files: |-
/out/curse/*-${{ github.ref_name }}.zip
- name: "Send notification"
uses: ivanmilov/telegram_notify_action@v1
with:
api_key: ${{ secrets.TELEGRAM_API_KEY }}
chat_id: ${{ vars.TELEGRAM_CHAT_ID }}
message: |
Modpack **ATM 10** just got updated to version **${{ github.ref_name }}**!
# - name: "Send notification"
# uses: ivanmilov/telegram_notify_action@v1
# with:
# api_key: ${{ secrets.TELEGRAM_API_KEY }}
# chat_id: ${{ vars.TELEGRAM_CHAT_ID }}
# message: |
# Modpack **ATM 10** just got updated to version **${{ github.ref_name }}**!
Go to ${{ vars.SERVER_PUBLIC_URL }}/${{ github.repository }} to get instructions on how to update or
[download the newest Modpack zip directly](${{ vars.SERVER_PUBLIC_URL }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}).
# Go to ${{ vars.SERVER_PUBLIC_URL }}/${{ github.repository }} to get instructions on how to update or
# [download the newest Modpack zip directly](${{ vars.SERVER_PUBLIC_URL }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}).

View File

@@ -14,6 +14,7 @@ customizations:
- "user_jvm_args.txt"
- "*.sh"
- "*.bat"
- "mods/productivebees-1.21.1-13.13.1.jar"
client:
extra_files:
- "./servers.dat"
@@ -32,10 +33,10 @@ customizations:
- mod_id: 282001 # CC: Tweaked
server: false # Included via overrides
client: false
- mod_id: 377897 # Productive Bees
file_id: 7718174
server: false
client: false
- mod_id: 377897 # Productive Bees
file_id: 7852443
server: true
client: true
# Fix stupid Curse API
- mod_id: 391382