Commit Graph

13 Commits

Author SHA1 Message Date
Chloe
3346066d94 Merge branch 'main' of https://app.lexian.dev/FriendsMC/Friends-CMP-2.0
All checks were successful
Optimize resource pack / Optimize resource pack (push) Successful in 10m9s
2025-08-21 01:02:44 -04:00
Chloe
d896b483fa Add new music discs and models for various shops; remove obsolete files
- Introduced new music discs: "City Under Siege", "Clothing Shop", "Food Mart", "Hat Shop", "Interior Shop", "Pawn Shop", and "Jump Up" with corresponding models and textures.
- Updated sounds.json to include new music disc entries.
- Created new JSON files for music disc models and their textures.
- Removed outdated models and textures for cobblestone, emerald, and stick.
- Deleted unnecessary blockbench textures and environment textures.
- Updated pack metadata to reflect new pack format and supported versions.
2025-08-21 01:02:29 -04:00
aecc1a82fd Changed the doohickey to only happen on tag push
All checks were successful
Optimize resource pack / Optimize resource pack (push) Successful in 9m47s
2024-10-22 19:14:15 +02:00
00512dd1fb Update .github/workflows/packsquash.yml
All checks were successful
Optimize resource pack / Optimize resource pack (push) Successful in 9m59s
2024-10-22 18:56:39 +02:00
d020dd3e01 Update .github/workflows/build-and-upload.yml
All checks were successful
CI/CD for Minecraft Resource Pack / build (push) Successful in 9m47s
2024-10-22 18:44:43 +02:00
cb67fb4dcc Added PackSquash
Some checks failed
CI/CD for Minecraft Resource Pack / build (push) Has been cancelled
2024-10-22 18:41:10 +02:00
f602e188cf Update .github/workflows/build-and-upload.yml
All checks were successful
CI/CD for Minecraft Resource Pack / build (push) Successful in 9s
2024-10-22 18:38:17 +02:00
56d8d27a9e Update .github/workflows/build-and-upload.yml
Some checks failed
CI/CD for Minecraft Resource Pack / build (push) Failing after 14s
2024-10-22 18:36:05 +02:00
b23ea3b62e Update .github/workflows/build-and-upload.yml
Some checks failed
Build and Upload Optimized Resource Pack / build (push) Failing after 17s
2024-10-22 18:31:22 +02:00
b9fafcb2fa New builder
Some checks failed
Build and Upload Optimized Resource Pack / build (push) Failing after 51s
Added a new builder, not using someone else's.
2024-10-22 18:26:15 +02:00
a72fcca54b Update .gitea/workflows/main.yml
Some checks failed
Resourcepack Zipper / build (push) Failing after 11m12s
2024-10-20 20:45:42 +02:00
73b069c8c8 Change name of branch from master to main
Some checks failed
Resourcepack Zipper / build (push) Failing after 5m41s
2024-10-20 20:00:29 +02:00
d9b0c48a94 Add .github/workflows/main.yml 2024-10-20 19:59:43 +02:00