diff --git a/.github/workflows/sync-merge.yml b/.github/workflows/sync-merge.yml new file mode 100644 index 0000000..566897b --- /dev/null +++ b/.github/workflows/sync-merge.yml @@ -0,0 +1,53 @@ +name: Sync Shared Files to Datapack Branches + +on: + push: + branches: + - sync # Runs 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 all branches and sync + run: | + git fetch --all # Ensures all branches are fetched from origin + + # 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 the branch + git checkout $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 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 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 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 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" + } + } +} 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" + } + } +} 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" + } +}