Skip to content

Commit

Permalink
Updated to Minecraft 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Adubbz
Adubbz committed Dec 15, 2024
1 parent 1016e9e commit d53b5cf
Show file tree
Hide file tree
Showing 194 changed files with 2,657 additions and 1,492 deletions.
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3472282 Registries
// 1.21.4 2024-12-14T11:48:11.7423765 Registries
55b6780cec82f4d4f609e750902d114649d4a8ad data/toughasnails/damage_type/hyperthermia.json
eae6d7bc6de6b808206268351a4eb97746f013bf data/toughasnails/damage_type/thirst.json
0b83414be2d208b5f29e5575e1b11fe45ee59319 data/toughasnails/enchantment/thermal_tuning.json
Expand Down
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.35023 Tags for minecraft:enchantment mod id vanilla
// 1.21.4 2024-12-14T11:48:11.7438772 Tags for minecraft:enchantment mod id vanilla
0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/on_random_loot.json
0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/tradeable.json
0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/treasure.json
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3467282 Tags for minecraft:worldgen/biome mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7413773 Tags for minecraft:worldgen/biome mod id toughasnails
2b52a1f084a28479a2e448b5ca6be229c52b6aa9 data/toughasnails/tags/worldgen/biome/cold_biomes.json
92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json
8548cd9e18e161a303323283cb2c7ab2f2ff2cb0 data/toughasnails/tags/worldgen/biome/hot_biomes.json
Expand Down
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21.3 2024-12-05T17:14:27.3457287 Tags for minecraft:trim_material mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7408766 Tags for minecraft:trim_material mod id toughasnails
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/cooling_trims.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/heating_trims.json
3 changes: 0 additions & 3 deletions common/src/generated/resources/.cache/25053ef1e0b8c487102ccc9453cf716a2dc74845
View file

This file was deleted.

2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.3 2024-12-05T17:14:27.3497276 Tags for minecraft:point_of_interest_type mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7408766 Tags for minecraft:point_of_interest_type mod id toughasnails
7ccb22b62459a1c793d38a6fafc772b5d19837e0 data/minecraft/tags/point_of_interest_type/acquirable_job_site.json
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3467282 Loot Tables
// 1.21.4 2024-12-14T11:48:11.7393769 Loot Tables
8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_table/blocks/rain_collector.json
5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_table/blocks/temperature_gauge.json
3014cc41e7b43922f50ec3eb6c2eb83fbf3201d2 data/toughasnails/loot_table/blocks/thermoregulator.json
Expand Down
132 changes: 123 additions & 9 deletions common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3487275 Tags for minecraft:item mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7428765 Tags for minecraft:item mod id toughasnails
54fbb602df8fe763300ee759cb3a9fbb72ded2eb data/minecraft/tags/item/dyeable.json
f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/item/cooling_armor.json
572f6d0748095755aeef0ca7d602f4ebba9bfd76 data/toughasnails/tags/item/cooling_consumed_items.json
Expand Down
23 changes: 0 additions & 23 deletions common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91
View file

This file was deleted.

2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3477277 TAN Recipes
// 1.21.4 2024-12-14T11:48:11.7398768 TAN Recipes
538aa9aa354f6743d9832c0ec7a8642b70f515f2 data/toughasnails/advancement/recipes/combat/leaf_boots.json
2cb6e078f817b17b47c66d6ca824b44751c06ecd data/toughasnails/advancement/recipes/combat/leaf_chestplate.json
4a11700a18931f1f67270bef246e6b57d1cf5a5b data/toughasnails/advancement/recipes/combat/leaf_helmet.json
Expand Down
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21.3 2024-12-05T17:14:27.3477277 Tags for minecraft:damage_type mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7428765 Tags for minecraft:damage_type mod id toughasnails
114a24c8e8dfc4dca5477ef3ceb9cdce6f35c49d data/minecraft/tags/damage_type/bypasses_armor.json
7bc5233723c7bfc14215cd1f26c7fd14f2da6c81 data/minecraft/tags/damage_type/bypasses_effects.json
2 changes: 1 addition & 1 deletion common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.3 2024-12-05T17:14:27.3462285 Tags for minecraft:block mod id toughasnails
// 1.21.4 2024-12-14T11:48:11.7363444 Tags for minecraft:block mod id toughasnails
bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/block/mineable/axe.json
0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/block/mineable/pickaxe.json
eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/block/cooling_blocks.json
Expand Down
3 changes: 3 additions & 0 deletions common/src/generated/resources/.cache/ece1a0d38a152b7be1e86680691afdfd6d9fba1f
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// 1.21.4 2024-12-14T11:48:11.7418774 Equipment Asset Definitions
4b2945d310c6084cdfa1731f33901d34d6ce4731 assets/toughasnails/equipment/leaf.json
192c8a743376167dc4e419443577552eb962ef7f assets/toughasnails/equipment/wool.json
0 ...s/toughasnails/models/equipment/leaf.json → ...s/assets/toughasnails/equipment/leaf.json
View file
File renamed without changes.
0 ...s/toughasnails/models/equipment/wool.json → ...s/assets/toughasnails/equipment/wool.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/apple_juice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/apple_juice"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/cactus_juice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/cactus_juice"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/charc_os.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/charc_os"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/chorus_fruit_juice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/chorus_fruit_juice"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/copper_dirty_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/copper_dirty_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/copper_purified_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/copper_purified_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/copper_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/copper_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/diamond_dirty_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/diamond_dirty_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/diamond_purified_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/diamond_purified_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/diamond_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/diamond_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/dirty_water_bottle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/dirty_water_bottle"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_copper_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_copper_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_diamond_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_diamond_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_gold_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_gold_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_iron_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_iron_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_leather_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_leather_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/empty_netherite_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/empty_netherite_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/glow_berry_juice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/glow_berry_juice"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/gold_dirty_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/gold_dirty_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/gold_purified_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/gold_purified_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/gold_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/gold_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/ice_cream.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/ice_cream"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/iron_dirty_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/iron_dirty_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/iron_purified_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/iron_purified_water_canteen"
}
}
6 changes: 6 additions & 0 deletions common/src/generated/resources/assets/toughasnails/items/iron_water_canteen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "toughasnails:item/iron_water_canteen"
}
}
Loading

0 comments on commit d53b5cf

Please sign in to comment.