Merge fix-ups

This commit is contained in:
simibubi 2023-03-01 22:09:42 +01:00
parent dde9ad280b
commit c4505b657b
7 changed files with 192 additions and 82 deletions

View file

@ -2,15 +2,18 @@
f0d6baaabda94151134f569246d61a6e710c35a9 assets/create/blockstates/acacia_window_pane.json
6b70306397316d6ebfa1cb07f2308d5c7fce83e0 assets/create/blockstates/adjustable_chain_gearshift.json
9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets/create/blockstates/analog_lever.json
96097d97028f38d61d64fec7c7095aaf64650db3 assets/create/blockstates/andesite_belt_funnel.json
a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_alloy_block.json
951d67fc41af364e333babf649e1a04beea6226a assets/create/blockstates/andesite_bars.json
47cb4f4629277b467263bd54a44dec45837eb719 assets/create/blockstates/andesite_belt_funnel.json
9999a75c7766781eadb12510a09264600bc846e4 assets/create/blockstates/andesite_casing.json
96bd534d3d84336927fb6512f9848d837d557084 assets/create/blockstates/andesite_encased_cogwheel.json
1673172100317477ca559c32fd91d16b165e0085 assets/create/blockstates/andesite_encased_large_cogwheel.json
9639b901ffdd2ecccab5575c5c9e6c7b5c901e02 assets/create/blockstates/andesite_encased_shaft.json
ca9a629472625abf741f02b94ce4578292fb14a7 assets/create/blockstates/andesite_funnel.json
7c5ac6149a991dfe125be3ae3c27c0c841e11f6c assets/create/blockstates/andesite_funnel.json
73154ab9fe5463116d06d0732f9a1c2fa817dc3f assets/create/blockstates/andesite_ladder.json
3adca59d03198c273f13c21c6058348c9fa71735 assets/create/blockstates/andesite_pillar.json
1d2d8081581e07d9be4b382aede4f2de4401cc6b assets/create/blockstates/andesite_tunnel.json
a07a73251d26e8b38bce295838c2fef246f9885d assets/create/blockstates/andesite_scaffolding.json
98e95355fc7d45fc9d3706ed3912cd0bfb4a41c3 assets/create/blockstates/andesite_tunnel.json
70a2eff30918c6369fc90aaa6a56ffa5c959065a assets/create/blockstates/asurine.json
bb61f3f336ebe0ff08d84cb6a83e86a823dac7aa assets/create/blockstates/asurine_pillar.json
e555e3c2b2d3f01440e48db4ba88f7e00fd99b6f assets/create/blockstates/basin.json
@ -28,15 +31,17 @@ ec2ab87734acc209e6be3bc4898b1199f819bfd3 assets/create/blockstates/blue_sail.jso
4854d1ef52130a7887aecc60bcaffbd66f0871a8 assets/create/blockstates/blue_seat.json
dea175335c5db0abe758cd208dc984c22506a176 assets/create/blockstates/blue_toolbox.json
f3697a7d105e5d271f5999b86df071fe5893457c assets/create/blockstates/blue_valve_handle.json
5f57741e500903b70c80d2a72788a25e97387e2e assets/create/blockstates/brass_belt_funnel.json
73648bfbc15c536613ca92fb675c17243d9f4f44 assets/create/blockstates/brass_bars.json
4b436e4afa3b1734567010788064fee73f69c92e assets/create/blockstates/brass_belt_funnel.json
8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets/create/blockstates/brass_block.json
b8dd6e505943e06706d0718ece620ab3cf943650 assets/create/blockstates/brass_casing.json
577adb030af119fb980ededaa7fc2a3d3ed14220 assets/create/blockstates/brass_encased_cogwheel.json
e69a71fdeb5855b2a59a31598f25eaea589c1748 assets/create/blockstates/brass_encased_large_cogwheel.json
288bad07593a8a2c8efaf44bba0ffb0011d36cd3 assets/create/blockstates/brass_encased_shaft.json
adfbd6cc5e44a0f431180aedbe65a19428299d8e assets/create/blockstates/brass_funnel.json
bd8f3073f3208d0116719a25044a91dd46fc11ac assets/create/blockstates/brass_funnel.json
f9234ab4324892587c4b0bf38523ee7770072f6b assets/create/blockstates/brass_ladder.json
672eedcd3520c6d39603449165a23be9c612c620 assets/create/blockstates/brass_tunnel.json
1424ae41182927e71613a6495530c1ec346e8f50 assets/create/blockstates/brass_scaffolding.json
769e12a65262f79b57df9e3300df20d3fca6c3bb assets/create/blockstates/brass_tunnel.json
ffe31d5ad0486949b049cf2060d1f34ef7ceaa82 assets/create/blockstates/brown_nixie_tube.json
11ebdd9bd0815833e62ec1bea03a4cdd86ce00f3 assets/create/blockstates/brown_sail.json
e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets/create/blockstates/brown_seat.json
@ -54,8 +59,10 @@ e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json
7d11142092c89ccba3e74e0a3bdd0ccb446d63b5 assets/create/blockstates/controller_rail.json
80d71365995d4c2a61dd1c15e99cae18551af6e8 assets/create/blockstates/controls.json
961b615124ea9a5a5735e8a79f81a702de7da2cf assets/create/blockstates/copper_backtank.json
977c993fbcebf7d321eaa6840f179f6c9a155148 assets/create/blockstates/copper_bars.json
cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json
a54d18937f8ce000f7ed0dc627d6d3414805006a assets/create/blockstates/copper_ladder.json
9d264bda40584003a183c386264117829279d21b assets/create/blockstates/copper_scaffolding.json
b3d0dee8f6e14fa6c637e98cc1c6f1ea55b5f0d5 assets/create/blockstates/copper_shingle_slab.json
a002289d0bb7df6927e8e6a99e9eb9ec77bd179d assets/create/blockstates/copper_shingle_stairs.json
7db3cd84768bf2dcb8420cbf45492f543ddfd893 assets/create/blockstates/copper_shingles.json
@ -63,6 +70,7 @@ a87097f3a092264d9b74966ee9e3bcfc0b743f80 assets/create/blockstates/copper_tile_s
1cc9cdcd48ea76fe3407dce0973220ff9f63f51a assets/create/blockstates/copper_tile_stairs.json
cbae7653d6a6f2d98370e9a4a3bd91fdb529f89d assets/create/blockstates/copper_tiles.json
543af282e2cb44f00509d850814b4501f3491d48 assets/create/blockstates/copper_valve_handle.json
ce4968cbe65f267c27902372075265c5cdd1b285 assets/create/blockstates/copycat_bars.json
22a91cc73d6b492dddd9354693b873701fb82c01 assets/create/blockstates/copycat_base.json
f4d185b9eb086e5024a9818bad57d524267d6e13 assets/create/blockstates/copycat_panel.json
f4d185b9eb086e5024a9818bad57d524267d6e13 assets/create/blockstates/copycat_step.json
@ -73,7 +81,7 @@ f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_moto
f7c283460879e70ed0fa112a24caa06a7122358f assets/create/blockstates/crimsite_pillar.json
24ee16e3dadb3e0221afce7af37643494f471fb0 assets/create/blockstates/crimson_window.json
3e6cd0945390b390b963474f7cf708e2dcba631c assets/create/blockstates/crimson_window_pane.json
fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json
644cc650c49602e654e85b3b05073748c6cd42e5 assets/create/blockstates/crushing_wheel.json
a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets/create/blockstates/crushing_wheel_controller.json
b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/cuckoo_clock.json
7b4147b215d676a528ee8782a4528d42dac02198 assets/create/blockstates/cut_andesite.json
@ -245,12 +253,14 @@ f1da8d16c9b0122bda60583a03d2b31ec1c70799 assets/create/blockstates/green_valve_h
be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json
18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json
30ec347dfc827a9ae52cf3da964b828005acede1 assets/create/blockstates/hose_pulley.json
1625a5838bd891fe6950dcb7b4235b4a53976a7d assets/create/blockstates/industrial_iron_block.json
6651c84ea621777d572a3d7aa13b75d9f061191b assets/create/blockstates/item_drain.json
10ef455fd61ed1ca831d27bf2b533d05dec9c67d assets/create/blockstates/item_vault.json
5d851c90d23de5087ce546d4bbe509e112b84c49 assets/create/blockstates/jungle_window.json
b15bea757ef981e0ca60f740ca234ee2014eb7b7 assets/create/blockstates/jungle_window_pane.json
a922b31bc4a91f5825b643ba5fa2c9a836d612cd assets/create/blockstates/large_bogey.json
f651091db216b009b3379b2f48d56d03481c8675 assets/create/blockstates/large_cogwheel.json
9554c8d14271a2b85df7eadeceaa8b31849415e4 assets/create/blockstates/large_water_wheel.json
a38184e035c2ebca7471e1714494fea213af259e assets/create/blockstates/layered_andesite.json
2409f04042380a8ad086f9c4f98032e85771c3f3 assets/create/blockstates/layered_asurine.json
ca1648840d9f5786f85e4214a0951306c1247c73 assets/create/blockstates/layered_calcite.json
@ -520,7 +530,8 @@ c9bf881ea71aa274b2803142456f1bbed9539076 assets/create/blockstates/veridium.json
c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets/create/blockstates/vertical_framed_glass_pane.json
3a5da54d9763e9512cfaa47b25226b79738b25f3 assets/create/blockstates/warped_window.json
19ef7a16c82f07d304fb60d121845185d189aecf assets/create/blockstates/warped_window_pane.json
d31fce8315c8715521d66b5dcc166c84e949dd1d assets/create/blockstates/water_wheel.json
638109f42fe1da576c8c832a79676065d54b1ee5 assets/create/blockstates/water_wheel.json
f4d185b9eb086e5024a9818bad57d524267d6e13 assets/create/blockstates/water_wheel_structure.json
97a8f4cf45776b1fb5249fe1a9314b5c615fb130 assets/create/blockstates/waxed_copper_shingle_slab.json
d31a8ad9ffa09cbabfb284d44c9c44d036072083 assets/create/blockstates/waxed_copper_shingle_stairs.json
e7be350dd2fd80357c56a0fbad3e000818b822c9 assets/create/blockstates/waxed_copper_shingles.json
@ -566,8 +577,8 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
f1bedeb51c35e70a2247178634e61ea637a6622e assets/create/lang/en_ud.json
59bd0d1e0f74f1dbfd2443b3e6cb8c683b57827a assets/create/lang/en_us.json
ea8adceca24670f1b5850ccd5c2ac766de590f05 assets/create/lang/en_ud.json
a65e9c868a5da341170e4ddf38405a4d3e8403e8 assets/create/lang/en_us.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -584,14 +595,17 @@ c3fdfa0ef84a598a17b2194fd0ea56fb323441d6 assets/create/models/block/adjustable_c
11c034a7689e3bc96cf54f67fd93bc3839ae19e9 assets/create/models/block/adjustable_chain_gearshift_middle_vertical_powered.json
221b65e4fed640dc77f8ec5fee300f2a199d05b1 assets/create/models/block/adjustable_chain_gearshift_single.json
ef644b33e136692c19cf8e79fcd28431b40dbb62 assets/create/models/block/adjustable_chain_gearshift_single_powered.json
10832d276445d8a5f94413de1979349db1364ec4 assets/create/models/block/andesite_belt_funnel_extended.json
d01611179d3ed6c013f4f649127239772cbdeba3 assets/create/models/block/andesite_belt_funnel_extended_powered.json
c862af2b37ccfd0123e9e96a5400be82033bbdd3 assets/create/models/block/andesite_belt_funnel_pulling.json
ed52e27fd7d645c25dc9dc58a44f29be12cb6d5e assets/create/models/block/andesite_belt_funnel_pulling_powered.json
884aaf754de0bfd51690aab6e01f775419728cf7 assets/create/models/block/andesite_belt_funnel_pushing.json
3c8ed64100de95994580a8e6e24c7b72f2332081 assets/create/models/block/andesite_belt_funnel_pushing_powered.json
7b1888eec72c04677a3dfb709b04ad10d08d74d0 assets/create/models/block/andesite_belt_funnel_retracted.json
240230f29d092505d47c83ae59f5c908e4bf4932 assets/create/models/block/andesite_belt_funnel_retracted_powered.json
647aa88fe7f74048b06e61dd092a7ce167f6e7bc assets/create/models/block/andesite_alloy_block.json
953daa66d3befd33edfb62421c01330ff9ecf441 assets/create/models/block/andesite_belt_funnel_extended_powered.json
0e0b6fffad506f7bb9f212becb69b04fdb773372 assets/create/models/block/andesite_belt_funnel_extended_unpowered.json
5be49f276346a4908366426329319366d98c0877 assets/create/models/block/andesite_belt_funnel_pulling_powered.json
3078958b74af612dbb1a5bf18b92c190d63524d6 assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json
eddf206f5fffbf9446461538da9fea70f5d22f0e assets/create/models/block/andesite_belt_funnel_pushing_powered.json
31784901768ebb9322a101710c5b6c16e7185271 assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json
574ece0c5d1877a07e46f0d86add876bf002541f assets/create/models/block/andesite_belt_funnel_retracted_powered.json
2ea98218be00eea0f8b58072f970b4a2d096306d assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json
8d53939d0e5fbeaace7800ac055719fd24b8314f assets/create/models/block/andesite_cap.json
d497453840a05b0b958890676b819215f3a118b3 assets/create/models/block/andesite_cap_alt.json
4e44ccdc5e396c4380a7e59408db50553fa25226 assets/create/models/block/andesite_casing.json
762509cfb8602c6d0d3f959c08ad4934c2b5d8fa assets/create/models/block/andesite_encased_cogwheel.json
314489582d1cde98bc5e4fd4d2f0c9ab3cb731d3 assets/create/models/block/andesite_encased_cogwheel_bottom.json
@ -601,22 +615,23 @@ c8f215c191f46ff1ea6f098ab32c7d27d04cb017 assets/create/models/block/andesite_enc
f8f131a53664faa5bd84b61e83d62ed5b367bf1d assets/create/models/block/andesite_encased_large_cogwheel_bottom.json
77b3bbcb47e83f985d68b0ed0344e9f79999e797 assets/create/models/block/andesite_encased_large_cogwheel_top.json
01189fb179863ce1ef524bd5ddd5b4bebd5bbc6b assets/create/models/block/andesite_encased_large_cogwheel_top_bottom.json
8d4e4a7c6ad6d45c7aa7ca3105a025511571ff26 assets/create/models/block/andesite_funnel_horizontal_pull.json
9841d6a09a09bf4d5d6a39bdc4904d86b3a825f8 assets/create/models/block/andesite_funnel_horizontal_pull_powered.json
86d5df6e365d9b2e9682f0839f61058360828ba2 assets/create/models/block/andesite_funnel_horizontal_push.json
50af1ff6ce9af162d4e438f21952c7215608dc8e assets/create/models/block/andesite_funnel_horizontal_push_powered.json
75c914bf9448e25fd01d597de48375a9782bef36 assets/create/models/block/andesite_funnel_vertical_filterless_pull.json
4d70a221809f5bc598a0a0e98bd152e9ab7a2f7f assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json
a41c7351513a9514dfdc0fc552b646b1d715c977 assets/create/models/block/andesite_funnel_vertical_filterless_push.json
e7931f28887baadd52ac988fc8eeeb84ee6f0d27 assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json
a51ef8eb258251ecd4313d6997ce607b79a23850 assets/create/models/block/andesite_funnel_horizontal_pull_powered.json
fd19670a4504617fcd0ee0a1fb6ebeca9b30cc82 assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json
aa22be9799a91810fa0068e525dd6961d7af4900 assets/create/models/block/andesite_funnel_horizontal_push_powered.json
5ca7cfe29534b2839b2cefd6ab1047c74f9af079 assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json
f2d6d85ad3e0899855d2c6658484e33ea9d5e2e0 assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json
afa3669c0d80b4eccd839fa08a3c3e884f5dd1f6 assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json
eeb2637590e8af1342c5494dea7faab0490f2f3e assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json
2c0e1bb2edca1c0315e4b989d1ae58b8fe681d05 assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json
ee665cf464ead6135de3f60c7e2ac475af6496d7 assets/create/models/block/andesite_ladder.json
882871d4cd7b4925f300c09d00ba58785b27119e assets/create/models/block/andesite_pillar.json
587491f19767bd682bbef00eaa890d4b8a320b7a assets/create/models/block/andesite_pillar_horizontal.json
2294f74b5c30430de89a345af60f6669c975f33a assets/create/models/block/andesite_tunnel/cross.json
17f860947f51e84a3f9b32b10cdf61f863db3afc assets/create/models/block/andesite_tunnel/straight.json
e74aa39f8142293c202e57dbd92e8660818b18b5 assets/create/models/block/andesite_tunnel/t_left.json
c93978d636fe70d456a6e1914b65527cbc18544c assets/create/models/block/andesite_tunnel/t_right.json
2a86780c6825edce8fbdaa118a267fc09ce410b0 assets/create/models/block/andesite_tunnel/window.json
3d5bce20c58e7503b3868edac97f32556ccd1b6f assets/create/models/block/andesite_post.json
722e1e40ca4153887d57c9c90d70d94dd87a0bc1 assets/create/models/block/andesite_post_ends.json
23dc81d6e683b0fd8c1dedcfdb8a4aa04f99b3a0 assets/create/models/block/andesite_scaffolding.json
9634056c616296a8106350dc40222e904688585d assets/create/models/block/andesite_scaffolding_horizontal.json
677d75755bc1fba56823292b2abe03a495ba2910 assets/create/models/block/andesite_side.json
419288e05242def13d58c1a8174673c33732b4a5 assets/create/models/block/andesite_side_alt.json
7b2e3b7e9d72286b202bb38ab6e4d69465365d47 assets/create/models/block/asurine.json
a9167990e3f894f92a9de24c8b77d040b1c1ff0a assets/create/models/block/asurine_pillar.json
e40c3a7e6f7b895770f544d79536c744d18c462f assets/create/models/block/asurine_pillar_horizontal.json
@ -648,15 +663,17 @@ c86a455b8e85ef190261718726b344cf15ba1e4f assets/create/models/block/bracket/shaf
8fa9ce896412af894d7c431a50104445d91b1d4d assets/create/models/block/bracket/shaft/ground_wooden.json
3956168840aca9425d3bf240650406c1dbc8ea66 assets/create/models/block/bracket/shaft/wall_metal.json
7aaa2fbdb618e8aab7e0da19a5393e1eaa608623 assets/create/models/block/bracket/shaft/wall_wooden.json
3fac6b1da6a81fc44a1ffe1e13dc6cfe37c3b738 assets/create/models/block/brass_belt_funnel_extended.json
2d10825bfd94419d5dbb4e60187127c4a1ce1526 assets/create/models/block/brass_belt_funnel_extended_powered.json
dfc6250e28e12ff193a45891978ec50c406fc0c2 assets/create/models/block/brass_belt_funnel_pulling.json
5ff7e01c5b65eb210a054556068d75426b547d9b assets/create/models/block/brass_belt_funnel_pulling_powered.json
5409325494780afe32e6e30377314e2992ca4aa5 assets/create/models/block/brass_belt_funnel_pushing.json
e981727fd71e32ea2ecb8e057dfe123f1b940101 assets/create/models/block/brass_belt_funnel_pushing_powered.json
97410a12b7c1461f88fb633f26ff566a0636b627 assets/create/models/block/brass_belt_funnel_retracted.json
bc23a91f300e46761bb14c597fad39c3d414e84d assets/create/models/block/brass_belt_funnel_retracted_powered.json
5adb8b446817eee3a31971d708320c7104d6bbd8 assets/create/models/block/brass_block.json
18048eac6c45e30c47cc7fc964b0986cd033bc00 assets/create/models/block/brass_belt_funnel_extended_powered.json
7870163874d8d2e29e9bed3fcaf5be715d0de541 assets/create/models/block/brass_belt_funnel_extended_unpowered.json
e4894b8cb9dda7aa4b9d035ae16f705459ddf14c assets/create/models/block/brass_belt_funnel_pulling_powered.json
8d86c2f3ddd51dc6b15d1e4ce115f0d7b1e28dda assets/create/models/block/brass_belt_funnel_pulling_unpowered.json
f0a9b05c69e67aa61b88f6db5d818ae191b3aad5 assets/create/models/block/brass_belt_funnel_pushing_powered.json
710f4903e7022761c43f7def240d5aad98389871 assets/create/models/block/brass_belt_funnel_pushing_unpowered.json
e0958b94c40e4aabbcbabd70be8a368eb877dcf9 assets/create/models/block/brass_belt_funnel_retracted_powered.json
5715303e539e6005a347480e52db2c7e6676c716 assets/create/models/block/brass_belt_funnel_retracted_unpowered.json
2b1ca994d2feec8321fdb0388028c20d40326eb7 assets/create/models/block/brass_block.json
a094db3862d765e185c4849ce0a50967ee95d7c1 assets/create/models/block/brass_cap.json
2dbb68d4917cac90fd6fe05abf5f7432288fdbed assets/create/models/block/brass_cap_alt.json
2e67c147d7c69aabd9ab9f7aa80f60671d5a03aa assets/create/models/block/brass_casing.json
8cb0039684377c27a7fe20bdcacf24f871221478 assets/create/models/block/brass_encased_cogwheel.json
c735917634c87b3d289bd912c7ceb465a3cc65b6 assets/create/models/block/brass_encased_cogwheel_bottom.json
@ -666,20 +683,21 @@ c2199a633597a73a1c2d508e5dfe0a7589b02329 assets/create/models/block/brass_encase
ed150a9e18889217b7f010412e4317af04af7dc1 assets/create/models/block/brass_encased_large_cogwheel_bottom.json
bb4155627c1f189e2e3bc07822d227bb0fc64bc4 assets/create/models/block/brass_encased_large_cogwheel_top.json
421cbc9bcb6511c66ff7122d1800bcd8ab866b2b assets/create/models/block/brass_encased_large_cogwheel_top_bottom.json
f7fd1f49857eca94e4135e65c85127510d666e4f assets/create/models/block/brass_funnel_horizontal_pull.json
45a23298ad03fd3b5dc2757dcd7edc18b8cce222 assets/create/models/block/brass_funnel_horizontal_pull_powered.json
a9fc7210d44b47202438668f11b31099e82c9ebd assets/create/models/block/brass_funnel_horizontal_push.json
4049bf503ec2ee22412c59e05299de20319b0dc6 assets/create/models/block/brass_funnel_horizontal_push_powered.json
320e377a4380ac637bff2e0535f229c52d886437 assets/create/models/block/brass_funnel_vertical_pull.json
28c2f8ca6403f98b82e3a0eadb608a41490cc96f assets/create/models/block/brass_funnel_vertical_pull_powered.json
c4c46d47854c9a6cf8f410006a35bbc8e599f0d5 assets/create/models/block/brass_funnel_vertical_push.json
fd6f6607a4742fa87dfe1768927a29dc4975ce7a assets/create/models/block/brass_funnel_vertical_push_powered.json
68f57bccd8a7ec0a997ab65aab74103338b0ade0 assets/create/models/block/brass_funnel_horizontal_pull_powered.json
327643126b6b4a93523354ac70b0148d36176c75 assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json
49c2cf87fb273d7e557cfde908e319f7810e333d assets/create/models/block/brass_funnel_horizontal_push_powered.json
f5bc8543b6b6cddeb455a1c20500240de9d837ac assets/create/models/block/brass_funnel_horizontal_push_unpowered.json
c76668b6b61a3f81a08a1eadaa34fa8bfe68f912 assets/create/models/block/brass_funnel_vertical_pull_powered.json
33c07af5f61f89d781037a5841335e4783392fde assets/create/models/block/brass_funnel_vertical_pull_unpowered.json
2d78db12acd90364658b36e8fe7dee7f24ea361b assets/create/models/block/brass_funnel_vertical_push_powered.json
aa81eeb9771e59173ecf635f7c5334ac64c83b6d assets/create/models/block/brass_funnel_vertical_push_unpowered.json
5620cf6b033dbfb3c43d03ddad18c432eb821997 assets/create/models/block/brass_ladder.json
520087db8d479c66f85f3483af813fb668f27503 assets/create/models/block/brass_tunnel/cross.json
347ed67bf3426e323354e2d959fc9563dc7eeecd assets/create/models/block/brass_tunnel/straight.json
a959e03ca339badb49fe58ba53d86a84352e91f3 assets/create/models/block/brass_tunnel/t_left.json
0585fbe58da3a8ed0dc98cc7ed79ac067312078d assets/create/models/block/brass_tunnel/t_right.json
a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel/window.json
74d090cda85c793c285c028537c396a074366b9f assets/create/models/block/brass_post.json
7e49c7ecf886d031f33a6fe748200e07099d7c9f assets/create/models/block/brass_post_ends.json
de296beb1a8f1d51f2533e166800c65d69a8b091 assets/create/models/block/brass_scaffolding.json
a276726447e4c22a259d224f8124ea863cb36b3c assets/create/models/block/brass_scaffolding_horizontal.json
9ad24eae18506bf66c893fcb99ca15c9f50b7e58 assets/create/models/block/brass_side.json
63c93da138d7787b415cb5459975cc2a220e2c1d assets/create/models/block/brass_side_alt.json
71cd22dc2d847d317f19afb4b21802fbf5347e0b assets/create/models/block/brown_nixie_tube.json
8ab097caaa0db0915ae9254f7d65092d9171bc60 assets/create/models/block/brown_sail.json
4eed0ad902f5e84f2b6c160f3283e8028640e77d assets/create/models/block/brown_seat.json
@ -689,14 +707,22 @@ a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel
c4d1e1b6e195c0b71c0b96546978cd24c4a4bfc4 assets/create/models/block/calcite_pillar_horizontal.json
4156227e18c0896ce83f260f71b939abbbf4f01e assets/create/models/block/chocolate.json
30fe120af3cb32faf0729df4d2cdf868f804be17 assets/create/models/block/clockwork_bearing.json
4db08101a5d03303506e89adc9ff394ed26cd2e6 assets/create/models/block/copper_cap.json
06447f3c1e3f6d53d3887cedc20c322b146bdb1f assets/create/models/block/copper_cap_alt.json
1f01a4b6608f75145734b60ddf4a33ce318425ff assets/create/models/block/copper_casing.json
c53dacdeb2e5c51de0706d87ad2d2c02a0d004b0 assets/create/models/block/copper_ladder.json
6a6ac93ba3ba00319d0c22c858e414a9bdfcd748 assets/create/models/block/copper_post.json
ceb03be484c0cf8e754ea39faab0834d820a5c6b assets/create/models/block/copper_post_ends.json
4d35570ae6b228528656f95faebb227dfbad1a1e assets/create/models/block/copper_scaffolding.json
fa60214501fd2e5007672ec3af5db1f20878f5b5 assets/create/models/block/copper_scaffolding_horizontal.json
9967651b9323174836a3179f088fa1dd7518270d assets/create/models/block/copper_shingle_slab.json
a8b28ae828c1e092bf499dd1fbeb9b19c40e3206 assets/create/models/block/copper_shingle_slab_top.json
e577cb469c8adfb3fed81232419393611665a5f6 assets/create/models/block/copper_shingle_stairs.json
ed9e72e163883a784cee42157701955f30831fbf assets/create/models/block/copper_shingle_stairs_inner.json
8ae100e7aa52c0e5baa3685974258e4e070242bb assets/create/models/block/copper_shingle_stairs_outer.json
d4cb771acc143cb4361270db0025ca92864434cd assets/create/models/block/copper_shingles.json
1169b17185f0a564f6e08a71617cec62687d2487 assets/create/models/block/copper_side.json
667d98fdb2dc43067bc2591f0ae26e4d17c758ff assets/create/models/block/copper_side_alt.json
8a10c93a3fc2d7bc7019a47a9fa89711bdd9232e assets/create/models/block/copper_tile_slab.json
92c7cb2584fe0b1071eeafca2abb3f4d9143c330 assets/create/models/block/copper_tile_slab_top.json
5ae6a5c2d7ab022a7df376d54c06316a9da77314 assets/create/models/block/copper_tile_stairs.json
@ -1096,6 +1122,7 @@ d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_f
a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/horizontal_framed_glass_pane_post.json
41645919ece236df5804a5a73ef682720194de34 assets/create/models/block/horizontal_framed_glass_pane_side.json
8bc0abaabdc62d0c27730dba7eb6da54607b7e96 assets/create/models/block/horizontal_framed_glass_pane_side_alt.json
07c1e1bcd87766cf324ac11ce1488856d1db86c3 assets/create/models/block/industrial_iron_block.json
35253c91ed72c7c2ce981c384d334c1113851469 assets/create/models/block/jungle_window.json
65da656d412d973865f50ab7f02e278fe5398bea assets/create/models/block/jungle_window_pane_noside.json
9f4144df2e6b35c1fad04e594be5adb3b107bdb8 assets/create/models/block/jungle_window_pane_noside_alt.json
@ -1524,6 +1551,16 @@ d257b024117a6003196c1feb85e759a3e1c180f7 assets/create/models/block/tiled_glass_
6b1727111d9178162598b4ef7106da807d590bf0 assets/create/models/block/tiled_glass_pane_side_alt.json
6b44ab14b227f3c46ee99eecfe47a86c9fb0865c assets/create/models/block/tuff_pillar.json
f0faeee9e124a25280fb58bd66045cfb2758b42e assets/create/models/block/tuff_pillar_horizontal.json
adfd211b3eb33497fad7e58de0d4784b8ce698b1 assets/create/models/block/tunnel/andesite_tunnel/cross.json
8765e95adeed03fa8203ca7a9f221392a6f038be assets/create/models/block/tunnel/andesite_tunnel/straight.json
429cd29a4c4781cf09e11c4e90451bdc61d455f6 assets/create/models/block/tunnel/andesite_tunnel/t_left.json
9c679b1033abfe4c44df69eeef60eb44efff47a2 assets/create/models/block/tunnel/andesite_tunnel/t_right.json
7cb18c3795d1481b588ce9d5dd013f45902aac47 assets/create/models/block/tunnel/andesite_tunnel/window.json
6eca538d20ccbc2974ed7c6f01dc6227d33ebc1d assets/create/models/block/tunnel/brass_tunnel/cross.json
ec2bf287791e891f85b71f97ee196002f9b03bf2 assets/create/models/block/tunnel/brass_tunnel/straight.json
37d15648b9358cb8bd4a3f20df40c36ddc07efd7 assets/create/models/block/tunnel/brass_tunnel/t_left.json
2f75336b25f5f0a008878488599e59b3e3504174 assets/create/models/block/tunnel/brass_tunnel/t_right.json
8ac0130f727696786141d7d61261072739c7f72e assets/create/models/block/tunnel/brass_tunnel/window.json
dee64127644e7b09168be26b6665389885476e05 assets/create/models/block/veridium.json
ebfad96e85ac6107642eaaf48b57315b268355ff assets/create/models/block/veridium_pillar.json
c49bb21ef60ff10540952271c863415b4ad07aa0 assets/create/models/block/veridium_pillar_horizontal.json
@ -1616,14 +1653,17 @@ c695dab3964186a857767b2b4975aebffa86dcf9 assets/create/models/item/acacia_window
564f6245f92ec48a733e34d91b96b1beebbaf44a assets/create/models/item/adjustable_chain_gearshift.json
e7759d9b3cd64d2719a58dc35fc75ca65b9e14fa assets/create/models/item/analog_lever.json
2e90c7abfcad12ca656ae253d834fbb799e15277 assets/create/models/item/andesite_alloy.json
2e7cf267efb66404721ac8bf08802de0eb134159 assets/create/models/item/andesite_alloy_block.json
946756a1a498ccd2e61b33ef317c5ec9e30afebf assets/create/models/item/andesite_bars.json
174c9705d25f149052835fdcf7c85626afead90b assets/create/models/item/andesite_casing.json
420020284d01c72a7fb3387750fe1dd2dcfb9550 assets/create/models/item/andesite_encased_cogwheel.json
6e246e91b4ebffd5c45311057feb5d26d1cb8aec assets/create/models/item/andesite_encased_large_cogwheel.json
bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_encased_shaft.json
a3866ea9f44e80b64989f2b5f8a9f344da959c87 assets/create/models/item/andesite_funnel.json
105a9946b9e4d5e949f6d557cfde750227463bff assets/create/models/item/andesite_funnel.json
4c9232a6249ad1ef51a7978a8e642a8c88dda0ab assets/create/models/item/andesite_ladder.json
75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json
795541cf7205d90531a23cd5b388f93a03bbf925 assets/create/models/item/andesite_tunnel.json
5d4616aa0ad5192f8c4029f327f1f79dd04e1e81 assets/create/models/item/andesite_scaffolding.json
473be56fe1f44809ffecbb3eb86107af3ca7a569 assets/create/models/item/andesite_tunnel.json
cc6471e712a6db7856e62a99b8ef7e378480fa27 assets/create/models/item/asurine.json
840a34731a823e185a180bef029dd16ee3f78541 assets/create/models/item/asurine_pillar.json
cf9e35bfea0b0a324e1c6384990425b3d359792c assets/create/models/item/bar_of_chocolate.json
@ -1640,18 +1680,20 @@ d537fffaede521efa525fb2a7f9863fe6a80054e assets/create/models/item/birch_window_
0e1977585128fc0ecef640f72e5fc5e9fb47ef92 assets/create/models/item/blue_seat.json
c637be1586260cf91e6da57c71c33f4515008227 assets/create/models/item/blue_toolbox.json
bec96ebf3369d3cffa9bb1b8bf9f2a5cd5d0ef96 assets/create/models/item/blue_valve_handle.json
5afa91abed387b3dfa39c39c7feae5f8f02a4bd9 assets/create/models/item/brass_bars.json
17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets/create/models/item/brass_block.json
f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets/create/models/item/brass_casing.json
099179a466a2f370dd2c4fea0d841517fa3a558b assets/create/models/item/brass_encased_cogwheel.json
6e60b5939747835b2247cbc4907d633b017abc79 assets/create/models/item/brass_encased_large_cogwheel.json
c723011e09203821b6b59cff9de22454c5e4395a assets/create/models/item/brass_encased_shaft.json
12781f22d9b91df903d38bc55c4fe9f75dba8867 assets/create/models/item/brass_funnel.json
8de90ceb9997f61efc544304fcd919a54db47d41 assets/create/models/item/brass_funnel.json
965f3f992fde899719506fd584f3fbbbf69af93c assets/create/models/item/brass_hand.json
d5e8b577aee56671e117a4a2ac93e58680b51949 assets/create/models/item/brass_ingot.json
1f93ec11bd28a3f063f27e8c53fc45d027218560 assets/create/models/item/brass_ladder.json
44565b9b2c227e99e336357e5caa588438e7076b assets/create/models/item/brass_nugget.json
713ca067a3fd88c28e78ea8c9c8442b2f85ab812 assets/create/models/item/brass_scaffolding.json
f7aca6aff65e1de269a99cf2a280d9841b7a0076 assets/create/models/item/brass_sheet.json
427bef12405e2a99fbf49e27ea5944add244252a assets/create/models/item/brass_tunnel.json
d8ee5b3cc82e5465f5c7ada88cfd444c62e3c84d assets/create/models/item/brass_tunnel.json
24df6f8391d8ba09cef46e69d65d32ea770745cd assets/create/models/item/brown_seat.json
9d66f8bdc2db7cacf52168d5a267d5f52a2b351c assets/create/models/item/brown_toolbox.json
54211d3bdbeba2ea4dbaed43daa740ae3331640f assets/create/models/item/brown_valve_handle.json
@ -1672,11 +1714,13 @@ f5f1ad973341f8bebc474d5e65ff877ac6303b0d assets/create/models/item/contraption_c
9a93b3ccef02cd0abd8106edec954dc0f2269229 assets/create/models/item/controls.json
10397036fc0bb1e18a767cfd7b19b10d805a83fe assets/create/models/item/copper_backtank.json
3652f8f7b454940050f090ab32d38e04b93e14f8 assets/create/models/item/copper_backtank_placeable.json
bd476beac53d01a51d9690e6069de4033f02d6b8 assets/create/models/item/copper_bars.json
759bcb5fe7dfdd628716f9b4ff19a5ab00393381 assets/create/models/item/copper_casing.json
16182c4c32b11b370cf5b1116250cf3dda838954 assets/create/models/item/copper_diving_boots.json
dc517e70cee9c5d74edfedd49ac43a67fe258c1b assets/create/models/item/copper_diving_helmet.json
599845f2382da5b43a3c610f6ed7a87c032e1c6a assets/create/models/item/copper_ladder.json
751324b03f657f4166460eb10a64dae47cb97bd4 assets/create/models/item/copper_nugget.json
b22b214f534b9f7308e958487e2d3270d4da16e4 assets/create/models/item/copper_scaffolding.json
177dafb51d70c55ec62036332868efed4e01f353 assets/create/models/item/copper_sheet.json
b4f378b2552ab0893a8a1a8abb71f2fcda658132 assets/create/models/item/copper_shingle_slab.json
1e67f3b28e9488091086b2ff46ae612f6c68af0e assets/create/models/item/copper_shingle_stairs.json
@ -1710,7 +1754,7 @@ cecee6daf2619dcf035c7aea5fff1bd892f6ff06 assets/create/models/item/crushed_silve
a8d3f330d312f82b0de59940581910090b2bd012 assets/create/models/item/crushed_tin_ore.json
b359064405d189e2802969715cd5f682ddbf0bb1 assets/create/models/item/crushed_uranium_ore.json
2bb791db62dce6bf2e2227f9b607c131828471fd assets/create/models/item/crushed_zinc_ore.json
823c91f63565db54ec3944a1e90e7aee18e41062 assets/create/models/item/crushing_wheel.json
f9a158bd5bbbf60310e8f3d4f10911e8baf03579 assets/create/models/item/crushing_wheel.json
dae5cffa4e1263d6a113469f79fba8695fa8232a assets/create/models/item/cuckoo_clock.json
120cb6f4fc6b28d86117dbe059b990c1303c46ee assets/create/models/item/cut_andesite.json
9c94151d18e0201e1e1967713f2ab86ebc9c647b assets/create/models/item/cut_andesite_brick_slab.json
@ -1885,12 +1929,14 @@ f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets/create/models/item/horizontal_fr
ff92f6a9dfb73a6ee1eaaed3279c89390ff04a80 assets/create/models/item/hose_pulley.json
153a185852af79654f0fb216c4b1b8e69c85ee8a assets/create/models/item/incomplete_precision_mechanism.json
d4883a5c777abb6c5235563eadb70e2b1b3de17b assets/create/models/item/incomplete_track.json
0503eda6f4c3fa320a2d59ac4a454a6f5e9cd787 assets/create/models/item/industrial_iron_block.json
9d605ce0da83a73b535bce45c107e604364e2b20 assets/create/models/item/iron_sheet.json
52e435014cb03e93411666c4799ebff206e55fc9 assets/create/models/item/item_drain.json
76ab46c9b64faf5e94391579eec5115360dff73d assets/create/models/item/item_vault.json
83fa8699318e51f838b483b40b3e897c34ed53d1 assets/create/models/item/jungle_window.json
766323f6026c3505a75db2dee2996d342370d9c2 assets/create/models/item/jungle_window_pane.json
bcaaf60d9a853cce90169dabcb36d29a3ce19e18 assets/create/models/item/large_cogwheel.json
7418fb83e9b4ad6cab8e0a28aff7f615fbfb20b4 assets/create/models/item/large_water_wheel.json
281e2b055c6eb6994ca306c8957fc80a98fb5473 assets/create/models/item/layered_andesite.json
ad814f2eef3415c44e1df73a84011fbe801a0de3 assets/create/models/item/layered_asurine.json
d188923db1e37aeac3b24ee2e6f0a4a13a794da9 assets/create/models/item/layered_calcite.json
@ -2162,7 +2208,7 @@ fb24881c4e92bbb7ffa54a71e0af6b1c66d84829 assets/create/models/item/turntable.jso
2d4a31321cc13f62f5fd73aabdc5fd97e635bfbc assets/create/models/item/wand_of_symmetry.json
89493fa0691453d6c604e3ed9ae077fe43648d18 assets/create/models/item/warped_window.json
5f169d526b4697c85e6d113be4ff81a2b45b6e6a assets/create/models/item/warped_window_pane.json
ae20383b0b0806431d0fdd8ffdd16fe2b0cc61ad assets/create/models/item/water_wheel.json
fc03f409357f75af210d3a77df588224e00a0af0 assets/create/models/item/water_wheel.json
d4be2b3cc812b5a692162c1be03744c151bdfe2d assets/create/models/item/waxed_copper_shingle_slab.json
5133884393aeb3d812d437983e0ddee84ad82c71 assets/create/models/item/waxed_copper_shingle_stairs.json
69f7261ed8967a728298ca89b1018704cf4c01d4 assets/create/models/item/waxed_copper_shingles.json
@ -2305,11 +2351,18 @@ cbe6b6d0eb188a8c0600b54cee860116d305e905 data/create/advancements/recipes/buildi
34ceb3033f5f41a5fdffeea0a3adead36748f65a data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
edb22e0bb018cf00e51f37d912939207c4bf5ac5 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
f10041d864bfb1e6f017e442ae85ee9503b3f5a4 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
d7d55d04aba6492690df1c68b75d457b0b537d2f data/create/advancements/recipes/create.base/andesite_bars_from_andesite_alloy_stonecutting.json
60608f8fff394857b8b7d3b1478b847fd20160f4 data/create/advancements/recipes/create.base/andesite_ladder_from_andesite_alloy_stonecutting.json
bc9aa565038013430adacea933fc32443e7fcdc8 data/create/advancements/recipes/create.base/andesite_scaffolding_from_andesite_alloy_stonecutting.json
ba80332510acab3f60f30d8b802ee2d450fd51b9 data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json
4bb60ef5e186f12a9d52e61319db8c78300c64ab data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_ore.json
00ff89f208cb9023d7a2657c43d267e21755fb2e data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json
ac987d22204c01642cbda1c8e3d81604741ff777 data/create/advancements/recipes/create.base/brass_bars_from_plates_brass_stonecutting.json
13ce2dba955de3b6b943fa406e3dde6863093820 data/create/advancements/recipes/create.base/brass_ladder_from_plates_brass_stonecutting.json
a039d4cb73eb870adcf0c0faa49ef89306ffc139 data/create/advancements/recipes/create.base/brass_scaffolding_from_plates_brass_stonecutting.json
d5b34cd969809370372860507c3efd3b6eac321e data/create/advancements/recipes/create.base/copper_bars_from_plates_copper_stonecutting.json
1dea56b4759da676f0edf0878ec834a4129d110b data/create/advancements/recipes/create.base/copper_ladder_from_plates_copper_stonecutting.json
9a082358daa8a0e5b91065e6fe38665f76d246b3 data/create/advancements/recipes/create.base/copper_scaffolding_from_plates_copper_stonecutting.json
19b18800dfc55508e250ebb87fbaa70510736834 data/create/advancements/recipes/create.base/copper_shingle_slab.json
0a8b2f2e35c128e470d0fd1a886b9d6ca2e99483 data/create/advancements/recipes/create.base/copper_shingle_slab_from_copper_shingles_stonecutting.json
6b066af05bef4c41a6b8fefa2cb38bcdb821eada data/create/advancements/recipes/create.base/copper_shingle_stairs.json
@ -2356,7 +2409,6 @@ bb138bedd2aec741fa54b6b52be384fdbd741249 data/create/advancements/recipes/create
a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json
5a6613ff9c493c02f70b54d6dd162948002d533b data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json
1eed818673d57a9e9c28e90a2d87b97c28f85784 data/create/advancements/recipes/create.base/crafting/kinetics/analog_lever.json
0c84fb9afd00efcdbfbee8fab7894742a723ef2b data/create/advancements/recipes/create.base/crafting/kinetics/andesite_ladder.json
3e9753006da898d4569bbeabf95997e8c90847c8 data/create/advancements/recipes/create.base/crafting/kinetics/attribute_filter.json
08b21b30437a1c6e7ba61b137f17aabb6c24acab data/create/advancements/recipes/create.base/crafting/kinetics/basin.json
de5160b4c1813b62ecc0c1955085da13f1c74d88 data/create/advancements/recipes/create.base/crafting/kinetics/belt_connector.json
@ -2416,6 +2468,7 @@ a9f2c8a0b0b322741575ef833a461006ef2f0421 data/create/advancements/recipes/create
2ccfaf572456e8642a0070ea6928a082f98c63af data/create/advancements/recipes/create.base/crafting/kinetics/item_vault.json
73433a5cd400ed392796a4e543f15c42dd499fe8 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel.json
1c9e9888ccc51ddf76b9df0c186e74efaefb1256 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json
5a1df5831fe5d2e2a6cbedcbc67216dd566e7fa0 data/create/advancements/recipes/create.base/crafting/kinetics/large_water_wheel.json
eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json
571da50fbf5f2fcd3363b3dab91e7233e0ebffa0 data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json
ddd80e84a7d595bbb3cf405a902ebbfd4ea5263c data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_valve_handle_from_other_valve_handle.json
@ -3382,6 +3435,8 @@ f92b20e0ae4c8808479df3553203c1b5e334cfe3 data/create/advancements/windmill.json
98f71c17409a37a584eed6cb6ee3878efebf3ef6 data/create/loot_tables/blocks/acacia_window_pane.json
c5c0b82ab3bcd7ffd1bcb65d00876aaba69363f9 data/create/loot_tables/blocks/adjustable_chain_gearshift.json
a4716789704bb30cf1c518b04c61661ba6289efa data/create/loot_tables/blocks/analog_lever.json
03eadc2a4695b505e92c1a688dc7af619fd364c0 data/create/loot_tables/blocks/andesite_alloy_block.json
bda9c999d5f4313fa1f22b3034a359f2d7947d64 data/create/loot_tables/blocks/andesite_bars.json
468759c042e8410da9230357f4b602766190df79 data/create/loot_tables/blocks/andesite_belt_funnel.json
f9b768b3b9bbddede80912f1319e7b290cd90f20 data/create/loot_tables/blocks/andesite_casing.json
982a41e1bccd9a130a2874aff995d4f7da0f0316 data/create/loot_tables/blocks/andesite_encased_cogwheel.json
@ -3390,6 +3445,7 @@ a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/andesite
468759c042e8410da9230357f4b602766190df79 data/create/loot_tables/blocks/andesite_funnel.json
7587038b38c8668cdaf877951366d73ac1cfb46d data/create/loot_tables/blocks/andesite_ladder.json
e03a5c4d5ff2a171290d76d8748d1b5fe6405e4a data/create/loot_tables/blocks/andesite_pillar.json
ff34b32f062b14ac7d924de33fbaaafb273c4537 data/create/loot_tables/blocks/andesite_scaffolding.json
50c317613430a3d7b303765d8272b92cd91fccc9 data/create/loot_tables/blocks/andesite_tunnel.json
15d31b6a146f5d4e2dd0fc3062f0d60a47cb2e51 data/create/loot_tables/blocks/asurine.json
d1778ef9cc3e3e67460e02b433229e3b957d37cb data/create/loot_tables/blocks/asurine_pillar.json
@ -3408,6 +3464,7 @@ be99e48382ef8ccfb94c227c4dec7b627b4128e7 data/create/loot_tables/blocks/blue_sai
d9ac8bc87a48f7deae99440f10c361f46853951e data/create/loot_tables/blocks/blue_seat.json
0e06e0aee6b00090905b1455989ed585dc22d024 data/create/loot_tables/blocks/blue_toolbox.json
f5709ddd387ac4634244f5d002122fc4e62644e2 data/create/loot_tables/blocks/blue_valve_handle.json
4d3c7a2d56fcc46e6dd86b74f1e8c918153b4d7d data/create/loot_tables/blocks/brass_bars.json
fae7b622f27b426b1d3e6f31cd0157aff672a42d data/create/loot_tables/blocks/brass_belt_funnel.json
e8535a9acc565e8d80fa4c15f0ef6c4ffd842856 data/create/loot_tables/blocks/brass_block.json
a2d433dcfe44c9a3c1b5dd16415a2f31edbe309d data/create/loot_tables/blocks/brass_casing.json
@ -3416,6 +3473,7 @@ a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/brass_en
09907573ad2602251401bc53db0e389a45d6833c data/create/loot_tables/blocks/brass_encased_shaft.json
fae7b622f27b426b1d3e6f31cd0157aff672a42d data/create/loot_tables/blocks/brass_funnel.json
b8eeab4d503cc9e43824ddd5aeeb007089780a07 data/create/loot_tables/blocks/brass_ladder.json
40a982e856eaee1b278a184eb521f7c7a15d77c9 data/create/loot_tables/blocks/brass_scaffolding.json
1081f76c85bdda3f68f9a190fb2a8dcd45b0e17c data/create/loot_tables/blocks/brass_tunnel.json
2e21a06c0d671e543bffecb0b67d97b51fa83ddc data/create/loot_tables/blocks/brown_nixie_tube.json
be99e48382ef8ccfb94c227c4dec7b627b4128e7 data/create/loot_tables/blocks/brown_sail.json
@ -3433,8 +3491,10 @@ c2b075008849e152f20e8da946e89c9722325df6 data/create/loot_tables/blocks/content_
28856dc862efc6bcc421d035d26386740458f868 data/create/loot_tables/blocks/controller_rail.json
2c2785e39e1891dff2c50cba93e814b56d935154 data/create/loot_tables/blocks/controls.json
3abf04f6132955275ad490668cd28f481afb4ec2 data/create/loot_tables/blocks/copper_backtank.json
6697e619d5c6dcb81aad4f5c88ba319d13665b35 data/create/loot_tables/blocks/copper_bars.json
8010db6b2427536c74312c85425b3ba83abc363c data/create/loot_tables/blocks/copper_casing.json
bb51540df81ea359cdc9d8a4d08ba6410ecd4919 data/create/loot_tables/blocks/copper_ladder.json
ac80fa6b1d968ddab6c3bf187a99a4cf24f30710 data/create/loot_tables/blocks/copper_scaffolding.json
31b3e00f6ab3e593a0d6abd42961b3e5e03fc888 data/create/loot_tables/blocks/copper_shingle_slab.json
485bc910ebaa9f509d15a0a4ddff50e5bf4d187c data/create/loot_tables/blocks/copper_shingle_stairs.json
dccfbda7fd3a7a75c323dea619d8d309ae980469 data/create/loot_tables/blocks/copper_shingles.json
@ -3442,6 +3502,7 @@ dccfbda7fd3a7a75c323dea619d8d309ae980469 data/create/loot_tables/blocks/copper_s
8abac40a29800a0ca18c50ec8ce346cad15ad47a data/create/loot_tables/blocks/copper_tile_stairs.json
3eddbc442b37ba3bb309eaf26c2f4ad06de40df7 data/create/loot_tables/blocks/copper_tiles.json
6430f776846393ab6d70d23faeccb3e353c66129 data/create/loot_tables/blocks/copper_valve_handle.json
5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/copycat_bars.json
5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/copycat_base.json
565441b809ded4218e69abd88bf26abee763ca08 data/create/loot_tables/blocks/copycat_panel.json
3f3df2ffc1efb1492a2a42c1eff14e5cad06b6f5 data/create/loot_tables/blocks/copycat_step.json
@ -3622,12 +3683,14 @@ f3502cb946b3997856b3a9bdb2d9f4ce01e2013a data/create/loot_tables/blocks/haunted_
c8083116de11904c1c6d53e1b869e322d18c589a data/create/loot_tables/blocks/horizontal_framed_glass.json
5f5ffb0271b312e2696493b336653b4aeeb3dca2 data/create/loot_tables/blocks/horizontal_framed_glass_pane.json
a58348cd828fb2b0f4bc116ebc14645a97ead843 data/create/loot_tables/blocks/hose_pulley.json
b9ec6580975279dcfd84a70d31e847fc0aee9d68 data/create/loot_tables/blocks/industrial_iron_block.json
feed1cd9639de957c9b34212d1c4aef2044d1e31 data/create/loot_tables/blocks/item_drain.json
af3042824de4aff38e27657ebb084077a7d4f925 data/create/loot_tables/blocks/item_vault.json
db23fee08abdb61fe2f200a5016e41523159feef data/create/loot_tables/blocks/jungle_window.json
67f7d9162d3b86e198ab7faa1ddcfdfce605d10c data/create/loot_tables/blocks/jungle_window_pane.json
7ed68e33a8c488242a2d9039797498068797c5a6 data/create/loot_tables/blocks/large_bogey.json
a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/large_cogwheel.json
9edccdfed011fdbac3a8911684b73fd029df87b4 data/create/loot_tables/blocks/large_water_wheel.json
81013913c3cc88e2390608420a2911d57414bd2c data/create/loot_tables/blocks/layered_andesite.json
a89d357d3b8d7633bffe12a4197ab19cba891005 data/create/loot_tables/blocks/layered_asurine.json
93950e03d141e59948c4aadca09ecd8b898a5276 data/create/loot_tables/blocks/layered_calcite.json
@ -3898,6 +3961,7 @@ f74bc454bda585bc5ab0b5b3e0b4d345a6ff039b data/create/loot_tables/blocks/train_tr
183444f27542a3a7ab933243b61c2714357f7361 data/create/loot_tables/blocks/warped_window.json
2fa711af9d00bd47f256fe6b0cc83a303644b1c0 data/create/loot_tables/blocks/warped_window_pane.json
e6c1f19127a3fcf010ed6fb004a40a69458c54e3 data/create/loot_tables/blocks/water_wheel.json
5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/water_wheel_structure.json
815cddd9fb217a69b3a0ac4554d830c04d0ef173 data/create/loot_tables/blocks/waxed_copper_shingle_slab.json
b28ea9be9de982b6561839c61f4a7264c8ba4171 data/create/loot_tables/blocks/waxed_copper_shingle_stairs.json
b26f12b81e4f801cc107b5c6316ad9006c5ea391 data/create/loot_tables/blocks/waxed_copper_shingles.json
@ -3945,8 +4009,11 @@ efb30e3d24a700cf35b29406ee0b5d5021545d51 data/create/loot_tables/blocks/zinc_blo
d54859b2eb9c8c06aca8a8484bc65c8e4e0bb80a data/create/loot_tables/blocks/zinc_ore.json
b65bac8bc2fbfd476040c1aab1c0588b8bd59ebe data/create/recipes/acacia_window.json
35b4da9c14da60584c32e959efc2223f64bb3ec2 data/create/recipes/acacia_window_pane.json
0616eda1784861b126017ff4617ede287ffe7c7c data/create/recipes/andesite_bars_from_andesite_alloy_stonecutting.json
388a7df4c6562e35ac0280bff786226e37f0ae45 data/create/recipes/andesite_ladder_from_andesite_alloy_stonecutting.json
dcdad7a04838ef202b42f84a15243e3d2472b14e data/create/recipes/andesite_pillar_from_andesite_stonecutting.json
b1f2f8a0f78bcd856e0352d88b6392ca6d5ed74f data/create/recipes/andesite_pillar_from_stone_types_andesite_stonecutting.json
70880972e63cf9953d2c9de0492f2f2c288c5a90 data/create/recipes/andesite_scaffolding_from_andesite_alloy_stonecutting.json
a30aa616e2b62c848dd194e319a90bf7ba3db81b data/create/recipes/asurine_pillar_from_asurine_stonecutting.json
a133d4d2542c0b9309873d06a72e7efff4cee219 data/create/recipes/asurine_pillar_from_stone_types_asurine_stonecutting.json
2b291b77860254b7ba8500cf2199a04ca1fca7b5 data/create/recipes/birch_window.json
@ -3970,7 +4037,9 @@ c49e88f38ad624a56865bb293e2b81da09ebdf37 data/create/recipes/blasting/silver_ing
70b58fa5ee4ca088f5cd9d4bce2853b1bbf98780 data/create/recipes/blasting/zinc_ingot_from_crushed.json
3b1f91669d1133bb41f2d8e129d885465cb5b30e data/create/recipes/blasting/zinc_ingot_from_ore.json
2dff1a64b2c9974b768f4861ad90a9a110bdd021 data/create/recipes/blasting/zinc_ingot_from_raw_ore.json
b8364d0d29da881dce531f053b386f2a2dd63f01 data/create/recipes/brass_bars_from_plates_brass_stonecutting.json
25af3c80132496b17d71800a43538bc34812efa3 data/create/recipes/brass_ladder_from_plates_brass_stonecutting.json
50481685e206e4cbe20e3eb7d5a9819fcaa6da0f data/create/recipes/brass_scaffolding_from_plates_brass_stonecutting.json
89cc3710a1925239030329b151f9764901a647e5 data/create/recipes/calcite_pillar_from_calcite_stonecutting.json
2cf7208bfe82b26443d41c05edd321f76a3a3df0 data/create/recipes/calcite_pillar_from_stone_types_calcite_stonecutting.json
339bcf4a9c4e7b36c15970aa671af8620703b23e data/create/recipes/campfire_cooking/bread.json
@ -3980,7 +4049,9 @@ f7879d404d7a848d818278b4e788f285a9087e63 data/create/recipes/compacting/blaze_ca
ac91109efa5a253f54257904190b80a400ec6d0c data/create/recipes/compacting/diorite_from_flint.json
7657603e95ccf83dd0d4b104635db66e531d092a data/create/recipes/compacting/granite_from_flint.json
739a1d004c4be50cda2d706a64b797f66c3ca9c8 data/create/recipes/compacting/honey.json
a079cf471ed223bdec738b4c1c7d5bedbaf6db1e data/create/recipes/copper_bars_from_plates_copper_stonecutting.json
72ae29ce953c855eb52fa48e8dbde566574a45f6 data/create/recipes/copper_ladder_from_plates_copper_stonecutting.json
1be9a5dc5c6b039da6500719e9327f8528baed88 data/create/recipes/copper_scaffolding_from_plates_copper_stonecutting.json
1a03af7f858946c395cc05714dd4d0a02206d2d4 data/create/recipes/copper_shingle_slab.json
059abbf567f7b5cf376447bdbee27285b29b7f0f data/create/recipes/copper_shingle_slab_from_copper_shingles_stonecutting.json
0d7569afe35b4bf7da05cd500d1b8d9bd78f9842 data/create/recipes/copper_shingle_stairs.json
@ -4030,7 +4101,6 @@ ab875f89a22504f3d3fd6ee2aa004d5f0082f169 data/create/recipes/crafting/curiositie
07b3ca3a3e44ee1f76c69132ffa6556e027e5b0e data/create/recipes/crafting/curiosities/toolbox_dyeing.json
4e9630bad12e6879ae7357ce7c8d455dddded9a4 data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json
88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json
8dc42e21f4d45dee83645b0cc96543bbe0ea4472 data/create/recipes/crafting/kinetics/andesite_ladder.json
cf1f3a6306d47025cebe153cf05949ef69ccbe5a data/create/recipes/crafting/kinetics/attribute_filter.json
059d12526529b2896ed583555373afa31839a0de data/create/recipes/crafting/kinetics/basin.json
dcf98e667d321fb4bd9fa6dfec7927a84cdbd5d6 data/create/recipes/crafting/kinetics/belt_connector.json
@ -4091,6 +4161,7 @@ f4fbb11ef55f3431bd387f3f6f258513bfbc8011 data/create/recipes/crafting/kinetics/i
8f7110447f039f80a6f5b1d854bc760c3d77da82 data/create/recipes/crafting/kinetics/item_vault.json
7f105694e02d4ce69a02740edfa4a0d0bc4f4eac data/create/recipes/crafting/kinetics/large_cogwheel.json
197c174c28f294b23ae6496b7a31c35e7e8b4771 data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json
5609b12dde7127965c70da2760038c456ba3cfd6 data/create/recipes/crafting/kinetics/large_water_wheel.json
0397b107ab380cd23390c96f298971a70e9bceef data/create/recipes/crafting/kinetics/light_blue_seat.json
aa06f0594e1b2d31aa41bace309ed95a16529498 data/create/recipes/crafting/kinetics/light_blue_seat_from_other_seat.json
bb8759b51aef768fa841962b9ad49676a6096a1c data/create/recipes/crafting/kinetics/light_blue_valve_handle_from_other_valve_handle.json
@ -4169,7 +4240,7 @@ c38984c432bd410261aaf6a6f30744c58481b325 data/create/recipes/crafting/kinetics/t
5e2af5ce3957d5ce4f54ceb667dcfed5cffafb32 data/create/recipes/crafting/kinetics/train_trapdoor.json
8494f5fcd85a740fa0f0384e3522d8cdd905ce49 data/create/recipes/crafting/kinetics/turntable.json
057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json
4fb009b86a51b2e259bd1f73848803f6276dd820 data/create/recipes/crafting/kinetics/water_wheel.json
152e63ade2759d01a07b9e71a3c60dfe5ea15ba8 data/create/recipes/crafting/kinetics/water_wheel.json
06b5b371ae9dd81df8fd3dee6d3559b1ed0db35c data/create/recipes/crafting/kinetics/weighted_ejector.json
f508d510576c93712e7f5265345a32e8818bbf0d data/create/recipes/crafting/kinetics/whisk.json
98546e5e5f1fe111e84c4a17569c8e7b57f8cc8d data/create/recipes/crafting/kinetics/white_sail.json
@ -5651,7 +5722,7 @@ d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/blocks/toolboxes.json
9460e92c8e483446318b849abe7e6f52dcd4a269 data/create/tags/blocks/tree_attachments.json
50936b211d94167a35ec78c89954082a336b6269 data/create/tags/blocks/valve_handles.json
eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails.json
96671fd75d4209280940ef774c4185f33610a64d data/create/tags/blocks/wrench_pickup.json
84b63dd3da12f34248474941d961b1e71837917e data/create/tags/blocks/wrench_pickup.json
a8bdc387cfa6296ebcc4af14323e2ddb632234dc data/create/tags/fluids/bottomless/allow.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/fluids/bottomless/deny.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/items/blaze_burner_fuel/regular.json
@ -5692,7 +5763,8 @@ f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped
9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/blocks/ores_in_ground/deepslate.json
d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores_in_ground/stone.json
ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/forge/tags/blocks/relocation_not_supported.json
66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/blocks/storage_blocks.json
cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/blocks/storage_blocks.json
ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/blocks/storage_blocks/andesite_alloy.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/blocks/storage_blocks/raw_zinc.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json
@ -5725,7 +5797,8 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json
d82758dd3c2972fa94736733dc6b3944129f5a11 data/forge/tags/items/plates/obsidian.json
dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials.json
dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials/zinc.json
66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/items/storage_blocks.json
cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/items/storage_blocks.json
ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/items/storage_blocks/andesite_alloy.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/items/storage_blocks/raw_zinc.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json
@ -5734,13 +5807,13 @@ cfa16b75227c9bf4f245c97ac55999b3903e5471 data/forge/tags/items/stripped_logs.jso
e002dfedc5e8762de0f97ea1f3fa546e92e748ae data/forge/tags/items/tools/wrench.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json
f5cc2ea490ede338c9ea94a5775ad626b0ebc83b data/minecraft/tags/blocks/climbable.json
ec81fd87e63a7e736440d8826c7c5e1b16b4cc67 data/minecraft/tags/blocks/climbable.json
e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/doors.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json
e2ba2b22fbda681faa4db4a32f6e15d2c7946fec data/minecraft/tags/blocks/mineable/axe.json
1c1c974423a0d5668d20ebabfe4444e7fb1fe372 data/minecraft/tags/blocks/mineable/pickaxe.json
c8e34286079476e88406e44d8002e37e0bbfd05e data/minecraft/tags/blocks/mineable/axe.json
ed5f36f823ddbef1c10a8fee0da077b77433bf54 data/minecraft/tags/blocks/mineable/pickaxe.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json
e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json
a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json

