From 976d9b9f7947060862f91cfb90e712747aa0f869 Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Thu, 28 Aug 2025 20:03:21 +0100 Subject: [PATCH] Add mc_rebalance_datapack submodule --- .gitmodules | 3 +++ README.md | 14 ++++++++++++-- .../required_data/mc_rebalance_datapack | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) create mode 160000 overrides/global_packs/required_data/mc_rebalance_datapack diff --git a/.gitmodules b/.gitmodules index e69de29..9c51bb7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "overrides/global_packs/required_data/mc_rebalance_datapack"] + path = overrides/global_packs/required_data/mc_rebalance_datapack + url = https://patience.nearmisses.xyz/SergeantAcoustic/mc_rebalance_datapack diff --git a/README.md b/README.md index 0833121..8bd5caa 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,19 @@ Packed in modrith format, for hosting make sure to add [for-host-put-these-in-wo 2. Drag into your mod loader of choice # Development -This repository no longer imports mc_rebalance as a submodule +This repository imports mc_rebalance_datapack as a submodule -You can now pull/push as expected +Clone this repo with `git clone --recurse-submodules https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering.git` + +When pulling, include the submodule with `git pull --recurse-submodules` + +## Updating submodule upstream +To update the embedded submodule to the latest available version: +1. If you cloned without `--recurse-submodules` run `git submodule update --init` +2. Run `git submodule update --remote` to update it +3. Stage the submodule's new pointer (e.g. `git add overrides/global_packs/required_data/mc_rebalance`) +4. Commit as usual (e.g. `git commit -m "Updated submodule"`) +5. `git push` ## Exporting To create a release, run [./export-pack.sh](export-pack.sh) diff --git a/overrides/global_packs/required_data/mc_rebalance_datapack b/overrides/global_packs/required_data/mc_rebalance_datapack new file mode 160000 index 0000000..931fef2 --- /dev/null +++ b/overrides/global_packs/required_data/mc_rebalance_datapack @@ -0,0 +1 @@ +Subproject commit 931fef22686591dcc619e1d800b02cd63c1be352