Skip to content

Commit d40e28d

Browse files
committed
Update 1.21.5
1 parent cf416f0 commit d40e28d

35 files changed

+151
-145
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.4
8-
yarn_mappings=1.21.4+build.8
7+
minecraft_version=1.21.5
8+
yarn_mappings=1.21.5+build.1
99
loader_version=0.16.14
1010

1111
# Mod Properties
@@ -14,4 +14,4 @@ maven_group=net.kaupenjoe.tutorialmod
1414
archives_base_name=tutorialmod
1515

1616
# Fabric API
17-
fabric_version=0.119.2+1.21.4
17+
fabric_version=0.124.2+1.21.5

src/main/generated/.cache/1d732d3dd44f404bf56dee978e8311d6b3d29375

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/
22
e336321ea1fc9ae816052f453ffa3778fbb65e51 data/tutorialmod/enchantment/lightning_striker.json
3-
f4610cec5cb5f39b00094282685d64777b1c43ca data/tutorialmod/trim_material/pink_garnet.json
4-
a248f3d2ed7262ab9e3ba1194d67ffd6b2e0d1cb data/tutorialmod/trim_pattern/kaupen.json
3+
9989994335daca06ba2965e205179ef0b74ffe89 data/tutorialmod/trim_material/pink_garnet.json
4+
c0c0c2e32910380d8ceda8030e818dc6b0ba317e data/tutorialmod/trim_pattern/kaupen.json
55
454d4a2960bb565a3e43bbdcebbd00f18ebd8b4a data/tutorialmod/worldgen/configured_feature/driftwood.json
66
016d6724b3aa7a119515afc144ef61849e6ec736 data/tutorialmod/worldgen/configured_feature/end_pink_garnet_ore.json
77
9db0b18622971eefc5f66b450a4dd3a925f84c94 data/tutorialmod/worldgen/configured_feature/honey_berry_bush.json

src/main/generated/.cache/378f9509398ea584ca54616156177f9ec588f984

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/Block Loot Tables
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/Block Loot Tables
22
aba6545b7719a6ba09923ffe9708c8687f5ce4e9 data/tutorialmod/loot_table/blocks/cauliflower_crop.json
33
633f1a0fb106fb43356695bc26b6a016da215c5e data/tutorialmod/loot_table/blocks/driftwood_leaves.json
44
b711f0e282f5a9092528529ccf4af8999c209a52 data/tutorialmod/loot_table/blocks/driftwood_log.json

src/main/generated/.cache/80beaa027efbcf9e17d04d48300d7784fb0cb57f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/Tags for minecraft:block
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/Tags for minecraft:block
22
8159fdbcb7619cbd57674525489b6dfed8a407fd data/minecraft/tags/block/fence_gates.json
33
87c23b954c6a1061edf28d30d87d40ccfecb8a8f data/minecraft/tags/block/fences.json
44
2aea14bcf6e0112aa2f69d63beab9d27793a3eb3 data/minecraft/tags/block/logs_that_burn.json

src/main/generated/.cache/bf8b55c7a3e1253642a8b1063c0b39ff5689945b

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/Model Definitions
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/Model Definitions
22
9259f7ad8475837988d4a226212ceaa71d674929 assets/tutorialmod/blockstates/cauliflower_crop.json
33
3abf599bad0a8dd685e2f495fba411bf28dd8bcf assets/tutorialmod/blockstates/chair.json
44
e8545dabdcc17640fd2387d4ef81023d63e67783 assets/tutorialmod/blockstates/driftwood_leaves.json
@@ -9,6 +9,7 @@ d7b95d4b07c60273a02a034269f3cdbb0dcf2784 assets/tutorialmod/blockstates/driftwoo
99
4115fbde62c46de50c9bdd4c5185774b7caa3744 assets/tutorialmod/blockstates/growth_chamber.json
1010
122234d5a08c337bde3aa74fc23731cf53f4d7c8 assets/tutorialmod/blockstates/honey_berry_bush.json
1111
2d316979b5247b802b0590d94b40bac75fde6974 assets/tutorialmod/blockstates/magic_block.json
12+
c11df765d5d71cad25f0e3aed9899927c9a7a6f2 assets/tutorialmod/blockstates/pedestal.json
1213
6a728eda7238fed6b027e801e464250c3f3144ba assets/tutorialmod/blockstates/pink_garnet_block.json
1314
f8b6f1021ac80c221d8d83ede8e5816c45ef723f assets/tutorialmod/blockstates/pink_garnet_button.json
1415
40af2d76a6efa3e50ba294cfc6f11efb6e11854f assets/tutorialmod/blockstates/pink_garnet_deepslate_ore.json
@@ -95,6 +96,7 @@ a6f7246ee184c6cf0823d42ea0f7fbae96f46f23 assets/tutorialmod/models/block/honey_b
9596
5406dfa73f1fda8a1666beebed37678f095738e8 assets/tutorialmod/models/block/honey_berry_bush_stage2.json
9697
235c845ba3c1ffa4ee1e378a7bc60d54f79a74f7 assets/tutorialmod/models/block/honey_berry_bush_stage3.json
9798
ed27aaa00c275028e1495bb6d6bfdcea1851067b assets/tutorialmod/models/block/magic_block.json
99+
1aa7d1eabd14f0e3e39e450703c67ff34b17ee31 assets/tutorialmod/models/block/pedestal.json
98100
37d814e2e0356a246af16618c42984b84d9e2ed9 assets/tutorialmod/models/block/pink_garnet_block.json
99101
71d14427350d8972a3b7c9d3b7f2f9ebb012d386 assets/tutorialmod/models/block/pink_garnet_button.json
100102
265ff9736526dae271306394da10ef1c9a5ebe2c assets/tutorialmod/models/block/pink_garnet_button_inventory.json

