From fdbe2a8c8c3fc86e86487b46f2db167187cd2b74 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:21:29 +0100 Subject: [PATCH 01/10] Delete README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 384da24..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# CraftingDatapacks -Crafting Datapacks MegaRepo From d7a3faf58d7368b50545afd3d11b0a8dbaaa1141 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:22:42 +0100 Subject: [PATCH 02/10] Add files via upload --- pack.mcmeta | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 pack.mcmeta diff --git a/pack.mcmeta b/pack.mcmeta new file mode 100644 index 0000000..59d2b7f --- /dev/null +++ b/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack" : { + "pack_format" : 71, + "description" : "§e by §3 Craemon §e version §2 1.21.5" + } +} From a5da93d0e89d8b156c124bf711a9a97578530866 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:29:57 +0100 Subject: [PATCH 03/10] Create main.json --- data/craemon/advancement/main.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 data/craemon/advancement/main.json diff --git a/data/craemon/advancement/main.json b/data/craemon/advancement/main.json new file mode 100644 index 0000000..639c11b --- /dev/null +++ b/data/craemon/advancement/main.json @@ -0,0 +1,29 @@ +{ + "display": { + "icon": { + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [-1695811886,-244104360,-1872076634,2082508791], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzdlMjZhNDcyMWYwNjllMzUwYTQwZDExMDM3OTk3ZDliYjRiZWUzNGU1MTM3ODQ0ZDA2NDU5ODg5MzUyYzZiYiJ9fX0=" + } + ] + } + } + }, + "title": "Craemon's Datapacks", + "description": "https://modrinth.com/user/Craemon", + "background": "minecraft:block/cyan_concrete", + "frame": "challenge", + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + } +} From df4df90ea285bd84e24b566e8bbc9c9230e2f3af Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:30:25 +0100 Subject: [PATCH 04/10] Create crafting.json --- data/craemon/advancement/crafting.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 data/craemon/advancement/crafting.json diff --git a/data/craemon/advancement/crafting.json b/data/craemon/advancement/crafting.json new file mode 100644 index 0000000..fbcf8e8 --- /dev/null +++ b/data/craemon/advancement/crafting.json @@ -0,0 +1,18 @@ +{ + "display": { + "icon": { + "id": "minecraft:crafting_table" + }, + "title": "Crafting", + "description": "Craemon's crafting recipes", + "frame": "goal", + "show_toast": false, + "announce_to_chat": false + }, + "parent": "craemon:main", + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + } +} From 8bd90b2034d6f1cf89fb1c72fd503151ef9ccb46 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:49:15 +0100 Subject: [PATCH 05/10] Update pack.mcmeta --- pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.mcmeta b/pack.mcmeta index 59d2b7f..e5e1a3f 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack" : { "pack_format" : 71, - "description" : "§e by §3 Craemon §e version §2 1.21.5" + "description" : "§e by §3 Craemon §e version §2 1.21.6" } } From 93eae2e11e95f4cb31fd8904857b0d3b94be6513 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:50:58 +0100 Subject: [PATCH 06/10] Update pack.mcmeta --- pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.mcmeta b/pack.mcmeta index e5e1a3f..59d2b7f 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack" : { "pack_format" : 71, - "description" : "§e by §3 Craemon §e version §2 1.21.6" + "description" : "§e by §3 Craemon §e version §2 1.21.5" } } From 7ca503ebc5c0b9badd9efaec5d23d9c8bf0b3163 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 23:53:12 +0100 Subject: [PATCH 07/10] Update LICENSE.txt --- LICENSE.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE.txt b/LICENSE.txt index e140ab5..2315466 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -17,3 +17,4 @@ For permission requests or inquiries, please contact me: https://craemon.com/con Disclaimer: This license is valid as of 2025 and may be updated in the future. Users are encouraged to check for the latest version. © 2025 Craemon - All Rights Reserved +lol From 8e5eee83af22565a59c17fbf8fef5545b09db46e Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Fri, 28 Mar 2025 00:00:47 +0100 Subject: [PATCH 08/10] Create sync-merge.yml --- .github/workflows/sync-merge.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/sync-merge.yml diff --git a/.github/workflows/sync-merge.yml b/.github/workflows/sync-merge.yml new file mode 100644 index 0000000..8e2e67e --- /dev/null +++ b/.github/workflows/sync-merge.yml @@ -0,0 +1,37 @@ +name: Sync Shared Files to Datapack Branches + +on: + push: + branches: + - sync # Runs only when pushing to the sync branch + workflow_dispatch: # Allows manual execution from GitHub + +jobs: + merge-sync: + name: Merge Sync into Datapack Branches + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Ensures full commit history is available + + - name: Configure Git + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" + + - name: Fetch Branch List & Merge Sync + run: | + git fetch origin # Ensure all branches are visible + + # Get all branches EXCEPT `main` and `sync` + BRANCHES=$(git branch -r | grep -Eo "origin/[^/]+" | sed 's/origin\///' | grep -vE '^(main|sync)$') + + for branch in $BRANCHES; do + echo "Merging sync into $branch..." + git checkout $branch + git merge --no-edit sync || echo "No new changes to merge" + git push origin $branch + done From 74b24c2885820cfc73833483c99fb83670e10119 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Fri, 28 Mar 2025 00:03:50 +0100 Subject: [PATCH 09/10] Update sync-merge.yml --- .github/workflows/sync-merge.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-merge.yml b/.github/workflows/sync-merge.yml index 8e2e67e..c7213d6 100644 --- a/.github/workflows/sync-merge.yml +++ b/.github/workflows/sync-merge.yml @@ -5,7 +5,7 @@ on: branches: - sync # Runs only when pushing to the sync branch workflow_dispatch: # Allows manual execution from GitHub - + jobs: merge-sync: name: Merge Sync into Datapack Branches @@ -31,7 +31,16 @@ jobs: for branch in $BRANCHES; do echo "Merging sync into $branch..." + + # Checkout each branch git checkout $branch - git merge --no-edit sync || echo "No new changes to merge" + + # Pull latest changes for the current branch + git pull origin $branch + + # Merge the sync branch into the current branch + git merge --no-edit origin/sync || echo "No new changes to merge" + + # Push the updated branch git push origin $branch done From 5be29c8212b776c019255ce73a9b7694fb832ed0 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Fri, 28 Mar 2025 00:09:07 +0100 Subject: [PATCH 10/10] Update sync-merge.yml --- .github/workflows/sync-merge.yml | 33 +++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/sync-merge.yml b/.github/workflows/sync-merge.yml index c7213d6..566897b 100644 --- a/.github/workflows/sync-merge.yml +++ b/.github/workflows/sync-merge.yml @@ -3,7 +3,7 @@ name: Sync Shared Files to Datapack Branches on: push: branches: - - sync # Runs only when pushing to the sync branch + - sync # Runs when pushing to the "sync" branch workflow_dispatch: # Allows manual execution from GitHub jobs: @@ -22,25 +22,32 @@ jobs: git config --global user.name "github-actions" git config --global user.email "github-actions@github.com" - - name: Fetch Branch List & Merge Sync + - name: Fetch all branches and sync run: | - git fetch origin # Ensure all branches are visible + git fetch --all # Ensures all branches are fetched from origin - # Get all branches EXCEPT `main` and `sync` + # List of all remote branches excluding `main` and `sync` BRANCHES=$(git branch -r | grep -Eo "origin/[^/]+" | sed 's/origin\///' | grep -vE '^(main|sync)$') + # Loop through each branch for branch in $BRANCHES; do echo "Merging sync into $branch..." - - # Checkout each branch + + # Checkout the branch git checkout $branch - - # Pull latest changes for the current branch - git pull origin $branch - + + # Pull the latest changes from the remote branch + git pull origin $branch --rebase # Using rebase to avoid merge commits + # Merge the sync branch into the current branch - git merge --no-edit origin/sync || echo "No new changes to merge" - - # Push the updated branch + git merge --no-edit origin/sync || echo "No new changes to merge or merge conflict detected" + + # If there's a conflict, handle it automatically (you can also choose to exit early if conflicts are too complex) + if [ $? -ne 0 ]; then + echo "Merge conflict detected, skipping the branch: $branch" + continue + fi + + # Push the updated branch back to origin git push origin $branch done