Skip to content

Commit

Permalink
Port to 1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Mrbysco committed Jan 1, 2024
1 parent ea037ec commit 588241a
Show file tree
Hide file tree
Showing 42 changed files with 106 additions and 119 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# Base info
mc_version=1.20.2
neo_version=20.2.71-beta
mapping_channel=official
mapping_version=1.20.2
mc_version=1.20.4
neo_version=20.4.69-beta
neogradle.subsystems.parchment.minecraftVersion=1.20.2
neogradle.subsystems.parchment.mappingsVersion=2023.12.10
mod_group=com.mrbysco.slabmachines
mod_id=slabmachines
mod_archive_name=SlabMachines
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-29T17:51:38.9029364 Tags for minecraft:block mod id slabmachines
// 1.20.4 2024-01-01T18:56:34.6688771 Tags for minecraft:block mod id slabmachines
94eca1bea3950baeddcb96ea5fb5f2887ff6272d data/minecraft/tags/blocks/guarded_by_piglins.json
71b92792af579b698375d023f7e1cb59556a780b data/minecraft/tags/blocks/mineable/axe.json
273e9e68322352bb589f7daa28af38e2e00d8a87 data/minecraft/tags/blocks/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-29T17:51:38.9034371 Block Models: slabmachines
// 1.20.4 2024-01-01T18:56:34.6693783 Block Models: slabmachines
db069d302eeb7448e04fc8bd3e98bc1299bab050 assets/slabmachines/models/block/blast_furnace_slab.json
f96bc709ec72446b03837383e9f3a47751de8960 assets/slabmachines/models/block/blast_furnace_slab_on.json
a80cff7fb9280fb79eb59e406115b51b4a2d00cf assets/slabmachines/models/block/blast_furnace_slab_top.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-29T17:51:38.8979345 Block States: slabmachines
// 1.20.4 2024-01-01T18:56:34.6638778 Block States: slabmachines
68a4bae52a8cca570ec4259bf9dae0a7a3324611 assets/slabmachines/blockstates/blast_furnace_slab.json
5dee1a03ebbb860111d03ed35e5fd746540e7f93 assets/slabmachines/blockstates/chest_slab.json
28ca602473a8ca0bab089854da1f1fbd5a942429 assets/slabmachines/blockstates/crafting_table_slab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-29T17:51:38.900436 Loot Tables
// 1.20.4 2024-01-01T18:56:34.666378 Loot Tables
5ca6acfb2906582e0c3ef6a7e60dc80dc85fe85b data/slabmachines/loot_tables/blocks/blast_furnace_slab.json
2bec8384148c89868821c04f2e9c15966722fab9 data/slabmachines/loot_tables/blocks/chest_slab.json
703b1823c4c62ac52ab22658ca30a67c2eafaf3b data/slabmachines/loot_tables/blocks/crafting_table_slab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-29T17:51:38.900937 Item Models: slabmachines
// 1.20.4 2024-01-01T18:56:34.6668777 Item Models: slabmachines
0d914e1cb8eae2e88a3fbf7f9eee86d8fe713668 assets/slabmachines/models/item/blast_furnace_slab.json
c71a72a82acbebfb0ec3122013923a4bf23f779d assets/slabmachines/models/item/chest_slab.json
e0a96760b267e4c9ec6ba33dae2c439df264bdf9 assets/slabmachines/models/item/crafting_table_slab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
// 1.20.2 2023-11-29T17:51:38.9014363 Recipes
fe73b6da502f8b59f3417a5af1b6d6f31fc8354b data/slabmachines/advancements/recipes/misc/blast_furnace_slab.json
d2d624ad8f199d378c16a9e5f4503de76595aa78 data/slabmachines/advancements/recipes/misc/chest_from_slab.json
12df14e427950757f5fb3bb8a024df1f31b7c108 data/slabmachines/advancements/recipes/misc/chest_slab.json
456ddd4c78d41f337792217b4ee251455b201bdc data/slabmachines/advancements/recipes/misc/crafting_table_from_slab.json
b77d4b12ee11ae44367aecd3692d1398d61fb359 data/slabmachines/advancements/recipes/misc/crafting_table_slab.json
7e23600ad879d71f656ab85407594da3aad5c56f data/slabmachines/advancements/recipes/misc/furnace_from_slab.json
9b941bf9eecfb637161d216ed7859fe2332fe448 data/slabmachines/advancements/recipes/misc/furnace_slab.json
ddf7b085fe5db1d1d9727665bc532ddfa3c81503 data/slabmachines/advancements/recipes/misc/note_block_from_slab.json
95ea9a96c609ecd5817986601cef0323d26e8579 data/slabmachines/advancements/recipes/misc/note_slab.json
851c47a1fbb96c0c6c596fe5ae633a0d6179a8a6 data/slabmachines/advancements/recipes/misc/slab_from_blast_furnace.json
84ac033fc9772e6647e97e209f7c74313d8cc321 data/slabmachines/advancements/recipes/misc/slab_from_chest.json
61f1d96bd82887451a945bc80d1524c319a8ff3c data/slabmachines/advancements/recipes/misc/slab_from_crafting_table.json
62894d4b106671645caa150379c8f48309194fad data/slabmachines/advancements/recipes/misc/slab_from_furnace.json
cdf971f2ec77f11f47df6ebbf2b15dbb26188a04 data/slabmachines/advancements/recipes/misc/slab_from_smoker.json
442a72c5ff448c29bc3d3c1e063c921a56b20587 data/slabmachines/advancements/recipes/misc/smoker_slab.json
d6d2257ebe40b04c588884a1b56b7172dc4c66b1 data/slabmachines/advancements/recipes/misc/tnt_slab.json
b84b50925cf1815ff25c2d1e6b9a99a5a9c2a0ad data/slabmachines/advancements/recipes/misc/trapped_chest_from_slab.json
e40398e78af7b8e32085d4f50ec93855d0afc09d data/slabmachines/advancements/recipes/misc/trapped_chest_slab.json
091c91480d18b3a03e29d413185f72161c8367e3 data/slabmachines/recipes/blast_furnace_slab.json
a92c5f36b2f7b655a8eab3df6c266fc7c3ec33c5 data/slabmachines/recipes/chest_from_slab.json
500cbacbe041e3053ddb910d0bd88e338d430db4 data/slabmachines/recipes/chest_slab.json
c319fb33ccf3edbc89b1d527d590e6c838718f1b data/slabmachines/recipes/crafting_table_from_slab.json
e179b4b6c97f3c1d5a838a28b588581cf5cd1f88 data/slabmachines/recipes/crafting_table_slab.json
87c0a8b2c985290e2d0adc1270b6e44a467a830d data/slabmachines/recipes/furnace_from_slab.json
// 1.20.4 2024-01-01T18:56:34.6668777 Recipes
8c7af5686a1e872fc8c97ce7635b7b4a810beac4 data/slabmachines/advancements/recipes/misc/blast_furnace_slab.json
dbe8a9ad7d24b5c3c7428989d5a8eb767844a736 data/slabmachines/advancements/recipes/misc/chest_from_slab.json
6660cf83a063b6b65927f9d098da52dc824463f8 data/slabmachines/advancements/recipes/misc/chest_slab.json
9e4f6da49ef015da220ec603a58c81b8c5b60556 data/slabmachines/advancements/recipes/misc/crafting_table_from_slab.json
62ff9af70f91c68b47421290c817ac1bba03b709 data/slabmachines/advancements/recipes/misc/crafting_table_slab.json
7b08033332ecd60ecf0686fc0c783c4515e5c5df data/slabmachines/advancements/recipes/misc/furnace_from_slab.json
1ce7eb568c82a330d3f3f538f94c69eec5fc05f1 data/slabmachines/advancements/recipes/misc/furnace_slab.json
f78c40ce120603c9a8f00125a605b130d2153d83 data/slabmachines/advancements/recipes/misc/note_block_from_slab.json
a6294628d246b2dd8b86f7a51bc596751cd15f17 data/slabmachines/advancements/recipes/misc/note_slab.json
8e04204935ba281d3681d9d7c2b8f7df940ba34c data/slabmachines/advancements/recipes/misc/slab_from_blast_furnace.json
e134611791a1e8dd14cea65c1a64847de9aeb27f data/slabmachines/advancements/recipes/misc/slab_from_chest.json
c499f0b6651e265eacb893222d72d8d91029b2e6 data/slabmachines/advancements/recipes/misc/slab_from_crafting_table.json
2606e0c7564b56ad7fe6ca89cba6dd5c3adb2d01 data/slabmachines/advancements/recipes/misc/slab_from_furnace.json
4efa4a6fb4cd61dd796dfaee11315bb3569e2d87 data/slabmachines/advancements/recipes/misc/slab_from_smoker.json
68db28ba756822815e10b64c0a48e840210fa691 data/slabmachines/advancements/recipes/misc/smoker_slab.json
197896dddcf653a6b1f2a096fef77fe3043d8503 data/slabmachines/advancements/recipes/misc/tnt_slab.json
d8868974dddcbbbed9e21a34f1ad7aa4ba9eb0af data/slabmachines/advancements/recipes/misc/trapped_chest_from_slab.json
2492698b31f7bfb36502ccdfa2bda00fc8874b3b data/slabmachines/advancements/recipes/misc/trapped_chest_slab.json
7f7f1d501707188bd8a5f329330175f2ac740f30 data/slabmachines/recipes/blast_furnace_slab.json
d80c243bf2d4139319af85f843a99e08edf12295 data/slabmachines/recipes/chest_from_slab.json
2b0321022b9fc2cff3ffe3b758f58e4d9d929515 data/slabmachines/recipes/chest_slab.json
5cece96f9ff1a9a50532097881b44e3212a4e2bc data/slabmachines/recipes/crafting_table_from_slab.json
bc82ea6666a627926348657f8208291fe930e2ef data/slabmachines/recipes/crafting_table_slab.json
266813d729a4c7d12746ebf5f641b9c7b94b280c data/slabmachines/recipes/furnace_from_slab.json
dc24c3a26fbc058fad577d40a36072a1568e62a8 data/slabmachines/recipes/furnace_slab.json
c0d84438240fd024b0ceda5418b3bc839035811e data/slabmachines/recipes/note_block_from_slab.json
66a5368cef206d7ddded2da3db4e87a7970f1af1 data/slabmachines/recipes/note_block_from_slab.json
ce2d0fc68d8b7fef199c2f0a17456523cd49099a data/slabmachines/recipes/note_slab.json
d3d8f69d68dfcd7e6693af8b7b8b4f8a6be30734 data/slabmachines/recipes/slab_from_blast_furnace.json
ac56309109a806f809c539afc47135c005f0291b data/slabmachines/recipes/slab_from_chest.json
5791ea72030cefe0ff2a2cf7b8ef1af669ad767b data/slabmachines/recipes/slab_from_crafting_table.json
0938dc5ebd5c695f07808ac272bd115fe74e938d data/slabmachines/recipes/slab_from_furnace.json
fa956714ff8a79989d5bda0c52647960b5218e88 data/slabmachines/recipes/slab_from_furnace.json
263334de44deb0af48e5c248fd93eeed54501f97 data/slabmachines/recipes/slab_from_smoker.json
f76df4a47013703df04526f8ac223b52d65c5d48 data/slabmachines/recipes/smoker_slab.json
6a117cefbed1381f85ef7cd2df845cc138960d5a data/slabmachines/recipes/tnt_slab.json
e84e2e8866c06d953567bb67c226fc8b81cb28a2 data/slabmachines/recipes/trapped_chest_from_slab.json
c975a501729220a5508ae20e202cfecc435bac71 data/slabmachines/recipes/smoker_slab.json
ba9a7aeb5435f12c28346db4c6abb8a166563dd6 data/slabmachines/recipes/tnt_slab.json
3ff1c8f00b976872128783a08a2070cd986ed8e7 data/slabmachines/recipes/trapped_chest_from_slab.json
8577deb24a3e2ba874f0f81a1affe04931a675bf data/slabmachines/recipes/trapped_chest_slab.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2023-11-29T17:51:38.9029364 Tags for minecraft:item mod id slabmachines
// 1.20.4 2024-01-01T18:56:34.6688771 Tags for minecraft:item mod id slabmachines
70b4314e953c515362680e979e8b069ae5c569fb data/forge/tags/items/cobblestone_slabs.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.2 2023-11-29T17:51:38.9024358 Languages: en_us
// 1.20.4 2024-01-01T18:56:34.6683782 Languages: en_us for mod: slabmachines
6cb5ff8a6b29659a82f882d872d0d1bf23dfd5f7 assets/slabmachines/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"recipes": [
"slabmachines:blast_furnace_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:chest_from_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"recipes": [
"slabmachines:chest_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:crafting_table_from_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"recipes": [
"slabmachines:crafting_table_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:furnace_from_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:furnace_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:note_block_from_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:note_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:slab_from_blast_furnace"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:slab_from_chest"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:slab_from_crafting_table"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"recipes": [
"slabmachines:slab_from_furnace"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:slab_from_smoker"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
"recipes": [
"slabmachines:smoker_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:tnt_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:trapped_chest_from_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"recipes": [
"slabmachines:trapped_chest_slab"
]
},
"sends_telemetry_event": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
],
"result": {
"item": "slabmachines:blast_furnace_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "minecraft:chest"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
],
"result": {
"item": "slabmachines:chest_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "minecraft:crafting_table"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "slabmachines:crafting_table_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "minecraft:furnace"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "minecraft:note_block"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
],
"result": {
"item": "slabmachines:furnace_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
],
"result": {
"item": "slabmachines:smoker_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
"result": {
"count": 6,
"item": "slabmachines:tnt_slab"
},
"show_notification": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
],
"result": {
"item": "minecraft:trapped_chest"
},
"show_notification": true
}
}
Loading

0 comments on commit 588241a

Please sign in to comment.