9
0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-06 15:52:03 +00:00

Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	gradle.properties
This commit is contained in:
jhqwqmc
2025-05-18 03:28:46 +08:00
4 changed files with 146 additions and 85 deletions

View File

@@ -62,11 +62,10 @@ resource-pack:
remove-tinted-leaves-particle: true
merge-external-folders:
- ModelEngine/resource pack
- CustomNameplates/ResourcePack
- BetterModel/build
- BetterHud/build
merge-external-zip-files:
- CraftEngine/external_packs/example.zip
- CustomNameplates/resourcepack.zip
delivery:
# Send the resource pack on joining the server
send-on-join: true