generated from FabricMC/fabric-example-mod
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.20.1' of https://github.com/Tellios-Projects/Squashed …
…into 1.20.1
- Loading branch information
Showing
285 changed files
with
8,324 additions
and
2,669 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
src/main/generated/.cache/08a9f26de4aee826f39ac9fb0bf9a5037f878684
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // 1.20.1 2024-11-24T11:31:55.3770211 Squashed/Tags for minecraft:item | ||
| 8279614d25fc216bcbaab13fc1c1b46e99707b61 data\c\tags\items\grass.json |
52 changes: 30 additions & 22 deletions
52
src/main/generated/.cache/44a1e428b2c2a36552702900196bf8b531083319
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,34 @@ | ||
| // 1.20.1 2023-11-08T06:44:24.4119583 Squashed/Tags for minecraft:block | ||
| 0a05e8849cff66216d82dcb88fde208d01839023 data\minecraft\tags\blocks\cat_plays_with.json | ||
| a5e54b16a211e7d44a05ce24faf7f4c79bb3eeef data\minecraft\tags\blocks\mineable\hoe.json | ||
| db6d603e6024be28ebfe95b51ac6651540a81ab6 data\minecraft\tags\blocks\mineable\axe.json | ||
| 10d9afd34804775018dd13402fa8d1266c4ec19b data\minecraft\tags\blocks\dirt.json | ||
| 8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\minecraft\tags\blocks\any_minable.json | ||
| 67c409eafeb62334961b267a675c29fb1c5fc137 data\minecraft\tags\blocks\soul_speed_blocks.json | ||
| 0fb6014d0d82bf13b436760d32a1785998fe6d32 data\minecraft\tags\blocks\sand.json | ||
| 63f7e3d854b6f79139ff7b65308db8a7dba1f494 data\minecraft\tags\blocks\infiniburn_overworld.json | ||
| ac851500bf00117c095c329c6c2bd84f53ba97ff data\minecraft\tags\blocks\guarded_by_piglins.json | ||
| b8615125ae21cd908f5e7580af4771f8117b1cb3 data\minecraft\tags\blocks\climbable.json | ||
| 41e5b9012a8b7ba6d3aa5c22f45631e1640ed9b4 data\minecraft\tags\blocks\wither_immune.json | ||
| eab8ace4c46953c8ee356e44c9bfe50bb6d7e5c8 data\minecraft\tags\blocks\mineable\pickaxe.json | ||
| efc303578b85b0aa1ed9200cf45bcba651837b55 data\minecraft\tags\blocks\logs_that_burn.json | ||
| 4ed236677b334ffaf2d298dedba576650ca36a40 data\minecraft\tags\blocks\logs.json | ||
| 67c409eafeb62334961b267a675c29fb1c5fc137 data\minecraft\tags\blocks\soul_fire_base_blocks.json | ||
| // 1.20.1 2024-11-24T11:31:55.3480194 Squashed/Tags for minecraft:block | ||
| 9d1677c752d44a97310e04b4185b9e6c2fb5b5d1 data\minecraft\tags\blocks\mineable\shovel.json | ||
| a90d4e33ce412a63016104ec9cfaf73e845115b3 data\minecraft\tags\blocks\needs_diamond_tool.json | ||
| dccf9a4749b2f6f65b3a2501b46fc2e6472a8bfd data\minecraft\tags\blocks\beacon_base_blocks.json | ||
| 188d795c689064a3b2cbcbd965d08cd4f608b84e data\minecraft\tags\blocks\crystal_sound_blocks.json | ||
| 9da4ea1c349857a54c968b58183a7e8a00df8fb7 data\minecraft\tags\blocks\mineable\shovel.json | ||
| b9fca4a98fea5819ca15d9d3e9389ae5a2bf75a7 data\minecraft\tags\blocks\conduit_frame.json | ||
| cde77903bdc94eb63859f90d62bf519ca8cb1e9d data\minecraft\tags\blocks\soul_fire_base_blocks.json | ||
| ac851500bf00117c095c329c6c2bd84f53ba97ff data\minecraft\tags\blocks\guarded_by_piglins.json | ||
| 28d1946be3a28394478f47fc7338ab7b7aaab722 data\minecraft\tags\blocks\beacon_base_blocks.json | ||
| 14e3b03c82da753d14a344c5d21f25ec68602937 data\minecraft\tags\blocks\crystal_sound_blocks.json | ||
| e5d506f42a07fdc56d00f7de31b7749b8f0abe2f data\minecraft\tags\blocks\dead_bush_may_place_on.json | ||
| 1474251d9c4d6769eb1baab21e8c202334314049 data\minecraft\tags\blocks\leaves.json | ||
| cde77903bdc94eb63859f90d62bf519ca8cb1e9d data\minecraft\tags\blocks\wither_summon_base_blocks.json | ||
| cde77903bdc94eb63859f90d62bf519ca8cb1e9d data\minecraft\tags\blocks\soul_speed_blocks.json | ||
| 030479fcf4c9850a67a78ceb22bec2c6c6b11c78 data\minecraft\tags\blocks\needs_iron_tool.json | ||
| c6e011e129c04155a4678735495208e8e7a09043 data\minecraft\tags\blocks\wool.json | ||
| 67c409eafeb62334961b267a675c29fb1c5fc137 data\minecraft\tags\blocks\wither_summon_base_blocks.json | ||
| 14e3b03c82da753d14a344c5d21f25ec68602937 data\minecraft\tags\blocks\vibration_resonators.json | ||
| 4ebf428e5f3d250f115185227f9d8536e22a5ade data\minecraft\tags\blocks\cat_plays_with.json | ||
| 4ed236677b334ffaf2d298dedba576650ca36a40 data\minecraft\tags\blocks\logs.json | ||
| 41e56295459a4a3cd02171235377ea68f9082d93 data\minecraft\tags\blocks\mineable\axe.json | ||
| e5edbecc9671ec710d8229108c67b2ee90bcb9fe data\minecraft\tags\blocks\mineable\hoe.json | ||
| 0fb6014d0d82bf13b436760d32a1785998fe6d32 data\minecraft\tags\blocks\sand.json | ||
| d5c94bb08458bc0bf8274086a00e0c83f1acdf3a data\minecraft\tags\blocks\wool.json | ||
| bdf3497de6001b090b78de1e3d1ec76d28cbb0b5 data\minecraft\tags\blocks\big_dripleaf_placeable.json | ||
| e1d5d59daea71decc3ea19436d0a12da391012c3 data\minecraft\tags\blocks\ice.json | ||
| 0acdf1b53b1892be705e87d07bda62072b61693c data\minecraft\tags\blocks\climbable.json | ||
| 35c23f3c1fa2b487b2a9de1838c051067b20c8f7 data\minecraft\tags\blocks\needs_stone_tool.json | ||
| 41e5b9012a8b7ba6d3aa5c22f45631e1640ed9b4 data\minecraft\tags\blocks\wither_immune.json | ||
| bd393aa778ce4f63f0acf3880925bbbdf0ef27bd data\minecraft\tags\blocks\mineable\pickaxe.json | ||
| efc303578b85b0aa1ed9200cf45bcba651837b55 data\minecraft\tags\blocks\logs_that_burn.json | ||
| bdb7e6f52c88f912acd709ca763334d137259270 data\minecraft\tags\blocks\mushroom_grow_block.json | ||
| 8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\minecraft\tags\blocks\any_minable.json | ||
| 3511e5aad665394ebfe9d5f1ed5c8baefd408fc5 data\minecraft\tags\blocks\nether_portal_frame.json | ||
| 4c69db55f1d5ccc7625d35383bcb8227ddb43e8f data\minecraft\tags\blocks\enchantment_power_provider.json | ||
| 187b9d0ed78f937d1c986fd846e7e5140a9c800f data\minecraft\tags\blocks\dirt.json | ||
| 2b8fae02c672bd9d1ab23cc53fa5271d54f69441 data\minecraft\tags\blocks\leaves.json | ||
| 3c914c2bb337c848388fcabd8964f1f8d1c72bf7 data\minecraft\tags\blocks\infiniburn_overworld.json | ||
| bdf3497de6001b090b78de1e3d1ec76d28cbb0b5 data\minecraft\tags\blocks\small_dripleaf_placeable.json |
Oops, something went wrong.