src/main/generated/.cache/ce39c20969e010cd0348db228ef39b23c54b9ea7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/TutorialMod Recipes
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/TutorialMod Recipes
22
ecdcb274ed5fc6a35043cbcadb4d882817bcc71f data/tutorialmod/advancement/recipes/building_blocks/pink_garnet.json
33
4a0e75e52f294acf0be30b154454aedada805ed5 data/tutorialmod/advancement/recipes/decorations/pink_garnet_block.json
44
47a7c4ad671425a4c3ad4ced463e5ec11f22b36a data/tutorialmod/advancement/recipes/misc/kaupen.json
@@ -11,7 +11,7 @@ e4ae33d7b5461829f0d6342e361ffab69adf9fbf data/tutorialmod/advancement/recipes/mi
1111
19829bd54ce48362e6e9addaa1bfb8c9df275f52 data/tutorialmod/advancement/recipes/misc/raw_pink_garnet.json
1212
338342fb055ede1ef2b72128e8b780496fc53abd data/tutorialmod/advancement/recipes/misc/raw_pink_garnet_block.json
1313
612885645657e824e35aaf7ab21f9a0d6d427c19 data/tutorialmod/advancement/recipes/misc/raw_pink_garnet_from_magic_block.json
14-
784faa005cc140db31bfa0208497a52970396f91 data/tutorialmod/recipe/kaupen.json
14+
3f3893c6de8000989655acded1590dc583b8529d data/tutorialmod/recipe/kaupen.json
1515
7acc0e5a00ee8d954c89ceb1135ae6839be95bce data/tutorialmod/recipe/pink_garnet.json
1616
58d7023e8afd84069579f61a010b64138f46d01d data/tutorialmod/recipe/pink_garnet_block.json
1717
e884b09c9fecf5c6532e133bfc3c875b2e45cf77 data/tutorialmod/recipe/pink_garnet_from_blasting_pink_garnet_deepslate_ore.json

src/main/generated/.cache/f3f56cafc2cbe41709406bb540eb1fca38a90f18

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.4 -999999999-01-01T00:00:00 Tutorial Mod/Tags for minecraft:item
1+
// 1.21.5 -999999999-01-01T00:00:00 Tutorial Mod/Tags for minecraft:item
22
8ced195f504be266fa1818b0cfbd2ee244987195 data/minecraft/tags/item/axes.json
33
a83d7a926074b69c0b715a6d7e603b0fc4c78d11 data/minecraft/tags/item/hoes.json
44
2aea14bcf6e0112aa2f69d63beab9d27793a3eb3 data/minecraft/tags/item/logs_that_burn.json
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "tutorialmod:block/pedestal"
5+
}
6+
}
7+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "tutorialmod:block/pedestal"
5+
}
6+
}

src/main/generated/data/tutorialmod/recipe/kaupen.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"type": "minecraft:smithing_trim",
33
"addition": "#minecraft:trim_materials",
44
"base": "#minecraft:trimmable_armor",
5+
"pattern": "tutorialmod:kaupen",
56
"template": "tutorialmod:kaupen_armor_trim_smithing_template"
67
}

0 commit comments

Comments
 (0)