Skip to content

Commit c8e65f3

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 948b759 + 736e913 commit c8e65f3

137 files changed

Lines changed: 4413 additions & 1966 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-09-22T09:31:56.6101585 Item Models: futurefood
1+
// 1.21.1 2025-09-30T14:47:35.5512558 Item Models: futurefood
22
d0a59be612dbaf93cb4d5963ff91c314b55fde23 assets/futurefood/models/item/cyber_wrench.json
3-
132b67d474d4b4d9a1e34dac95cc568ac3e3807c assets/futurefood/models/item/quantum_energy_diffuser.json
4-
053004296ebe33669c8864b533f2fc3ddae0d16f assets/futurefood/models/item/quantum_energy_receiver.json
3+
cf22bfb9e3b1a3f6751185b38846e707c90e2b8e assets/futurefood/models/item/quantum_energy_diffuser.json
4+
ebe5021677af67de7a7528e7cb59bc3cd1b0cab7 assets/futurefood/models/item/quantum_energy_receiver.json
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// 1.21.1 2025-09-27T16:43:37.3209276 Block States: futurefood
1+
// 1.21.1 2025-09-30T15:00:25.9562665 Block States: futurefood
22
92f590ca2adbb247d6063d6578f248d7ed238c17 assets/futurefood/blockstates/particle_collider.json
3-
564520d4c457f43fde72a0f8956dbb248ba64d06 assets/futurefood/blockstates/quantum_energy_diffuser.json
3+
9a1a1546abb8707a2f1ebf184920e60b0794ed42 assets/futurefood/blockstates/quantum_energy_diffuser.json
4+
3a8b6dfb82a35cc32067cc7213cd0f3ee90b7c1a assets/futurefood/blockstates/quantum_energy_receiver.json
45
8e3526babc0b87ba2db7b177f7c9fa54d7e3a0e9 assets/futurefood/models/block/particle_collider.json
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.21.1 2025-09-23T16:20:33.1409222 Languages: zh_cn for mod: futurefood
2-
621bde808a66ca4a64dd4a3e7c1d524e2e67495a assets/futurefood/lang/zh_cn.json
1+
// 1.21.1 2025-09-30T19:31:50.199863 Languages: zh_cn for mod: futurefood
2+
e4a4250310758d8f34fcf5e46c600f5ca963f878 assets/futurefood/lang/zh_cn.json

0 commit comments

Comments
 (0)