View file

@ -6,6 +6,8 @@
"block.create.acacia_window_pane": "Acacia Window Pane",
"block.create.adjustable_chain_gearshift": "Adjustable Chain Gearshift",
"block.create.analog_lever": "Analog Lever",
"block.create.andesite_alloy_block": "Block of Andesite Alloy",
"block.create.andesite_bars": "Andesite Bars",
"block.create.andesite_belt_funnel": "Andesite Belt Funnel",
"block.create.andesite_casing": "Andesite Casing",
"block.create.andesite_encased_cogwheel": "Andesite Encased Cogwheel",
@ -14,6 +16,7 @@
"block.create.andesite_funnel": "Andesite Funnel",
"block.create.andesite_ladder": "Andesite Ladder",
"block.create.andesite_pillar": "Andesite Pillar",
"block.create.andesite_scaffolding": "Andesite Scaffolding",
"block.create.andesite_tunnel": "Andesite Tunnel",
"block.create.asurine": "Asurine",
"block.create.asurine_pillar": "Asurine Pillar",
@ -32,6 +35,7 @@
"block.create.blue_seat": "Blue Seat",
"block.create.blue_toolbox": "Blue Toolbox",
"block.create.blue_valve_handle": "Blue Valve Handle",
"block.create.brass_bars": "Brass Bars",
"block.create.brass_belt_funnel": "Brass Belt Funnel",
"block.create.brass_block": "Block of Brass",
"block.create.brass_casing": "Brass Casing",
@ -40,6 +44,7 @@
"block.create.brass_encased_shaft": "Brass Encased Shaft",
"block.create.brass_funnel": "Brass Funnel",
"block.create.brass_ladder": "Brass Ladder",
"block.create.brass_scaffolding": "Brass Scaffolding",
"block.create.brass_tunnel": "Brass Tunnel",
"block.create.brown_nixie_tube": "Brown Nixie Tube",
"block.create.brown_sail": "Brown Sail",
@ -58,8 +63,10 @@
"block.create.controller_rail": "Controller Rail",
"block.create.controls": "Train Controls",
"block.create.copper_backtank": "Copper Backtank",
"block.create.copper_bars": "Copper Bars",
"block.create.copper_casing": "Copper Casing",
"block.create.copper_ladder": "Copper Ladder",
"block.create.copper_scaffolding": "Copper Scaffolding",
"block.create.copper_shingle_slab": "Copper Shingle Slab",
"block.create.copper_shingle_stairs": "Copper Shingle Stairs",
"block.create.copper_shingles": "Copper Shingles",
@ -67,6 +74,7 @@
"block.create.copper_tile_stairs": "Copper Tile Stairs",
"block.create.copper_tiles": "Copper Tiles",
"block.create.copper_valve_handle": "Copper Valve Handle",
"block.create.copycat_bars": "Copycat Bars",
"block.create.copycat_base": "Copycat Base",
"block.create.copycat_panel": "Copycat Panel",
"block.create.copycat_step": "Copycat Step",
@ -249,12 +257,14 @@
"block.create.horizontal_framed_glass": "Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane",
"block.create.hose_pulley": "Hose Pulley",
"block.create.industrial_iron_block": "Block of Industrial Iron",
"block.create.item_drain": "Item Drain",
"block.create.item_vault": "Item Vault",
"block.create.jungle_window": "Jungle Window",
"block.create.jungle_window_pane": "Jungle Window Pane",
"block.create.large_bogey": "Large Bogey",
"block.create.large_cogwheel": "Large Cogwheel",
"block.create.large_water_wheel": "Large Water Wheel",
"block.create.layered_andesite": "Layered Andesite",
"block.create.layered_asurine": "Layered Asurine",
"block.create.layered_calcite": "Layered Calcite",
@ -525,6 +535,7 @@
"block.create.warped_window": "Warped Window",
"block.create.warped_window_pane": "Warped Window Pane",
"block.create.water_wheel": "Water Wheel",
"block.create.water_wheel_structure": "Large Water Wheel",
"block.create.waxed_copper_shingle_slab": "Waxed Copper Shingle Slab",
"block.create.waxed_copper_shingle_stairs": "Waxed Copper Shingle Stairs",
"block.create.waxed_copper_shingles": "Waxed Copper Shingles",
@ -1042,6 +1053,8 @@
"create.terrainzapper.usingBlock": "Using: %1$s",
"create.terrainzapper.leftClickToSet": "Left-Click a Block to set Material",
"create.large_water_wheel.not_enough_space": "Clear Blocks for Placement",
"create.minecart_coupling.two_couplings_max": "Minecarts cannot have more than two couplings each",
"create.minecart_coupling.unloaded": "Parts of your train seem to be in unloaded chunks",
"create.minecart_coupling.no_loops": "Couplings cannot form a loop",
@ -1064,21 +1077,43 @@
"create.contraptions.roller_mode.straight_fill": "Straight Fill Below",
"create.contraptions.roller_mode.wide_fill": "Sloped Fill Below",
"create.contraptions.windmill.rotation_direction": "Rotation Direction",
"create.contraptions.clockwork.clock_hands": "Clock Hands",
"create.contraptions.clockwork.clock_hands": "Clock Hand Arrangement",
"create.contraptions.clockwork.hour_first": "Hour hand first",
"create.contraptions.clockwork.minute_first": "Minute hand first",
"create.contraptions.clockwork.hour_first_24": "24-Hour hand first",
"create.logistics.crafter.connected": "Connected Crafters",
"create.logistics.crafter.click_to_merge": "Click to merge Inventories",
"create.logistics.crafter.click_to_separate": "Click to separate Inventories",
"create.logistics.filter": "Filter",
"create.logistics.recipe_filter": "Recipe Filter",
"create.logistics.fluid_filter": "Fluid Filter",
"create.logistics.firstFrequency": "Freq. #1",
"create.logistics.secondFrequency": "Freq. #2",
"create.logistics.filter.apply": "Applied filter to %1$s.",
"create.logistics.filter.apply_click_again": "Applied filter to %1$s, click again to copy the amount.",
"create.logistics.filter.apply_count": "Applied extraction count to filter.",
"create.logistics.firstFrequency": "Frequency #1",
"create.logistics.secondFrequency": "Frequency #2",
"create.logistics.filter.click_to_set": "Click with item to set",
"create.logistics.filter.click_to_replace": "Click with item to replace",
"create.logistics.filter.hold_to_set_amount": "Click and hold for amount",
"create.logistics.filter.invalid_item": "Cannot use this item here.",
"create.logistics.filter.extracted_amount": "Extracted Amount",
"create.logistics.filter.any_amount_short": "Any",
"create.logistics.filter.up_to": "Up to",
"create.logistics.filter.exactly": "Exactly",
"create.logistics.creative_crate.supply": "Infinite Supply",
"create.logistics.train_observer.cargo_filter": "Cargo Filter",
"create.kinetics.creative_motor.rotation_speed": "Generated Speed in RPM",
"create.kinetics.speed_controller.rotation_speed": "Targeted Speed in RPM",
"create.logistics.redstone_interval": "Redstone Interval",
"create.contraptions.contoller.target": "Targeted Component",
"create.contraptions.mechanical_roller.pave_material": "Paving Material",
"create.contraptions.chassis.radius": "Radius when Sticky",
"create.contraptions.chassis.range": "Range of Sticky Sides",
"create.contraptions.chassis.distance": "Distance",
"create.gui.value_settings.hold_to_edit": "Click and hold to edit",
"create.gui.value_settings.release_to_confirm": "Release %1$s to Confirm",
"create.gui.goggles.generator_stats": "Generator Stats:",
"create.gui.goggles.kinetic_stats": "Kinetic Stats:",
"create.gui.goggles.at_current_speed": "at current speed",
@ -1369,7 +1404,7 @@
"create.weighted_ejector.targeting": "Ejecting to [%1$s,%2$s,%3$s]",
"create.weighted_ejector.stack_size": "Ejected Stack Size",
"create.logistics.when_multiple_outputs_available": "When Multiple Outputs Available",
"create.logistics.when_multiple_outputs_available": "Distribution Method",
"create.mechanical_arm.selection_mode.round_robin": "Round Robin",
"create.mechanical_arm.selection_mode.forced_round_robin": "Forced Round Robin",

