Merge branch 'main' of patience.nearmisses.xyz:SergeantAcoustic/tinkers_tinkering

Resolve discrepancies between current release and development build
This commit is contained in:
patience 2025-12-13 16:41:58 +00:00
commit eb9de8cb87
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View file

@ -1,4 +1,4 @@
release release
deps deps
overrides/mods/mc_rebalance-1.20.1-*.jar overrides/mods/mc_rebalance-*.jar
overrides/global_packs/required_data/mc_rebalance_datapack/ overrides/global_packs/required_data/mc_rebalance_datapack/

View file

@ -27,7 +27,7 @@ git clone "$pack_repo" "$basedir/overrides/global_packs/required_data/mc_rebalan
(cd "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh) (cd "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh)
cp "$basedir/deps/mc_rebalance/build/libs/mc_rebalance-1.20.1-"*".jar" "$basedir/overrides/mods" cp "$basedir/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar" "$basedir/overrides/mods"
# Final path for the modpack # Final path for the modpack
if [ ! -d release ]; then if [ ! -d release ]; then