Fix mod list merging

.gitea/workflows/create_release.yml

@@ -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"
+    # - name: "Send notification"
-      uses: ivanmilov/telegram_notify_action@v1
+    #   uses: ivanmilov/telegram_notify_action@v1
-      with:
+    #   with:
-        api_key: ${{ secrets.TELEGRAM_API_KEY }}
+    #     api_key: ${{ secrets.TELEGRAM_API_KEY }}
-        chat_id: ${{ vars.TELEGRAM_CHAT_ID }}
+    #     chat_id: ${{ vars.TELEGRAM_CHAT_ID }}
-        message: >
+    #     message: |
-          Modpack **ATM 10** just got updated to version **${{ github.ref_name }}**!
+    #       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
+    #       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 }}).
+    #       [download the newest Modpack zip directly](${{ vars.SERVER_PUBLIC_URL }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}).

.gitignore

@@ -36,7 +36,6 @@ minecraft/logs
 minecraft/modernfix/structureCache*
 minecraft/saves
 minecraft/screenshots
-minecraft/shaderpacks
 minecraft/simplebackups/
 minecraft/TombManyGraves
 

config.yml

@@ -3,6 +3,8 @@ mod_loader_type:   "NeoForge"
 
 modpack:
   curse_id: 925200 # ATM10
+  consider_serverfile_generations: 2
+
 
 customizations:
   server:
@@ -12,6 +14,7 @@ customizations:
     - "user_jvm_args.txt"
     - "*.sh"
     - "*.bat"
+    - "mods/productivebees-1.21.1-13.13.1.jar"
   client:
     extra_files:
     - "./servers.dat"
@@ -26,6 +29,15 @@ customizations:
     name:   "Just Enough Resources (JER)"
     server: true
 
+# Ignored
+  - mod_id: 282001 # CC: Tweaked
+    server: false  # Included via overrides
+    client: false
+  - mod_id:  377897 # Productive Bees
+    file_id: 7852443
+    server:  true
+    client:  true
+
 # Fix stupid Curse API
   - mod_id:       391382
     name:         "More Overlays Updated"