View file

@ -42,10 +42,11 @@ public class RollerBlockEntity extends SmartBlockEntity {
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
behaviours.add(filtering = new FilteringBehaviour(this, new RollerValueBox(4)).moveText(new Vec3(-30, 23, 10))
.withCallback(this::onFilterChanged));
behaviours
.add(filtering = new FilteringBehaviour(this, new RollerValueBox(4)).withCallback(this::onFilterChanged));
filtering.setLabel(Lang.translateDirect("contraptions.mechanical_roller.pave_material"));
behaviours.add(mode = new ScrollOptionBehaviour<RollingMode>(RollingMode.class,
Lang.translateDirect("contraptions.roller_mode"), this, new RollerValueBox(-2)));
Lang.translateDirect("contraptions.roller_mode"), this, new RollerValueBox(-4)));
}
protected boolean onFilterChanged(ItemStack newFilter) {
@ -130,7 +131,7 @@ public class RollerBlockEntity extends SmartBlockEntity {
protected Vec3 getLocalOffset(BlockState state) {
Direction facing = state.getValue(RollerBlock.FACING);
float stateAngle = AngleHelper.horizontalAngle(facing) + 180;
return VecHelper.rotateCentered(VecHelper.voxelSpace(7.75 + hOffset, 15.5f, 11), stateAngle, Axis.Y);
return VecHelper.rotateCentered(VecHelper.voxelSpace(8 + hOffset, 15.5f, 11), stateAngle, Axis.Y);
}
}

View file

@ -124,7 +124,7 @@ public class ValueSettingsClient implements IIngameOverlay {
return;
int x = width / 2;
int y = height - 93;
int y = height - 96;
float alpha = hoverTicks > 5 ? (11 - hoverTicks) / 5f : Math.min(1, hoverTicks / 5f);
Color color = new Color(0xffffff);

View file

@ -274,11 +274,11 @@ public class FilteringBehaviour extends BlockEntityBehaviour implements ValueSet
toApply.setCount(1);
if (!setFilter(side, toApply)) {
player.displayClientMessage(Lang.translateDirect(""), true);
player.displayClientMessage(Lang.translateDirect("logistics.filter.invalid_item"), true);
AllSoundEvents.DENY.playOnServer(player.level, player.blockPosition(), 1, 1);
return;
}
level.playSound(null, pos, SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, .25f, .1f);
}

View file

@ -233,6 +233,7 @@
"create.logistics.redstone_interval": "Redstone Interval",
"create.contraptions.contoller.target": "Targeted Component",
"create.contraptions.mechanical_roller.pave_material": "Paving Material",
"create.contraptions.chassis.radius": "Radius when Sticky",
"create.contraptions.chassis.range": "Range of Sticky Sides",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB