Merge branch 'mc1.15/dev' into mc1.15/collision

README.md

@@ -1,7 +1,7 @@
 <p align="center"><img src="https://i.imgur.com/35JmqWB.gif" alt="Logo" width="100"></p>
 <h1 align="center">Create<br>
-	<a href="https://www.patreon.com/simibubi"><img src="https://img.shields.io/badge/Supporters-30-ff5733" alt="Patreon"></a>
+	<a href="https://www.patreon.com/simibubi"><img src="https://img.shields.io/badge/Supporters-29-ff5733" alt="Patreon"></a>
-	<a href="https://www.curseforge.com/minecraft/mc-mods/create/files"><img src="https://img.shields.io/badge/Available%20for-MC%201.14-c70039" alt="Supported Versions"></a>
+	<a href="https://www.curseforge.com/minecraft/mc-mods/create/files"><img src="https://img.shields.io/badge/Available%20for-MC%201.14,%201.15-c70039" alt="Supported Versions"></a>
 	<a href="https://github.com/Creators-of-Create/Create/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Creators-of-Create/Create?style=flat&color=900c3f" alt="License"></a>
 	<a href="https://discord.gg/hmaD7Se"><img src="https://img.shields.io/discord/620934202875183104?color=844685&label=Feedback%20%26%20Help&style=flat" alt="Discord"></a>
 	<a href="https://www.curseforge.com/minecraft/mc-mods/create"><img src="http://cf.way2muchnoise.eu/short_create.svg" alt="Curseforge Downloads"></a><br><br>
@@ -19,7 +19,7 @@ Check out the wiki and in-game Tool-tips for further info on how to use these fe
 [<img src="https://i.imgur.com/xj8o2xC.jpg" width="210">](https://www.patreon.com/simibubi "Support Us")
 
 - Support for Minecraft 1.12: Not planned
-- Support for Minecraft 1.15: Porting work is in Progress!
+- Support for Minecraft 1.16: Porting efforts will begin soon.
 - Support for Fabric: Not planned
 <hr>
 <h4 align="center">Find out more about Create on our <a href="https://www.curseforge.com/minecraft/mc-mods/create">Project Page</a></h4>

gradle.properties

@@ -9,7 +9,7 @@ minecraft_version=1.15.2
 forge_version=31.2.21
 
 # dependency versions
-registrate_version=0.0.3.17
+registrate_version=0.0.4.18
 jei_version=6.0.0.2
 
 # curseforge information

src/generated/resources/.cache/cache

@@ -5,26 +5,33 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets\create\blockstates\acacia_window
 79c50afcea3a360783a5b3c73de9823511e9aed9 assets\create\blockstates\adjustable_pulse_repeater.json
 1d730df54c9eae94063e37396d224fb3c87517e0 assets\create\blockstates\adjustable_repeater.json
 9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets\create\blockstates\analog_lever.json
+aaad1fc11aae17e209b0c3fbc9977c724c50c1ef assets\create\blockstates\andesite_belt_funnel.json
 585481e97c5066af63ea12fa5dd658798844d64c assets\create\blockstates\andesite_bricks.json
 4e8d61aa2c8490301317ef747f67f0169ebfc2ed assets\create\blockstates\andesite_bricks_slab.json
 da63a8be3191d6d72afef6c79e3aea3f607631f9 assets\create\blockstates\andesite_bricks_stairs.json
 a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bricks_wall.json
 9999a75c7766781eadb12510a09264600bc846e4 assets\create\blockstates\andesite_casing.json
+7074f8af642b74edc26464bb627d919516c2de0a assets\create\blockstates\andesite_chute_funnel.json
 3af4ea3c44b5ebc7e1e3fb73fb8356faf067a613 assets\create\blockstates\andesite_cobblestone.json
 97adf53a7cb99d7652fb39adc957e9e34cbaca47 assets\create\blockstates\andesite_cobblestone_slab.json
 96b5284693da168ab8e0809d86515b5f1a7e763f assets\create\blockstates\andesite_cobblestone_stairs.json
 82bd82270aff7d51e9239680ef4dd7b5c899ceb0 assets\create\blockstates\andesite_cobblestone_wall.json
+2be950008c00513dfe39021b65c26eea8554ee20 assets\create\blockstates\andesite_funnel.json
 398922758a6219544e5b85c91c9cf8a543b437e5 assets\create\blockstates\andesite_pillar.json
+a9f73f228f2cde7f707fab3467e57a9080233433 assets\create\blockstates\andesite_tunnel.json
 f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json
-96a4fae5883eda130f8ec1a57d34534f6d0793c4 assets\create\blockstates\belt.json
+39dc813be2049a42475f93d12f9f2e356139cf1b assets\create\blockstates\belt.json
 40d10934934ea142d71fc6ce598b1455c3ad47b4 assets\create\blockstates\belt_observer.json
-4325605fbdea60d5f54286c309c825bebcd74b95 assets\create\blockstates\belt_tunnel.json
 cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json
 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json
 58b07d2af6030342f0354f6d3fd0ee128d2d74b4 assets\create\blockstates\black_seat.json
 4854d1ef52130a7887aecc60bcaffbd66f0871a8 assets\create\blockstates\blue_seat.json
+fba967b1f6e44b34a9d9662e2fedfc13aad7f36c assets\create\blockstates\brass_belt_funnel.json
 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets\create\blockstates\brass_block.json
 b8dd6e505943e06706d0718ece620ab3cf943650 assets\create\blockstates\brass_casing.json
+e8583247cc7108c80320b739d7af121a890d79a8 assets\create\blockstates\brass_chute_funnel.json
+3057e1121117c0cd651c288cd8e2d46bdf64afb1 assets\create\blockstates\brass_funnel.json
+a967a349df6ca76b772abed915545abbca515c90 assets\create\blockstates\brass_tunnel.json
 e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets\create\blockstates\brown_seat.json
 26f3b6a8f8249e4e622ab200057d75e228762817 assets\create\blockstates\cart_assembler.json
 7299cea212d879d6d5611bd139b24768b9af236f assets\create\blockstates\chiseled_dark_scoria.json
@@ -33,6 +40,7 @@ e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets\create\blockstates\brown_seat.js
 2ca82a3c4bf7ba1a9cf3bb674e786d9b23b020a4 assets\create\blockstates\chiseled_limestone.json
 cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scoria.json
 291952556c52fba2af5bbd793c71af81abd27e71 assets\create\blockstates\chiseled_weathered_limestone.json
+99def0a786714a337e2b1b17db844e4d1aee6234 assets\create\blockstates\chute.json
 4947c261310445fa55b92038326ac82967d192dd assets\create\blockstates\clockwork_bearing.json
 1f33834c685e3243882acfe20183fe64dfa872be assets\create\blockstates\clutch.json
 e5e3757e99c139d67b2a70288466d8a74d818841 assets\create\blockstates\cogwheel.json
@@ -59,6 +67,7 @@ f86eea3f7df0988fffbe90e29b74141a7203cd15 assets\create\blockstates\dark_scoria_c
 f1020a33fcb1a362b6c55b5aa8ce093e47ebde09 assets\create\blockstates\dark_scoria_cobblestone_wall.json
 902778a0f16b7ad009ee7b123bb583eaea32467a assets\create\blockstates\dark_scoria_pillar.json
 ac85f55d82d96fc15750e6b954297cfd1e00d04d assets\create\blockstates\deployer.json
+3660f44309279a0347347f23ce7444c6ed98cafd assets\create\blockstates\depot.json
 c890ec9b3778aebb16c6b2eb2ca79bfbe7bf7435 assets\create\blockstates\diorite_bricks.json
 894d5ca00c3765553deaac44b83257983acf502d assets\create\blockstates\diorite_bricks_slab.json
 e42f2ebe5a2fdaeed62b9bc289252664a1e8705b assets\create\blockstates\diorite_bricks_stairs.json
@@ -123,7 +132,6 @@ b2a7c321b1795f20e7433f81a55ce4683de081b8 assets\create\blockstates\fancy_weather
 e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets\create\blockstates\flywheel.json
 ac00d40e1ef50a37041c0481afa1a23a14dea78e assets\create\blockstates\framed_glass.json
 61df7769fa61f6dd2868a4377e54320fdd473b4e assets\create\blockstates\framed_glass_pane.json
-3cc74c51eb8fc2bbe9285ad0ae640ece0a602bae assets\create\blockstates\funnel.json
 3cf49f4812732f00f578fa73785e14ffdf340f21 assets\create\blockstates\furnace_engine.json
 f512b70d7fd0ca10184f21f5bfb71c83ab11f8ef assets\create\blockstates\gabbro.json
 d2358eb3d9337741f55339f0b94b2e81d73965c8 assets\create\blockstates\gabbro_bricks.json
@@ -181,7 +189,7 @@ b7506b862d13b3f915c60d38bb7a20afc935f70a assets\create\blockstates\limestone_pil
 c793ab3aa6cf09d8d6d4136757629689f0365771 assets\create\blockstates\linked_extractor.json
 c5422866667331f1d5cf6753c0889747ee02762b assets\create\blockstates\linked_transposer.json
 84c494d24cc58af274fdd054896c680e8095d2d0 assets\create\blockstates\magenta_seat.json
-e82e69ae4c7a784ef89fc5d954b2b01946746d48 assets\create\blockstates\mechanical_arm.json
+3b3250d6e209403a93d025604a8081087965016e assets\create\blockstates\mechanical_arm.json
 ddcf4bb281e046fbb1026b8f46a2cf12448598df assets\create\blockstates\mechanical_bearing.json
 5586beef2d9183dc34d8e8d2723620c0569592ae assets\create\blockstates\mechanical_crafter.json
 044db7d50e19008bae8bf3325eac2ed0eb1ea6d2 assets\create\blockstates\mechanical_drill.json
@@ -222,6 +230,7 @@ c46f0b62967cf483ec0720a9297c8ccc97f5547d assets\create\blockstates\overgrown_and
 2398939c8be07cac0dcb7ea710eb98e74b408e0c assets\create\blockstates\overgrown_limestone.json
 fbb651b8e4a72bf0a17a6bfdbf4eef680e9d4a5c assets\create\blockstates\overgrown_scoria.json
 9c8e210bdb29b2ab1535a25762498d7c03156444 assets\create\blockstates\overgrown_weathered_limestone.json
+5ab323fefdbfff04aa5c224bf5f0237f0598b3b2 assets\create\blockstates\packager.json
 ab93ff18b747607dbc1d8d7311a2737e302b92d1 assets\create\blockstates\paved_andesite.json
 89e88a0d2e7df66bac7ab11ac2c7b14812d8675f assets\create\blockstates\paved_andesite_slab.json
 f43d947077b3f4a11a9729c58709c56f09859da0 assets\create\blockstates\paved_andesite_stairs.json
@@ -326,7 +335,6 @@ a8094531617e27a545c4815ab2062bf0ffca3633 assets\create\blockstates\turntable.jso
 d45450255fd7a64cfd2bd8856fd4cff01a49cc8d assets\create\blockstates\vertical_extractor.json
 69dfe8afaa8eb6105dae9f76ab8b7847bf90b8c6 assets\create\blockstates\vertical_framed_glass.json
 c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets\create\blockstates\vertical_framed_glass_pane.json
-3ecf6ddcf6d31a04b98e1d9a46a1db04278041d9 assets\create\blockstates\vertical_funnel.json
 0ecc57db2487ed6b370b9cc43d2a873c61d7c37e assets\create\blockstates\vertical_linked_extractor.json
 751b99625aca1b4122a0333bfaf93325d37eb003 assets\create\blockstates\vertical_linked_transposer.json
 02199afb5b6ebcbc8e11567df05f39eface39e39 assets\create\blockstates\vertical_transposer.json
@@ -345,8 +353,17 @@ c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets\create\blockstates\weathered_lim
 a3a11524cd3515fc01d905767b4b7ea782adaf03 assets\create\blockstates\yellow_seat.json
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json
-237cff4ba13aa7ab9a8c7b98e04d028195b420ab assets\create\lang\en_ud.json
+a3ab099f56df07f3ffcedceb30d1bf31b6bb9f9a assets\create\lang\en_ud.json
-147611124c17a338cf9a0869086391723ff8ab67 assets\create\lang\en_us.json
+34fdfd3138c647dfbfc691c1806dc556e98441dd assets\create\lang\en_us.json
+224278e010e3c2bd9c3e3b351d6403af88d14630 assets\create\lang\unfinished\de_de.json
+ecbd3680c894786a564aa02748cbb901c3bcfbd6 assets\create\lang\unfinished\fr_fr.json
+e11ffd52f43f14e4ba49608a7183b84928b8ea68 assets\create\lang\unfinished\it_it.json
+a7302b0c727c53254ffe5f93d7cc139b83268e0e assets\create\lang\unfinished\ja_jp.json
+4d82492bbd359d97e51d7e87e0fb9ca653c91d75 assets\create\lang\unfinished\ko_kr.json
+107933935edab7e6a90195114dd91a51e645fd9d assets\create\lang\unfinished\nl_nl.json
+1529beab7a5971239bcb6b0b8f219da4bd61b60b assets\create\lang\unfinished\pt_br.json
+a999e6fd8ff0fb35c725792fa274205fcdbc39f9 assets\create\lang\unfinished\ru_ru.json
+2b1a05ce5ec43658e974749a53c2f0d8b103f54b assets\create\lang\unfinished\zh_cn.json
 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json
 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json
 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json
@@ -369,6 +386,10 @@ cda6f9761431c5b8538f746db2dc55e5fb57bf01 assets\create\models\block\adjustable_p
 ce5e0cd1598cf2228bb77a68c304dd210f3848f8 assets\create\models\block\adjustable_repeater_powered.json
 c82a31943f5adb4a64c6db4c48c94cbce5d95bc4 assets\create\models\block\adjustable_repeater_powered_powering.json
 51cf61f8bc25cf62b0e0c0705c75512809358ff0 assets\create\models\block\adjustable_repeater_powering.json
+e4af27010c74bb5b1e79b6fccf1669526e1bb5e3 assets\create\models\block\andesite_belt_funnel_pull_extended.json
+502916dc860e5ba971af51c640192b5ac02e574f assets\create\models\block\andesite_belt_funnel_pull_retracted.json
+f1ba5c40d5e580d3c46d2eeab37b59263d0b0904 assets\create\models\block\andesite_belt_funnel_push_extended.json
+5689f01354dcb8bf1547467c7c5b86468f962bce assets\create\models\block\andesite_belt_funnel_push_retracted.json
 4d412de3eb98dfee548a0dcdbae5d0168ac67123 assets\create\models\block\andesite_bricks.json
 054ef3fff7f146dbf8adc92dc2b6d169c2bdb7a5 assets\create\models\block\andesite_bricks_slab.json
 8784414839f6a5786bf43d6a7dff6c27bdf7fe46 assets\create\models\block\andesite_bricks_slab_top.json
@@ -378,6 +399,8 @@ c82a31943f5adb4a64c6db4c48c94cbce5d95bc4 assets\create\models\block\adjustable_r
 f0a955282f7abd5ce0b412ec7b59024113ca970a assets\create\models\block\andesite_bricks_wall_post.json
 0ed2fa65af49b5c92c4e5c688c155e37d3d6b118 assets\create\models\block\andesite_bricks_wall_side.json
 b9943c5585fc081385ea49a4199efeb6c7c22423 assets\create\models\block\andesite_casing.json
+d89f1a04622290303729479ce5e19768f296a297 assets\create\models\block\andesite_chute_funnel_pull.json
+911cd82e8716a076a7760534de845f60db3534fb assets\create\models\block\andesite_chute_funnel_push.json
 77a045e855eb37d2da7ed8f7d27a85b9546c0ab8 assets\create\models\block\andesite_cobblestone.json
 7d816d54c85bc7d0cc8db9c68abcba960daa7b43 assets\create\models\block\andesite_cobblestone_slab.json
 5179ecd1f926bf3211a1a3f033dfd1d2368eeb20 assets\create\models\block\andesite_cobblestone_slab_top.json
@@ -386,7 +409,15 @@ ad255a62a5f54b578db06e89fd7160001f905675 assets\create\models\block\andesite_cob
 a033fbac3129bba9211c6c4a0e16c905643afa39 assets\create\models\block\andesite_cobblestone_stairs_outer.json
 1c574ee47aeb6fcb305bfc95dd131e153b795a0e assets\create\models\block\andesite_cobblestone_wall_post.json
 0ed983628e8868f77301bea1111570d3631f24fb assets\create\models\block\andesite_cobblestone_wall_side.json
+9febbf6fb88e726a89573c3788bd8348ba805b6d assets\create\models\block\andesite_funnel.json
 b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets\create\models\block\andesite_pillar.json
+01ad35140f53b2c7d3c36ce148629351ab91412b assets\create\models\block\andesite_tunnel\cross.json
+cdfd39b052f0f606abfd34d9330d536d7f0f1281 assets\create\models\block\andesite_tunnel\fullshade.json
+4425b48e65cc855cee37abd6c7ec1356c703e87c assets\create\models\block\andesite_tunnel\halfshade.json
+1ee32dacef1840d526579ac93560f85869053e6d assets\create\models\block\andesite_tunnel\straight.json
+4cf6628da4d000ef84497781853f8df31ac91d93 assets\create\models\block\andesite_tunnel\t_left.json
+fc94e50b17588232db29f917e90f9659e36ec967 assets\create\models\block\andesite_tunnel\t_right.json
+1405be1d4ca1aeced9a287f0d1fca5ba3cc722d2 assets\create\models\block\andesite_tunnel\window.json
 e8bfb63e0a4426f9d95cd111640169b218dead1b assets\create\models\block\belt_observer\detect.json
 a2e63810eceb028484b193ddf4315e1811950dc8 assets\create\models\block\belt_observer\detect_belt.json
 034c308d46def892e6638ac0b3374849a6a88a26 assets\create\models\block\belt_observer\detect_belt_powered.json
@@ -411,8 +442,29 @@ fa79580db6187c864bc8148a41987ecdd1eb03b7 assets\create\models\block\belt_observe
 95d4230eb366f5e7684820c9337e3956ed34042a assets\create\models\block\birch_window_pane_side_alt.json
 97d79ab99c0fb278a9b5dc54e1c6563868f87b76 assets\create\models\block\black_seat.json
 e58b00a7222152d7facbe0e82f00933b974df747 assets\create\models\block\blue_seat.json
+7f2ed408fb662a23a75c29398e75bb9deff4c2b5 assets\create\models\block\brass_belt_funnel_pull_extended.json
+242c9972e2dc70671ffef4de15a31a74b800fcb4 assets\create\models\block\brass_belt_funnel_pull_powered_extended.json
+3f88752bbf2d4d635cfadb9c7217035a74ff78e3 assets\create\models\block\brass_belt_funnel_pull_powered_retracted.json
+da2ae304a1b1e02b1ce03cd0205be66d824e16d6 assets\create\models\block\brass_belt_funnel_pull_retracted.json
+91ba57aded6f4a99208a8812650f454b1a44fe8b assets\create\models\block\brass_belt_funnel_push_extended.json
+ee79efc65b05d953784b00e573d37602629eb9e8 assets\create\models\block\brass_belt_funnel_push_powered_extended.json
+1231141717d6609f0e3c282996b1739a2c790e0c assets\create\models\block\brass_belt_funnel_push_powered_retracted.json
+253e88f2c11006abdc87156dd409ed3944bb7295 assets\create\models\block\brass_belt_funnel_push_retracted.json
 0934933df6bfbb19a1b14cd0e3cab2c18d5a3ebc assets\create\models\block\brass_block.json
 166a5c053a81e6aadc24509ed24dc144a7255969 assets\create\models\block\brass_casing.json
+8c42d09a18fb17fe846365138d0f0d58c6a3c05e assets\create\models\block\brass_chute_funnel_pull.json
+7b3d2865ee7611940af017161aaabc7cb107225d assets\create\models\block\brass_chute_funnel_pull_powered.json
+78122dd0f7b65bd071974030682fa484c31d7ba2 assets\create\models\block\brass_chute_funnel_push.json
+7edf6b5c95f61071d8a9243a63e786765d6104a3 assets\create\models\block\brass_chute_funnel_push_powered.json
+6c617fc504cb2259263d24fc56c4735e455aac6d assets\create\models\block\brass_funnel.json
+2f152b82291b7fc994191b1ffb8ec6d65aec748b assets\create\models\block\brass_funnel_powered.json
+eed69194b5b53e285d39bf2d794e67300497bf6f assets\create\models\block\brass_tunnel\cross.json
+06efb094dd1ca296614d2a15c74d2aca63503b97 assets\create\models\block\brass_tunnel\fullshade.json
+da066edd238414610a14fd092f7e06705d36fd9e assets\create\models\block\brass_tunnel\halfshade.json
+77fc3e676e25d84d88dc2b452b2263b366a408f6 assets\create\models\block\brass_tunnel\straight.json
+11bfe6b44bbf5f5af88295317f20a91dbf6ebfcd assets\create\models\block\brass_tunnel\t_left.json
+fb1a38ee7e4a58711f2f2d90edc13c8a5aedd31c assets\create\models\block\brass_tunnel\t_right.json
+67d96d75e9c2b3d9e0c781c514efb85486fce0ad assets\create\models\block\brass_tunnel\window.json
 4eed0ad902f5e84f2b6c160f3283e8028640e77d assets\create\models\block\brown_seat.json
 028a07b49c05fe8a93f1d8c229d81e73d887c2df assets\create\models\block\chiseled_dark_scoria.json
 b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets\create\models\block\chiseled_dolomite.json
@@ -969,21 +1021,24 @@ d283f86cd05ed378efd82ce46cf49bc83783069b assets\create\models\item\andesite_bric
 1ceb0e49f2c46f1d5414d5fd6edfc2bdd3afa6f7 assets\create\models\item\andesite_cobblestone_slab.json
 b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets\create\models\item\andesite_cobblestone_stairs.json
 4856d13a72ec0af9f10226b4a4bf0567eb580b9a assets\create\models\item\andesite_cobblestone_wall.json
+0a9f5f6d552813029474dbbfa31e8443ed91adcd assets\create\models\item\andesite_funnel.json
 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets\create\models\item\andesite_pillar.json
+5889a1d445c576dc23cef8ab42c76f1d6cc4bfd3 assets\create\models\item\andesite_tunnel.json
 bf1fc6bdf7fca6f1958a2d3e96202c1cecb50669 assets\create\models\item\basin.json
 1da382e7e58eaa9788f5b1d92221ccac573e068f assets\create\models\item\belt_connector.json
 695a69d5854e2eb134b55d855bd2b7b18808a01d assets\create\models\item\belt_observer.json
-5006164d5bdb17cc5ec9759d7cdaf218e2b45f04 assets\create\models\item\belt_tunnel.json
 9044243882cfd49a2827e1b910a4c9b0e46daa47 assets\create\models\item\birch_window.json
 6ed49f59ea91068ef68720f43e67a9237594bdf0 assets\create\models\item\birch_window_pane.json
 22632bd681c8a605f0845f7549770389a741156a assets\create\models\item\black_seat.json
 0e1977585128fc0ecef640f72e5fc5e9fb47ef92 assets\create\models\item\blue_seat.json
 17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets\create\models\item\brass_block.json
 f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets\create\models\item\brass_casing.json
+ab045c951352806c3f632dda7b71573f93f60ac4 assets\create\models\item\brass_funnel.json
 361f75a79de5007d7a99ad0a38103c9aa8c3017c assets\create\models\item\brass_hand.json
 1786bdffa2ab5a07c88d2797db3d7b54461323c4 assets\create\models\item\brass_ingot.json
 a37be4a0ec9bf6c381527403c57ced4f81abd67c assets\create\models\item\brass_nugget.json
 14ea6ee4db6e7e76446e331a70b6b6bec31e8eb7 assets\create\models\item\brass_sheet.json
+7b231b9401ff151fa6b0e1361b64774b3a2051cf assets\create\models\item\brass_tunnel.json
 24df6f8391d8ba09cef46e69d65d32ea770745cd assets\create\models\item\brown_seat.json
 3e232a103f7f916fc11edb4d541ca99fe7b44181 assets\create\models\item\cart_assembler.json
 99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets\create\models\item\chiseled_dark_scoria.json
@@ -992,6 +1047,7 @@ afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets\create\models\item\chiseled_gabb
 0cb1692f6cdd007ac690fd1f0222dde3429d136f assets\create\models\item\chiseled_limestone.json
 a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets\create\models\item\chiseled_scoria.json
 70232ce9b88119fb383717e2c1ad113f7aad6a99 assets\create\models\item\chiseled_weathered_limestone.json
+fe67c3f380d17735a9436a4579a8be1a02b8e4a0 assets\create\models\item\chute.json
 b1531a7bd3f7f27b9587d13e818a93dc2d088bc8 assets\create\models\item\clockwork_bearing.json
 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets\create\models\item\clutch.json
 dcb09deae110077bcddf090996b51cc66e9a7de3 assets\create\models\item\cogwheel.json
@@ -1027,6 +1083,7 @@ e67fe11e9036c81f0f54d368b41a971822a84a32 assets\create\models\item\dark_scoria_c
 f5b2995929ac9dca9857d4618660ffa7778d5618 assets\create\models\item\dark_scoria_pillar.json
 f06f56ffb1cd7c9a2b81c65f7796726692e5cc59 assets\create\models\item\deforester.json
 2104c1276259ab67b94f3d4fe97e14b6bc6941ac assets\create\models\item\deployer.json
+84d87f715efab45dc7bcb2e3c0870ed56fa20ee9 assets\create\models\item\depot.json
 a97ca9b6fc3e10a9c9409b27458a852222045e4e assets\create\models\item\diorite_bricks.json
 7a28bb619d37a37ed82509d2ff395d76b4435961 assets\create\models\item\diorite_bricks_slab.json
 920804b7380cca2c477d9f901e045597234246d7 assets\create\models\item\diorite_bricks_stairs.json
@@ -1095,7 +1152,6 @@ e5e6fb6eb182b85b977e1025a7fe84d46de59320 assets\create\models\item\fluid_pipe.js
 8707332c0cb6ee123e7962d08536a60725c64ce8 assets\create\models\item\flywheel.json
 d62b93d3c274d280f3eec22a28b5175943411d25 assets\create\models\item\framed_glass.json
 1041d462c6e856f7f3f2365c299c0599703d1ed7 assets\create\models\item\framed_glass_pane.json
-2dc08da54182756cd3520f1420d0506ab50063e1 assets\create\models\item\funnel.json
 0bee2855dc9bad52e941153b87e9c35797c246ee assets\create\models\item\furnace_engine.json
 090edb6a728fc3803e870d647c7c4e826faadca0 assets\create\models\item\furnace_minecart_contraption.json
 2c1608c114ccc285a84e936dc3f1233c535e1a26 assets\create\models\item\gabbro.json
@@ -1200,6 +1256,7 @@ e34c7bbdd4fcaa3a73c61584418bb159db49758b assets\create\models\item\overgrown_gra
 e73e4be7e7eafdf9635a3d72eb7fa05c2bc1e54b assets\create\models\item\overgrown_limestone.json
 a64a649428a2e130059f3f1f8de81b907621589f assets\create\models\item\overgrown_scoria.json
 3354b93677c87bfc82807503c8d658fc6ab114e2 assets\create\models\item\overgrown_weathered_limestone.json
+15baa926f7208040c437c920ae0c159a06057073 assets\create\models\item\packager.json
 014530344c8b7e53531e3c09095b6ed4839d5ab8 assets\create\models\item\paved_andesite.json
 bd81aa53b83c2f9683c024989d0305807cf28f5a assets\create\models\item\paved_andesite_slab.json
 c61f409eb1a24cf76017b677579cb0423a1951c6 assets\create\models\item\paved_andesite_stairs.json
@@ -1356,10 +1413,12 @@ e4e3c1bd7ecf501b40cffc26d8ad145ab4e89118 data\create\advancements\deployer.json
 62f3610188f7dbd3900ab305edc2d06282705a38 data\create\advancements\goggles.json
 7e12b7ccb198ef0db7964b8cbef152d8347e333c data\create\advancements\its_alive.json
 3d0fc63191ef507a018ef996ebf9406a523f3976 data\create\advancements\lava_wheel.json
+90393cdb6b699c9c0fd4dd9400159c3aa6911a6b data\create\advancements\mechanical_arm.json
 786c2058805ceca3cd3970cc6e918560b54747f5 data\create\advancements\mechanical_drill.json
 41444ae151ce90d2d68dcda0ed3565f98509c594 data\create\advancements\mechanical_saw.json
 9c7f0c2484a84ccf42166704475fafcb1f232ce6 data\create\advancements\millstone.json
 704c7fc0ed357b1a116ffdc0b6c64fe64e337a5a data\create\advancements\mixer.json
+8085b46ca0dd8c511841cabd88e51bff4baceefd data\create\advancements\musical_arm.json
 a135eec618e448f440d9f42cc7a3e6c63fc45a71 data\create\advancements\overstressed.json
 72025d8bf73ab8096c29f12d0c8d9a346f09cd64 data\create\advancements\polished_rose_quartz.json
 1e3cd82e36fd4bcd053d652a0eead4458ed7f315 data\create\advancements\press.json
@@ -1758,26 +1817,33 @@ fe37896bb804d2be9b8abf3744c5b9b7bc1c086e data\create\advancements\wand_of_symmet
 417da41ebd0520ae22ddc3541eb490daf2af95dd data\create\loot_tables\blocks\adjustable_pulse_repeater.json
 d0ba402852cea164f6d279a9b37cc38ac3958574 data\create\loot_tables\blocks\adjustable_repeater.json
 0d139e302f4a11438b0acd664c0df15b41040f69 data\create\loot_tables\blocks\analog_lever.json
+d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_belt_funnel.json
 1d04146c468ce4bf898b596c171b3ba3146d7d66 data\create\loot_tables\blocks\andesite_bricks.json
 b67ea51eaed1e847317829636cbf5967522e73d1 data\create\loot_tables\blocks\andesite_bricks_slab.json
 0ba4528089294c5229e1904dc3191f604138cf8e data\create\loot_tables\blocks\andesite_bricks_stairs.json
 db2d27969cb53d9489e7c7e4bf60864fa89b29f4 data\create\loot_tables\blocks\andesite_bricks_wall.json
 cb36b039a511aca643fe674a63de8d6ad8478256 data\create\loot_tables\blocks\andesite_casing.json
+d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_chute_funnel.json
 906155b0d00438e695d34dd14b374d94e691460d data\create\loot_tables\blocks\andesite_cobblestone.json
 6d2f1bd619b131803d5bc9e393a2c67e03c39ff6 data\create\loot_tables\blocks\andesite_cobblestone_slab.json
 6b5393dab7d443da6d54debccbc8b060c6c9bdc7 data\create\loot_tables\blocks\andesite_cobblestone_stairs.json
 36d38c085d8e522fe15f0ef9bc64363e163f3de7 data\create\loot_tables\blocks\andesite_cobblestone_wall.json
+d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_funnel.json
 6908f62c809ea2105bc92765d84d5655197346ab data\create\loot_tables\blocks\andesite_pillar.json
+317aa99086127c649981b7b2fc85e66774a30f58 data\create\loot_tables\blocks\andesite_tunnel.json
 14bf1764b9313893b6a6f57094f9506ac9fa71a8 data\create\loot_tables\blocks\basin.json
 c7f81e30c31837a287d6d6040cdb02c7dec11441 data\create\loot_tables\blocks\belt.json
 1104e323abb2a8c25769c47dc5d1154965113cc9 data\create\loot_tables\blocks\belt_observer.json
-f2acadb49cac3aa6347cae606536cbbde89f0a5f data\create\loot_tables\blocks\belt_tunnel.json
 67a8e2513c3cb09e6fe80279fda94f79d5018c37 data\create\loot_tables\blocks\birch_window.json
 bf1d5843f93533f84bc4adec5b77da2114fa2025 data\create\loot_tables\blocks\birch_window_pane.json
 cccc209d172cc7bac76f1b4ac79085ee90742ab2 data\create\loot_tables\blocks\black_seat.json
 3834f7ac2bbc42cead02d4973842adb9ad97e6bf data\create\loot_tables\blocks\blue_seat.json
+1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_belt_funnel.json
 70d9d4def43d5b31fa7cdc5ca5002c71cf4a90b0 data\create\loot_tables\blocks\brass_block.json
 8a14258ad5d79d9e4dc5a318905644b446196420 data\create\loot_tables\blocks\brass_casing.json
+1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_chute_funnel.json
+1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_funnel.json
+6c8e784677d1a843b6c707484c79751acdb46ebc data\create\loot_tables\blocks\brass_tunnel.json
 d415862a0abe20e8c5c2c8125bb672065330a9bc data\create\loot_tables\blocks\brown_seat.json
 0be542fef3bc0e1a0d556883568a1400a8b97df1 data\create\loot_tables\blocks\cart_assembler.json
 ab820bbaaf67c6697dfbab33c05fb73b18c70bfb data\create\loot_tables\blocks\chiseled_dark_scoria.json
@@ -1786,6 +1852,7 @@ ab820bbaaf67c6697dfbab33c05fb73b18c70bfb data\create\loot_tables\blocks\chiseled
 4b09725707bac4c5813e2bb489ff848d0d964ae9 data\create\loot_tables\blocks\chiseled_limestone.json
 43f446abd3c1c184a08645979edf620e59955a30 data\create\loot_tables\blocks\chiseled_scoria.json
 adde89e46b12de1eee6fd0c5cb98c5f45feefc15 data\create\loot_tables\blocks\chiseled_weathered_limestone.json
+07ccc1576a71338cb73c4e06f8c28a2c86843877 data\create\loot_tables\blocks\chute.json
 778b53c36d73b6e9c78fd6c091c9c3535c3c18f7 data\create\loot_tables\blocks\clockwork_bearing.json
 d76113310fc56eca6382d44df174096f2210d416 data\create\loot_tables\blocks\clutch.json
 673ba3a5deae9133b917d16c9eb87fe4c2873c8a data\create\loot_tables\blocks\cogwheel.json
@@ -1812,6 +1879,7 @@ ef1beeb856cb30d381fd4f1cb4d2bf62fc444e52 data\create\loot_tables\blocks\dark_sco
 76457f3ec7c2d3874866ce8eb894f7bd9cfd59ee data\create\loot_tables\blocks\dark_scoria_cobblestone_wall.json
 be851f6643d151ed464e4164bc2b7ca145e5ff82 data\create\loot_tables\blocks\dark_scoria_pillar.json
 cf9be747e10a98f3f3aabb95c9753f39d806f73b data\create\loot_tables\blocks\deployer.json
+5b46f6003bfe393b43ea0447fffcf7ae3bf969b1 data\create\loot_tables\blocks\depot.json
 5c8ca846c3fb348fea628035e1670208e386516b data\create\loot_tables\blocks\diorite_bricks.json
 427fea1465652db87a2c192934511b972ecfcedf data\create\loot_tables\blocks\diorite_bricks_slab.json
 bdaba62199f7a65e1149b742aaaf0c23a1e149b0 data\create\loot_tables\blocks\diorite_bricks_stairs.json
@@ -1876,7 +1944,6 @@ c8aa9bbed8fd703eb1853de0b7c9e04dffb7a511 data\create\loot_tables\blocks\fluid_pi
 f37526c092c645045c22674dea6c7b1ec503c9c3 data\create\loot_tables\blocks\flywheel.json
 ce0bb978b11935bc2d1218445f8ab18099af6b8a data\create\loot_tables\blocks\framed_glass.json
 89bd90ecd7a1ce1f75bd873989cc58a84c8dcef9 data\create\loot_tables\blocks\framed_glass_pane.json
-ed895ef7dcb97ad9b00d80a4fa9c331229dd532e data\create\loot_tables\blocks\funnel.json
 4063880eda871fe63a4eb549a19daecabce849e5 data\create\loot_tables\blocks\furnace_engine.json
 1070cba1c0f46cf7ebe31089f35333f5eadda6e4 data\create\loot_tables\blocks\gabbro.json
 0356e003d8890d31b89d0ad98e32aae892da71f9 data\create\loot_tables\blocks\gabbro_bricks.json
@@ -1941,7 +2008,7 @@ dee1e06d953c0ca4e37799aee9073fdd43a3dc76 data\create\loot_tables\blocks\mechanic
 95fa2d3e9cf4aacc42617b1f5ddbf25eeb025770 data\create\loot_tables\blocks\mechanical_harvester.json
 b12efeeef5682966016ce6ea2d171eecd33d9667 data\create\loot_tables\blocks\mechanical_mixer.json
 2599be757a55464af338ef0a01e3772690d7eaf8 data\create\loot_tables\blocks\mechanical_piston.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\mechanical_piston_head.json
+1087b6c6d88dc7c71ed81e1d3e180fe065e6d098 data\create\loot_tables\blocks\mechanical_piston_head.json
 d9e217fcc668a04ee495968f8ccf9966271b6cea data\create\loot_tables\blocks\mechanical_plough.json
 0e0742d066bda87ba5cc835a4028efb99e70b2f2 data\create\loot_tables\blocks\mechanical_press.json
 e94a78187bcf7f235244b2c656732ba9a5821dd0 data\create\loot_tables\blocks\mechanical_pump.json
@@ -1975,6 +2042,7 @@ bab9f6fb35f2ba4aa45fd726a8e94f90ef155bfb data\create\loot_tables\blocks\overgrow
 4b4acf9026d68de21b5804903556a505f913a778 data\create\loot_tables\blocks\overgrown_limestone.json
 e0fc59a8645dae8f87e62b34c08014077e14de66 data\create\loot_tables\blocks\overgrown_scoria.json
 8af10a6b2d07ed1b84ce617502ad68044262e701 data\create\loot_tables\blocks\overgrown_weathered_limestone.json
+131cb27de9d0b44d2ec335055558b8039d6d5fb9 data\create\loot_tables\blocks\packager.json
 fc529ec8d55abf361ba1b8c38875839530b082c6 data\create\loot_tables\blocks\paved_andesite.json
 3658337cb8a5a6cdd7dd19dd8ac399b1397350d5 data\create\loot_tables\blocks\paved_andesite_slab.json
 4dbc7c7537e680e4e7c8a5ba4e4ed394d788b10d data\create\loot_tables\blocks\paved_andesite_stairs.json
@@ -2079,7 +2147,6 @@ b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\transpos
 5a47c1535c866184b4ffca65763f5676f319e0aa data\create\loot_tables\blocks\vertical_extractor.json
 028e293b5cd694017962f67dc80dba719f904e28 data\create\loot_tables\blocks\vertical_framed_glass.json
 d0156602dd5f4a274c293df67e19374820c72890 data\create\loot_tables\blocks\vertical_framed_glass_pane.json
-ed895ef7dcb97ad9b00d80a4fa9c331229dd532e data\create\loot_tables\blocks\vertical_funnel.json
 dac789cf53b00eed34308848b5e267b7ccec090c data\create\loot_tables\blocks\vertical_linked_extractor.json
 7af5a13c9e10903b11732fbc01ae3299328216f0 data\create\loot_tables\blocks\vertical_linked_transposer.json
 b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\vertical_transposer.json
@@ -2474,6 +2541,8 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data\create\recipes\weathered_limestone
 6eceb25fabbb6b389ca35de3b829ad061c9c456a data\create\recipes\weathered_limestone_pillar.json
 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data\create\recipes\weathered_limestone_pillar_from_weathered_limestone_stonecutting.json
 266f08e604d229a9d2b46f7272c0b06ec270bf3d data\create\recipes\zinc_block.json
+403576ae5710d4fe731144fe623b1673093076ea data\create\tags\blocks\brittle.json
+081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data\create\tags\items\create_ingots.json
 d2dc4ff179ef7b2aa9276455c196e15d44aa95a8 data\create\tags\items\crushed_ores.json
 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data\forge\tags\blocks\glass\colorless.json
 81ced867d24ec814942909965dd4576eff1db685 data\forge\tags\blocks\glass_panes.json
@@ -2482,16 +2551,21 @@ d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\blocks\ores\zinc.json
 ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data\forge\tags\blocks\storage_blocks\brass.json
 f6c8f34ceb475546dba5cc6ff288863ea795d20b data\forge\tags\blocks\storage_blocks\copper.json
 7f71a774800111e50b42de0e6159ed2d2a807d32 data\forge\tags\blocks\storage_blocks\zinc.json
+d9ffc62a496946fc4848934e7c0a6e917337f8be data\forge\tags\items\beacon_payment.json
+05ca51cdc60a5e109b5a0e3b782de13d34ebcb24 data\forge\tags\items\cobblestone.json
 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data\forge\tags\items\glass\colorless.json
 81ced867d24ec814942909965dd4576eff1db685 data\forge\tags\items\glass_panes.json
+d9ffc62a496946fc4848934e7c0a6e917337f8be data\forge\tags\items\ingots.json
 2dfd21017cb51d4bdc18d977a7d16f103cc3a985 data\forge\tags\items\ingots\brass.json
 8e0ca32df10a50544f54fbe3dbfe485971b23315 data\forge\tags\items\ingots\copper.json
 2f9ac80569a5cc168061742f9e3c36277d4d056e data\forge\tags\items\ingots\zinc.json
+bcf15289cbadd429a48bd9accb4d2d5f75353a61 data\forge\tags\items\nuggets.json
 cc82188fe8d986f4457301ed4f75ae833d263601 data\forge\tags\items\nuggets\brass.json
 7affb30e30a252566a77467994b0c99331f1076c data\forge\tags\items\nuggets\copper.json
 0d8cb5092ee6ec01ea09324c80d649ba05549799 data\forge\tags\items\nuggets\zinc.json
 4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data\forge\tags\items\ores\copper.json
 d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\items\ores\zinc.json
+5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data\forge\tags\items\plates.json
 39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data\forge\tags\items\plates\brass.json
 c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data\forge\tags\items\plates\copper.json
 fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data\forge\tags\items\plates\gold.json

src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json

@@ -0,0 +1,64 @@
+{
+  "variants": {
+    "facing=north,pushing=false,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_pull_retracted"
+    },
+    "facing=south,pushing=false,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_pull_retracted",
+      "y": 180
+    },
+    "facing=west,pushing=false,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_pull_retracted",
+      "y": 270
+    },
+    "facing=east,pushing=false,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_pull_retracted",
+      "y": 90
+    },
+    "facing=north,pushing=true,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_push_retracted"
+    },
+    "facing=south,pushing=true,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_push_retracted",
+      "y": 180
+    },
+    "facing=west,pushing=true,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_push_retracted",
+      "y": 270
+    },
+    "facing=east,pushing=true,shape=retracted": {
+      "model": "create:block/andesite_belt_funnel_push_retracted",
+      "y": 90
+    },
+    "facing=north,pushing=false,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_pull_extended"
+    },
+    "facing=south,pushing=false,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_pull_extended",
+      "y": 180
+    },
+    "facing=west,pushing=false,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_pull_extended",
+      "y": 270
+    },
+    "facing=east,pushing=false,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_pull_extended",
+      "y": 90
+    },
+    "facing=north,pushing=true,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_push_extended"
+    },
+    "facing=south,pushing=true,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_push_extended",
+      "y": 180
+    },
+    "facing=west,pushing=true,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_push_extended",
+      "y": 270
+    },
+    "facing=east,pushing=true,shape=extended": {
+      "model": "create:block/andesite_belt_funnel_push_extended",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/andesite_chute_funnel.json

@@ -0,0 +1,34 @@
+{
+  "variants": {
+    "facing=north,pushing=false": {
+      "model": "create:block/andesite_chute_funnel_pull"
+    },
+    "facing=south,pushing=false": {
+      "model": "create:block/andesite_chute_funnel_pull",
+      "y": 180
+    },
+    "facing=west,pushing=false": {
+      "model": "create:block/andesite_chute_funnel_pull",
+      "y": 270
+    },
+    "facing=east,pushing=false": {
+      "model": "create:block/andesite_chute_funnel_pull",
+      "y": 90
+    },
+    "facing=north,pushing=true": {
+      "model": "create:block/andesite_chute_funnel_push"
+    },
+    "facing=south,pushing=true": {
+      "model": "create:block/andesite_chute_funnel_push",
+      "y": 180
+    },
+    "facing=west,pushing=true": {
+      "model": "create:block/andesite_chute_funnel_push",
+      "y": 270
+    },
+    "facing=east,pushing=true": {
+      "model": "create:block/andesite_chute_funnel_push",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/andesite_funnel.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/andesite_funnel",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/andesite_funnel"
+    },
+    "facing=north": {
+      "model": "create:block/andesite_funnel",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/andesite_funnel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/andesite_funnel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/andesite_funnel",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/andesite_tunnel.json

@@ -0,0 +1,53 @@
+{
+  "variants": {
+    "axis=x,shape=straight": {
+      "model": "create:block/andesite_tunnel/straight"
+    },
+    "axis=z,shape=straight": {
+      "model": "create:block/andesite_tunnel/straight",
+      "y": 90
+    },
+    "axis=x,shape=window": {
+      "model": "create:block/andesite_tunnel/window"
+    },
+    "axis=z,shape=window": {
+      "model": "create:block/andesite_tunnel/window",
+      "y": 90
+    },
+    "axis=x,shape=halfshade": {
+      "model": "create:block/andesite_tunnel/halfshade"
+    },
+    "axis=z,shape=halfshade": {
+      "model": "create:block/andesite_tunnel/halfshade",
+      "y": 90
+    },
+    "axis=x,shape=fullshade": {
+      "model": "create:block/andesite_tunnel/fullshade"
+    },
+    "axis=z,shape=fullshade": {
+      "model": "create:block/andesite_tunnel/fullshade",
+      "y": 90
+    },
+    "axis=x,shape=t_left": {
+      "model": "create:block/andesite_tunnel/t_left"
+    },
+    "axis=z,shape=t_left": {
+      "model": "create:block/andesite_tunnel/t_left",
+      "y": 90
+    },
+    "axis=x,shape=t_right": {
+      "model": "create:block/andesite_tunnel/t_right"
+    },
+    "axis=z,shape=t_right": {
+      "model": "create:block/andesite_tunnel/t_right",
+      "y": 90
+    },
+    "axis=x,shape=cross": {
+      "model": "create:block/andesite_tunnel/cross"
+    },
+    "axis=z,shape=cross": {
+      "model": "create:block/andesite_tunnel/cross",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/belt.json

@@ -125,7 +125,7 @@
       "y": 180
     },
     "casing=true,facing=north,part=start,slope=upward": {
-      "model": "create:block/belt_casing/diagonal_end"
+      "model": "create:block/belt_casing/diagonal_start"
     },
     "casing=false,facing=south,part=start,slope=upward": {
       "model": "create:block/belt/upward_start"
@@ -147,7 +147,7 @@
       "y": 270
     },
     "casing=true,facing=east,part=start,slope=upward": {
-      "model": "create:block/belt_casing/diagonal_end",
+      "model": "create:block/belt_casing/diagonal_start",
       "y": 90
     },
     "casing=false,facing=north,part=middle,slope=upward": {
@@ -185,7 +185,7 @@
       "y": 180
     },
     "casing=true,facing=north,part=end,slope=upward": {
-      "model": "create:block/belt_casing/diagonal_start"
+      "model": "create:block/belt_casing/diagonal_end"
     },
     "casing=false,facing=south,part=end,slope=upward": {
       "model": "create:block/belt/upward_end"
@@ -207,7 +207,7 @@
       "y": 270
     },
     "casing=true,facing=east,part=end,slope=upward": {
-      "model": "create:block/belt_casing/diagonal_start",
+      "model": "create:block/belt_casing/diagonal_end",
       "y": 90
     },
     "casing=false,facing=north,part=pulley,slope=upward": {
@@ -252,14 +252,14 @@
       "model": "create:block/belt/downward_start"
     },
     "casing=true,facing=south,part=start,slope=downward": {
-      "model": "create:block/belt_casing/diagonal_start"
+      "model": "create:block/belt_casing/diagonal_end"
     },
     "casing=false,facing=west,part=start,slope=downward": {
       "model": "create:block/belt/downward_start",
       "y": 90
     },
     "casing=true,facing=west,part=start,slope=downward": {
-      "model": "create:block/belt_casing/diagonal_start",
+      "model": "create:block/belt_casing/diagonal_end",
       "y": 90
     },
     "casing=false,facing=east,part=start,slope=downward": {
@@ -312,14 +312,14 @@
       "model": "create:block/belt/downward_end"
     },
     "casing=true,facing=south,part=end,slope=downward": {
-      "model": "create:block/belt_casing/diagonal_end"
+      "model": "create:block/belt_casing/diagonal_start"
     },
     "casing=false,facing=west,part=end,slope=downward": {
       "model": "create:block/belt/downward_end",
       "y": 90
     },
     "casing=true,facing=west,part=end,slope=downward": {
-      "model": "create:block/belt_casing/diagonal_end",
+      "model": "create:block/belt_casing/diagonal_start",
       "y": 90
     },
     "casing=false,facing=east,part=end,slope=downward": {
@@ -366,17 +366,18 @@
       "y": 180
     },
     "casing=true,facing=north,part=start,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_start",
+      "model": "create:block/belt_casing/sideways_end",
       "x": 90,
-      "y": 180
+      "y": 270
     },
     "casing=false,facing=south,part=start,slope=vertical": {
       "model": "create:block/belt/horizontal_start",
       "x": 90
     },
     "casing=true,facing=south,part=start,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_start",
+      "model": "create:block/belt_casing/sideways_start",
-      "x": 90
+      "x": 90,
+      "y": 90
     },
     "casing=false,facing=west,part=start,slope=vertical": {
       "model": "create:block/belt/horizontal_end",
@@ -384,9 +385,9 @@
       "y": 90
     },
     "casing=true,facing=west,part=start,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_start",
+      "model": "create:block/belt_casing/sideways_end",
       "x": 90,
-      "y": 90
+      "y": 180
     },
     "casing=false,facing=east,part=start,slope=vertical": {
       "model": "create:block/belt/horizontal_start",
@@ -394,9 +395,8 @@
       "y": 270
     },
     "casing=true,facing=east,part=start,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_start",
+      "model": "create:block/belt_casing/sideways_start",
-      "x": 90,
+      "x": 90
-      "y": 270
     },
     "casing=false,facing=north,part=middle,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -404,17 +404,18 @@
       "y": 180
     },
     "casing=true,facing=north,part=middle,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_middle",
+      "model": "create:block/belt_casing/sideways_middle",
       "x": 90,
-      "y": 180
+      "y": 270
     },
     "casing=false,facing=south,part=middle,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
       "x": 90
     },
     "casing=true,facing=south,part=middle,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_middle",
+      "model": "create:block/belt_casing/sideways_middle",
-      "x": 90
+      "x": 90,
+      "y": 90
     },
     "casing=false,facing=west,part=middle,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -422,9 +423,9 @@
       "y": 90
     },
     "casing=true,facing=west,part=middle,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_middle",
+      "model": "create:block/belt_casing/sideways_middle",
       "x": 90,
-      "y": 90
+      "y": 180
     },
     "casing=false,facing=east,part=middle,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -432,9 +433,8 @@
       "y": 270
     },
     "casing=true,facing=east,part=middle,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_middle",
+      "model": "create:block/belt_casing/sideways_middle",
-      "x": 90,
+      "x": 90
-      "y": 270
     },
     "casing=false,facing=north,part=end,slope=vertical": {
       "model": "create:block/belt/horizontal_start",
@@ -442,17 +442,18 @@
       "y": 180
     },
     "casing=true,facing=north,part=end,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_end",
+      "model": "create:block/belt_casing/sideways_start",
       "x": 90,
-      "y": 180
+      "y": 270
     },
     "casing=false,facing=south,part=end,slope=vertical": {
       "model": "create:block/belt/horizontal_end",
       "x": 90
     },
     "casing=true,facing=south,part=end,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_end",
+      "model": "create:block/belt_casing/sideways_end",
-      "x": 90
+      "x": 90,
+      "y": 90
     },
     "casing=false,facing=west,part=end,slope=vertical": {
       "model": "create:block/belt/horizontal_start",
@@ -460,9 +461,9 @@
       "y": 90
     },
     "casing=true,facing=west,part=end,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_end",
+      "model": "create:block/belt_casing/sideways_start",
       "x": 90,
-      "y": 90
+      "y": 180
     },
     "casing=false,facing=east,part=end,slope=vertical": {
       "model": "create:block/belt/horizontal_end",
@@ -470,9 +471,8 @@
       "y": 270
     },
     "casing=true,facing=east,part=end,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_end",
+      "model": "create:block/belt_casing/sideways_end",
-      "x": 90,
+      "x": 90
-      "y": 270
     },
     "casing=false,facing=north,part=pulley,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -480,17 +480,18 @@
       "y": 180
     },
     "casing=true,facing=north,part=pulley,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_pulley",
+      "model": "create:block/belt_casing/sideways_pulley",
       "x": 90,
-      "y": 180
+      "y": 270
     },
     "casing=false,facing=south,part=pulley,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
       "x": 90
     },
     "casing=true,facing=south,part=pulley,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_pulley",
+      "model": "create:block/belt_casing/sideways_pulley",
-      "x": 90
+      "x": 90,
+      "y": 90
     },
     "casing=false,facing=west,part=pulley,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -498,9 +499,9 @@
       "y": 90
     },
     "casing=true,facing=west,part=pulley,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_pulley",
+      "model": "create:block/belt_casing/sideways_pulley",
       "x": 90,
-      "y": 90
+      "y": 180
     },
     "casing=false,facing=east,part=pulley,slope=vertical": {
       "model": "create:block/belt/horizontal_middle",
@@ -508,8 +509,143 @@
       "y": 270
     },
     "casing=true,facing=east,part=pulley,slope=vertical": {
-      "model": "create:block/belt_casing/vertical_pulley",
+      "model": "create:block/belt_casing/sideways_pulley",
-      "x": 90,
+      "x": 90
+    },
+    "casing=false,facing=north,part=start,slope=sideways": {
+      "model": "create:block/belt/sideways_end",
+      "x": 180,
+      "y": 180
+    },
+    "casing=true,facing=north,part=start,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_end",
+      "x": 180,
+      "y": 180
+    },
+    "casing=false,facing=south,part=start,slope=sideways": {
+      "model": "create:block/belt/sideways_start"
+    },
+    "casing=true,facing=south,part=start,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_start"
+    },
+    "casing=false,facing=west,part=start,slope=sideways": {
+      "model": "create:block/belt/sideways_end",
+      "x": 180,
+      "y": 90
+    },
+    "casing=true,facing=west,part=start,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_end",
+      "x": 180,
+      "y": 90
+    },
+    "casing=false,facing=east,part=start,slope=sideways": {
+      "model": "create:block/belt/sideways_start",
+      "y": 270
+    },
+    "casing=true,facing=east,part=start,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_start",
+      "y": 270
+    },
+    "casing=false,facing=north,part=middle,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "x": 180,
+      "y": 180
+    },
+    "casing=true,facing=north,part=middle,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_middle",
+      "x": 180,
+      "y": 180
+    },
+    "casing=false,facing=south,part=middle,slope=sideways": {
+      "model": "create:block/belt/sideways_middle"
+    },
+    "casing=true,facing=south,part=middle,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_middle"
+    },
+    "casing=false,facing=west,part=middle,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "x": 180,
+      "y": 90
+    },
+    "casing=true,facing=west,part=middle,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_middle",
+      "x": 180,
+      "y": 90
+    },
+    "casing=false,facing=east,part=middle,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "y": 270
+    },
+    "casing=true,facing=east,part=middle,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_middle",
+      "y": 270
+    },
+    "casing=false,facing=north,part=end,slope=sideways": {
+      "model": "create:block/belt/sideways_start",
+      "x": 180,
+      "y": 180
+    },
+    "casing=true,facing=north,part=end,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_start",
+      "x": 180,
+      "y": 180
+    },
+    "casing=false,facing=south,part=end,slope=sideways": {
+      "model": "create:block/belt/sideways_end"
+    },
+    "casing=true,facing=south,part=end,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_end"
+    },
+    "casing=false,facing=west,part=end,slope=sideways": {
+      "model": "create:block/belt/sideways_start",
+      "x": 180,
+      "y": 90
+    },
+    "casing=true,facing=west,part=end,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_start",
+      "x": 180,
+      "y": 90
+    },
+    "casing=false,facing=east,part=end,slope=sideways": {
+      "model": "create:block/belt/sideways_end",
+      "y": 270
+    },
+    "casing=true,facing=east,part=end,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_end",
+      "y": 270
+    },
+    "casing=false,facing=north,part=pulley,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "x": 180,
+      "y": 180
+    },
+    "casing=true,facing=north,part=pulley,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_pulley",
+      "x": 180,
+      "y": 180
+    },
+    "casing=false,facing=south,part=pulley,slope=sideways": {
+      "model": "create:block/belt/sideways_middle"
+    },
+    "casing=true,facing=south,part=pulley,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_pulley"
+    },
+    "casing=false,facing=west,part=pulley,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "x": 180,
+      "y": 90
+    },
+    "casing=true,facing=west,part=pulley,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_pulley",
+      "x": 180,
+      "y": 90
+    },
+    "casing=false,facing=east,part=pulley,slope=sideways": {
+      "model": "create:block/belt/sideways_middle",
+      "y": 270
+    },
+    "casing=true,facing=east,part=pulley,slope=sideways": {
+      "model": "create:block/belt_casing/sideways_pulley",
       "y": 270
     }
   }

src/generated/resources/assets/create/blockstates/belt_tunnel.json

@@ -1,53 +0,0 @@
-{
-  "variants": {
-    "axis=x,shape=straight": {
-      "model": "create:block/belt_tunnel/straight"
-    },
-    "axis=z,shape=straight": {
-      "model": "create:block/belt_tunnel/straight",
-      "y": 90
-    },
-    "axis=x,shape=window": {
-      "model": "create:block/belt_tunnel/window"
-    },
-    "axis=z,shape=window": {
-      "model": "create:block/belt_tunnel/window",
-      "y": 90
-    },
-    "axis=x,shape=halfshade": {
-      "model": "create:block/belt_tunnel/halfshade"
-    },
-    "axis=z,shape=halfshade": {
-      "model": "create:block/belt_tunnel/halfshade",
-      "y": 90
-    },
-    "axis=x,shape=fullshade": {
-      "model": "create:block/belt_tunnel/fullshade"
-    },
-    "axis=z,shape=fullshade": {
-      "model": "create:block/belt_tunnel/fullshade",
-      "y": 90
-    },
-    "axis=x,shape=t_left": {
-      "model": "create:block/belt_tunnel/t_left"
-    },
-    "axis=z,shape=t_left": {
-      "model": "create:block/belt_tunnel/t_left",
-      "y": 90
-    },
-    "axis=x,shape=t_right": {
-      "model": "create:block/belt_tunnel/t_right"
-    },
-    "axis=z,shape=t_right": {
-      "model": "create:block/belt_tunnel/t_right",
-      "y": 90
-    },
-    "axis=x,shape=cross": {
-      "model": "create:block/belt_tunnel/cross"
-    },
-    "axis=z,shape=cross": {
-      "model": "create:block/belt_tunnel/cross",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/create/blockstates/brass_belt_funnel.json

@@ -0,0 +1,124 @@
+{
+  "variants": {
+    "facing=north,powered=false,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_retracted"
+    },
+    "facing=south,powered=false,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_retracted",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_retracted",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_retracted",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_powered_retracted"
+    },
+    "facing=south,powered=true,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_powered_retracted",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_powered_retracted",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=false,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_pull_powered_retracted",
+      "y": 90
+    },
+    "facing=north,powered=false,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_retracted"
+    },
+    "facing=south,powered=false,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_retracted",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_retracted",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_retracted",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_powered_retracted"
+    },
+    "facing=south,powered=true,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_powered_retracted",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_powered_retracted",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=true,shape=retracted": {
+      "model": "create:block/brass_belt_funnel_push_powered_retracted",
+      "y": 90
+    },
+    "facing=north,powered=false,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_extended"
+    },
+    "facing=south,powered=false,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_extended",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_extended",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_extended",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_powered_extended"
+    },
+    "facing=south,powered=true,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_powered_extended",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_powered_extended",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=false,shape=extended": {
+      "model": "create:block/brass_belt_funnel_pull_powered_extended",
+      "y": 90
+    },
+    "facing=north,powered=false,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_extended"
+    },
+    "facing=south,powered=false,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_extended",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_extended",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_extended",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_powered_extended"
+    },
+    "facing=south,powered=true,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_powered_extended",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_powered_extended",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=true,shape=extended": {
+      "model": "create:block/brass_belt_funnel_push_powered_extended",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/brass_chute_funnel.json

@@ -0,0 +1,64 @@
+{
+  "variants": {
+    "facing=north,powered=false,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull"
+    },
+    "facing=south,powered=false,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull_powered"
+    },
+    "facing=south,powered=true,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull_powered",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull_powered",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=false": {
+      "model": "create:block/brass_chute_funnel_pull_powered",
+      "y": 90
+    },
+    "facing=north,powered=false,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push"
+    },
+    "facing=south,powered=false,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push",
+      "y": 180
+    },
+    "facing=west,powered=false,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push",
+      "y": 270
+    },
+    "facing=east,powered=false,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push",
+      "y": 90
+    },
+    "facing=north,powered=true,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push_powered"
+    },
+    "facing=south,powered=true,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push_powered",
+      "y": 180
+    },
+    "facing=west,powered=true,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push_powered",
+      "y": 270
+    },
+    "facing=east,powered=true,pushing=true": {
+      "model": "create:block/brass_chute_funnel_push_powered",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/brass_funnel.json

@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,powered=false": {
+      "model": "create:block/brass_funnel",
+      "x": 180
+    },
+    "facing=up,powered=false": {
+      "model": "create:block/brass_funnel"
+    },
+    "facing=north,powered=false": {
+      "model": "create:block/brass_funnel",
+      "x": 90
+    },
+    "facing=south,powered=false": {
+      "model": "create:block/brass_funnel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west,powered=false": {
+      "model": "create:block/brass_funnel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east,powered=false": {
+      "model": "create:block/brass_funnel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=down,powered=true": {
+      "model": "create:block/brass_funnel_powered",
+      "x": 180
+    },
+    "facing=up,powered=true": {
+      "model": "create:block/brass_funnel_powered"
+    },
+    "facing=north,powered=true": {
+      "model": "create:block/brass_funnel_powered",
+      "x": 90
+    },
+    "facing=south,powered=true": {
+      "model": "create:block/brass_funnel_powered",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west,powered=true": {
+      "model": "create:block/brass_funnel_powered",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east,powered=true": {
+      "model": "create:block/brass_funnel_powered",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/brass_tunnel.json

@@ -0,0 +1,53 @@
+{
+  "variants": {
+    "axis=x,shape=straight": {
+      "model": "create:block/brass_tunnel/straight"
+    },
+    "axis=z,shape=straight": {
+      "model": "create:block/brass_tunnel/straight",
+      "y": 90
+    },
+    "axis=x,shape=window": {
+      "model": "create:block/brass_tunnel/window"
+    },
+    "axis=z,shape=window": {
+      "model": "create:block/brass_tunnel/window",
+      "y": 90
+    },
+    "axis=x,shape=halfshade": {
+      "model": "create:block/brass_tunnel/halfshade"
+    },
+    "axis=z,shape=halfshade": {
+      "model": "create:block/brass_tunnel/halfshade",
+      "y": 90
+    },
+    "axis=x,shape=fullshade": {
+      "model": "create:block/brass_tunnel/fullshade"
+    },
+    "axis=z,shape=fullshade": {
+      "model": "create:block/brass_tunnel/fullshade",
+      "y": 90
+    },
+    "axis=x,shape=t_left": {
+      "model": "create:block/brass_tunnel/t_left"
+    },
+    "axis=z,shape=t_left": {
+      "model": "create:block/brass_tunnel/t_left",
+      "y": 90
+    },
+    "axis=x,shape=t_right": {
+      "model": "create:block/brass_tunnel/t_right"
+    },
+    "axis=z,shape=t_right": {
+      "model": "create:block/brass_tunnel/t_right",
+      "y": 90
+    },
+    "axis=x,shape=cross": {
+      "model": "create:block/brass_tunnel/cross"
+    },
+    "axis=z,shape=cross": {
+      "model": "create:block/brass_tunnel/cross",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/chute.json

@@ -0,0 +1,58 @@
+{
+  "variants": {
+    "facing=down,shape=start": {
+      "model": "create:block/chute/block_windowed"
+    },
+    "facing=north,shape=start": {
+      "model": "create:block/chute/block_diagonal_start",
+      "y": 180
+    },
+    "facing=south,shape=start": {
+      "model": "create:block/chute/block_diagonal_start"
+    },
+    "facing=west,shape=start": {
+      "model": "create:block/chute/block_diagonal_start",
+      "y": 90
+    },
+    "facing=east,shape=start": {
+      "model": "create:block/chute/block_diagonal_start",
+      "y": 270
+    },
+    "facing=down,shape=window_straight": {
+      "model": "create:block/chute/block_windowed"
+    },
+    "facing=north,shape=window_straight": {
+      "model": "create:block/chute/block_diagonal_straight",
+      "y": 180
+    },
+    "facing=south,shape=window_straight": {
+      "model": "create:block/chute/block_diagonal_straight"
+    },
+    "facing=west,shape=window_straight": {
+      "model": "create:block/chute/block_diagonal_straight",
+      "y": 90
+    },
+    "facing=east,shape=window_straight": {
+      "model": "create:block/chute/block_diagonal_straight",
+      "y": 270
+    },
+    "facing=down,shape=normal": {
+      "model": "create:block/chute/block"
+    },
+    "facing=north,shape=normal": {
+      "model": "create:block/chute/block_diagonal",
+      "y": 180
+    },
+    "facing=south,shape=normal": {
+      "model": "create:block/chute/block_diagonal"
+    },
+    "facing=west,shape=normal": {
+      "model": "create:block/chute/block_diagonal",
+      "y": 90
+    },
+    "facing=east,shape=normal": {
+      "model": "create:block/chute/block_diagonal",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/depot.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "create:block/depot/block"
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/funnel.json

@@ -1,34 +0,0 @@
-{
-  "variants": {
-    "belt=false,facing=north": {
-      "model": "create:block/funnel/horizontal"
-    },
-    "belt=true,facing=north": {
-      "model": "create:block/funnel/horizontal_belt"
-    },
-    "belt=false,facing=south": {
-      "model": "create:block/funnel/horizontal",
-      "y": 180
-    },
-    "belt=true,facing=south": {
-      "model": "create:block/funnel/horizontal_belt",
-      "y": 180
-    },
-    "belt=false,facing=west": {
-      "model": "create:block/funnel/horizontal",
-      "y": 270
-    },
-    "belt=true,facing=west": {
-      "model": "create:block/funnel/horizontal_belt",
-      "y": 270
-    },
-    "belt=false,facing=east": {
-      "model": "create:block/funnel/horizontal",
-      "y": 90
-    },
-    "belt=true,facing=east": {
-      "model": "create:block/funnel/horizontal_belt",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/create/blockstates/mechanical_arm.json

@@ -1,7 +1,11 @@
 {
   "variants": {
-    "": {
+    "ceiling=false": {
       "model": "create:block/mechanical_arm/block"
+    },
+    "ceiling=true": {
+      "model": "create:block/mechanical_arm/block",
+      "x": 180
     }
   }
 }

src/generated/resources/assets/create/blockstates/packager.json

@@ -0,0 +1,11 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "create:block/packager/block",
+      "y": 90
+    },
+    "axis=z": {
+      "model": "create:block/packager/block"
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/vertical_funnel.json

@@ -1,42 +0,0 @@
-{
-  "variants": {
-    "facing=north,upward=false": {
-      "model": "create:block/funnel/vertical",
-      "x": 90,
-      "y": 180
-    },
-    "facing=south,upward=false": {
-      "model": "create:block/funnel/vertical",
-      "x": 90
-    },
-    "facing=west,upward=false": {
-      "model": "create:block/funnel/vertical",
-      "x": 90,
-      "y": 90
-    },
-    "facing=east,upward=false": {
-      "model": "create:block/funnel/vertical",
-      "x": 90,
-      "y": 270
-    },
-    "facing=north,upward=true": {
-      "model": "create:block/funnel/vertical",
-      "x": 270
-    },
-    "facing=south,upward=true": {
-      "model": "create:block/funnel/vertical",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,upward=true": {
-      "model": "create:block/funnel/vertical",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,upward=true": {
-      "model": "create:block/funnel/vertical",
-      "x": 270,
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/create/lang/en_ud.json

@@ -6,26 +6,33 @@
   "block.create.adjustable_pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F",
   "block.create.adjustable_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F",
   "block.create.analog_lever": "\u0279\u01DD\u028C\u01DD\uA780 bo\u05DF\u0250u\u2C6F",
+  "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_casing": "bu\u0131s\u0250\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
+  "block.create.andesite_chute_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287n\u0265\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_cobblestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
+  "block.create.andesite_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.andesite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
+  "block.create.andesite_tunnel": "\u05DF\u01DDuun\u27D8 \u01DD\u0287\u0131s\u01DDpu\u2C6F",
   "block.create.basin": "u\u0131s\u0250\u15FA",
   "block.create.belt": "\u0287\u05DF\u01DD\u15FA",
   "block.create.belt_observer": "\u0279\u01DD\u028C\u0279\u01DDsqO \u0287\u05DF\u01DD\u15FA",
-  "block.create.belt_tunnel": "\u05DF\u01DDuun\u27D8 \u0287\u05DF\u01DD\u15FA",
   "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA",
   "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA",
   "block.create.black_seat": "\u0287\u0250\u01DDS \u029E\u0254\u0250\u05DF\u15FA",
   "block.create.blue_seat": "\u0287\u0250\u01DDS \u01DDn\u05DF\u15FA",
+  "block.create.brass_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA ss\u0250\u0279\u15FA",
   "block.create.brass_block": "\u029E\u0254o\u05DF\u15FA ss\u0250\u0279\u15FA",
   "block.create.brass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u0279\u15FA",
+  "block.create.brass_chute_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287n\u0265\u0186 ss\u0250\u0279\u15FA",
+  "block.create.brass_funnel": "\u05DF\u01DDuun\u2132 ss\u0250\u0279\u15FA",
+  "block.create.brass_tunnel": "\u05DF\u01DDuun\u27D8 ss\u0250\u0279\u15FA",
   "block.create.brown_seat": "\u0287\u0250\u01DDS u\u028Do\u0279\u15FA",
   "block.create.cart_assembler": "\u0279\u01DD\u05DFq\u026F\u01DDss\u2C6F \u0287\u0279\u0250\u0186",
   "block.create.chiseled_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
@@ -34,6 +41,7 @@
   "block.create.chiseled_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
   "block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
   "block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
+  "block.create.chute": "\u01DD\u0287n\u0265\u0186",
   "block.create.clockwork_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186",
   "block.create.clutch": "\u0265\u0254\u0287n\u05DF\u0186",
   "block.create.cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186",
@@ -60,6 +68,7 @@
   "block.create.dark_scoria_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1",
   "block.create.dark_scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1",
   "block.create.deployer": "\u0279\u01DD\u028Eo\u05DFd\u01DD\u15E1",
+  "block.create.depot": "\u0287od\u01DD\u15E1",
   "block.create.diorite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1",
   "block.create.diorite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1",
   "block.create.diorite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1",
@@ -124,7 +133,6 @@
   "block.create.flywheel": "\u05DF\u01DD\u01DD\u0265\u028D\u028E\u05DF\u2132",
   "block.create.framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132",
   "block.create.framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132",
-  "block.create.funnel": "\u05DF\u01DDuun\u2132",
   "block.create.furnace_engine": "\u01DDu\u0131bu\u018E \u01DD\u0254\u0250u\u0279n\u2132",
   "block.create.gabbro": "o\u0279qq\u0250\u2141",
   "block.create.gabbro_bricks": "s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141",
@@ -223,6 +231,7 @@
   "block.create.overgrown_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 u\u028Do\u0279b\u0279\u01DD\u028CO",
   "block.create.overgrown_scoria": "\u0250\u0131\u0279o\u0254S u\u028Do\u0279b\u0279\u01DD\u028CO",
   "block.create.overgrown_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM u\u028Do\u0279b\u0279\u01DD\u028CO",
+  "block.create.packager": "\u0279\u01DDb\u0250\u029E\u0254\u0250\u0500",
   "block.create.paved_andesite": "\u01DD\u0287\u0131s\u01DDpu\u2C6F p\u01DD\u028C\u0250\u0500",
   "block.create.paved_andesite_slab": "q\u0250\u05DFS \u01DD\u0287\u0131s\u01DDpu\u2C6F p\u01DD\u028C\u0250\u0500",
   "block.create.paved_andesite_stairs": "s\u0279\u0131\u0250\u0287S \u01DD\u0287\u0131s\u01DDpu\u2C6F p\u01DD\u028C\u0250\u0500",
@@ -327,7 +336,6 @@
   "block.create.vertical_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
   "block.create.vertical_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
   "block.create.vertical_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
-  "block.create.vertical_funnel": "\u05DF\u01DDuun\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
   "block.create.vertical_linked_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
   "block.create.vertical_linked_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",
   "block.create.vertical_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B",

src/generated/resources/assets/create/lang/en_us.json

@@ -9,26 +9,33 @@
 	"block.create.adjustable_pulse_repeater": "Adjustable Pulse Repeater",
 	"block.create.adjustable_repeater": "Adjustable Repeater",
 	"block.create.analog_lever": "Analog Lever",
+	"block.create.andesite_belt_funnel": "Andesite Belt Funnel",
 	"block.create.andesite_bricks": "Andesite Bricks",
 	"block.create.andesite_bricks_slab": "Andesite Bricks Slab",
 	"block.create.andesite_bricks_stairs": "Andesite Bricks Stairs",
 	"block.create.andesite_bricks_wall": "Andesite Bricks Wall",
 	"block.create.andesite_casing": "Andesite Casing",
+	"block.create.andesite_chute_funnel": "Andesite Chute Funnel",
 	"block.create.andesite_cobblestone": "Andesite Cobblestone",
 	"block.create.andesite_cobblestone_slab": "Andesite Cobblestone Slab",
 	"block.create.andesite_cobblestone_stairs": "Andesite Cobblestone Stairs",
 	"block.create.andesite_cobblestone_wall": "Andesite Cobblestone Wall",
+	"block.create.andesite_funnel": "Andesite Funnel",
 	"block.create.andesite_pillar": "Andesite Pillar",
+	"block.create.andesite_tunnel": "Andesite Tunnel",
 	"block.create.basin": "Basin",
 	"block.create.belt": "Belt",
 	"block.create.belt_observer": "Belt Observer",
-	"block.create.belt_tunnel": "Belt Tunnel",
 	"block.create.birch_window": "Birch Window",
 	"block.create.birch_window_pane": "Birch Window Pane",
 	"block.create.black_seat": "Black Seat",
 	"block.create.blue_seat": "Blue Seat",
+	"block.create.brass_belt_funnel": "Brass Belt Funnel",
 	"block.create.brass_block": "Brass Block",
 	"block.create.brass_casing": "Brass Casing",
+	"block.create.brass_chute_funnel": "Brass Chute Funnel",
+	"block.create.brass_funnel": "Brass Funnel",
+	"block.create.brass_tunnel": "Brass Tunnel",
 	"block.create.brown_seat": "Brown Seat",
 	"block.create.cart_assembler": "Cart Assembler",
 	"block.create.chiseled_dark_scoria": "Chiseled Dark Scoria",
@@ -37,6 +44,7 @@
 	"block.create.chiseled_limestone": "Chiseled Limestone",
 	"block.create.chiseled_scoria": "Chiseled Scoria",
 	"block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone",
+	"block.create.chute": "Chute",
 	"block.create.clockwork_bearing": "Clockwork Bearing",
 	"block.create.clutch": "Clutch",
 	"block.create.cogwheel": "Cogwheel",
@@ -63,6 +71,7 @@
 	"block.create.dark_scoria_cobblestone_wall": "Dark Scoria Cobblestone Wall",
 	"block.create.dark_scoria_pillar": "Dark Scoria Pillar",
 	"block.create.deployer": "Deployer",
+	"block.create.depot": "Depot",
 	"block.create.diorite_bricks": "Diorite Bricks",
 	"block.create.diorite_bricks_slab": "Diorite Bricks Slab",
 	"block.create.diorite_bricks_stairs": "Diorite Bricks Stairs",
@@ -127,7 +136,6 @@
 	"block.create.flywheel": "Flywheel",
 	"block.create.framed_glass": "Framed Glass",
 	"block.create.framed_glass_pane": "Framed Glass Pane",
-	"block.create.funnel": "Funnel",
 	"block.create.furnace_engine": "Furnace Engine",
 	"block.create.gabbro": "Gabbro",
 	"block.create.gabbro_bricks": "Gabbro Bricks",
@@ -226,6 +234,7 @@
 	"block.create.overgrown_limestone": "Overgrown Limestone",
 	"block.create.overgrown_scoria": "Overgrown Scoria",
 	"block.create.overgrown_weathered_limestone": "Overgrown Weathered Limestone",
+	"block.create.packager": "Packager",
 	"block.create.paved_andesite": "Paved Andesite",
 	"block.create.paved_andesite_slab": "Paved Andesite Slab",
 	"block.create.paved_andesite_stairs": "Paved Andesite Stairs",
@@ -330,7 +339,6 @@
 	"block.create.vertical_extractor": "Vertical Extractor",
 	"block.create.vertical_framed_glass": "Vertical Framed Glass",
 	"block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane",
-	"block.create.vertical_funnel": "Vertical Funnel",
 	"block.create.vertical_linked_extractor": "Vertical Linked Extractor",
 	"block.create.vertical_linked_transposer": "Vertical Linked Transposer",
 	"block.create.vertical_transposer": "Vertical Transposer",
@@ -465,6 +473,10 @@
 	"advancement.create.crafter.desc": "Place and power some Mechanical Crafters",
 	"advancement.create.deployer": "Poke, Place, and Attack",
 	"advancement.create.deployer.desc": "Place and power a Deployer, the perfect reflection of yourself.",
+	"advancement.create.mechanical_arm": "Mechanical Grab'n'Drop",
+	"advancement.create.mechanical_arm.desc": "Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch it do all the work for you.",
+	"advancement.create.musical_arm": "Play me my Theme Tune!",
+	"advancement.create.musical_arm.desc": "Watch a Mechanical Arm operate your Jukebox.",
 	"advancement.create.fist_bump": "Pound It, Bro!",
 	"advancement.create.fist_bump.desc": "Make two Deployers fist-bump.",
 	"advancement.create.crushing_wheel": "A Pair of Giants",
@@ -539,7 +551,7 @@
 	"create.generic.unit.minutes": "Minutes",
 	"create.generic.unit.rpm": "RPM",
 	"create.generic.unit.stress": "su",
-	"create.generic.unit.degrees": "\u00B0",
+	"create.generic.unit.degrees": "°",
 
 	"create.action.scroll": "Scroll",
 	"create.action.confirm": "Confirm",
@@ -825,6 +837,15 @@
 
 	"create.mechanical_mixer.min_ingredients": "Min. Ingredients",
 
+	"create.gui.config.overlay1": "Hi :)",
+	"create.gui.config.overlay2": "This is a sample overlay",
+	"create.gui.config.overlay3": "Click or drag with your mouse",
+	"create.gui.config.overlay4": "to move this preview",
+	"create.gui.config.overlay5": "Press ESC to exit this screen",
+	"create.gui.config.overlay6": "and save the new position",
+	"create.gui.config.overlay7": "Run /create overlay reset",
+	"create.gui.config.overlay8": "to reset to the default position",
+
 	"create.command.killTPSCommand": "killtps",
 	"create.command.killTPSCommand.status.slowed_by.0": "[Create]: Server tick is currently slowed by %s ms :o",
 	"create.command.killTPSCommand.status.slowed_by.1": "[Create]: Server tick is slowed by %s ms now >:)",
@@ -1085,7 +1106,7 @@
 	"block.create.furnace_engine.tooltip.behaviour1": "_Starts_ _powering_ a _Flywheel_ placed in front of it (1m apart). Use a Blast Furnace for higher speeds.",
 
 	"block.create.flywheel.tooltip": "FLYWHEEL",
-	"block.create.flywheel.tooltip.summary": "A large metal wheel to _harness_ _and_ _stabilize_ generated force by an _attached_ _Engine_. Flywheels connect to engines if they are _1m_ _apart_ and at a _90\u00B0_ _Angle_ from each other.",
+	"block.create.flywheel.tooltip.summary": "A large metal wheel to _harness_ _and_ _stabilize_ generated force by an _attached_ _Engine_. Flywheels connect to engines if they are _1m_ _apart_ and at a _90°_ _Angle_ from each other.",
 	"block.create.flywheel.tooltip.condition1": "When Attached to Running Engine",
 	"block.create.flywheel.tooltip.behaviour1": "Provides _Rotational_ _Force_ to a connected contraption based on the generator's strength and speed.",
 

src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "2": "create:block/andesite_funnel_pull",
+    "3": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "2": "create:block/andesite_funnel_pull",
+    "3": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "2": "create:block/andesite_funnel_push",
+    "3": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "2": "create:block/andesite_funnel_push",
+    "3": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_chute_funnel_pull.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "3": "create:block/andesite_funnel_pull",
+    "1_2": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_chute_funnel_push.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/andesite_casing",
+    "3": "create:block/andesite_funnel_push",
+    "1_2": "create:block/andesite_funnel_back",
+    "4": "create:block/andesite_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_funnel.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/funnel/block",
+  "textures": {
+    "2": "create:block/andesite_funnel_back",
+    "3": "create:block/andesite_funnel",
+    "4": "create:block/andesite_funnel_plating",
+    "particle": "create:block/andesite_casing"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/cross.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/cross",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/fullshade.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/fullshade",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/halfshade.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/halfshade",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/straight.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/straight",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/t_left.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/t_left",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/t_right.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/t_right",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/andesite_tunnel/window.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/window",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_pull",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_pull_powered",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_pull_powered",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_pull",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_push_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_push",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_extended.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_extended",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_push_powered",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_push_powered",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_belt_funnel_push_retracted.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/belt_funnel/block_retracted",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "2": "create:block/brass_funnel_push",
+    "3": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_chute_funnel_pull.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "3": "create:block/brass_funnel_pull",
+    "1_2": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_chute_funnel_pull_powered.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "3": "create:block/brass_funnel_pull_powered",
+    "1_2": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_chute_funnel_push.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "3": "create:block/brass_funnel_push",
+    "1_2": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_chute_funnel_push_powered.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/chute_funnel/block",
+  "textures": {
+    "particle": "create:block/brass_casing",
+    "3": "create:block/brass_funnel_push_powered",
+    "1_2": "create:block/brass_funnel_back",
+    "4": "create:block/brass_funnel_plating"
+  }
+}

src/generated/resources/assets/create/models/block/brass_funnel.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/funnel/block",
+  "textures": {
+    "2": "create:block/brass_funnel_back",
+    "3": "create:block/brass_funnel",
+    "4": "create:block/brass_funnel_plating",
+    "particle": "create:block/brass_casing"
+  }
+}

src/generated/resources/assets/create/models/block/brass_funnel_powered.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/funnel/block",
+  "textures": {
+    "2": "create:block/brass_funnel_back",
+    "3": "create:block/brass_funnel_powered",
+    "4": "create:block/brass_funnel_plating",
+    "particle": "create:block/brass_casing"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/cross.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/cross",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/fullshade.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/fullshade",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/halfshade.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/halfshade",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/straight.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/straight",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/t_left.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/t_left",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/t_right.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/t_right",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/block/brass_tunnel/window.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/window",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/item/andesite_funnel.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/funnel/item",
+  "textures": {
+    "2": "create:block/andesite_funnel_back",
+    "3": "create:block/andesite_funnel",
+    "4": "create:block/andesite_funnel_plating",
+    "particle": "create:block/andesite_casing"
+  }
+}

src/generated/resources/assets/create/models/item/andesite_tunnel.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/item",
+  "textures": {
+    "0": "create:block/andesite_tunnel",
+    "1": "create:block/andesite_tunnel_top",
+    "particle": "block/polished_andesite"
+  }
+}

src/generated/resources/assets/create/models/item/belt_tunnel.json

@@ -1,3 +0,0 @@
-{
-  "parent": "create:block/belt_tunnel/item"
-}

src/generated/resources/assets/create/models/item/brass_funnel.json

@@ -0,0 +1,9 @@
+{
+  "parent": "create:block/funnel/item",
+  "textures": {
+    "2": "create:block/brass_funnel_back",
+    "3": "create:block/brass_funnel",
+    "4": "create:block/brass_funnel_plating",
+    "particle": "create:block/brass_casing"
+  }
+}

src/generated/resources/assets/create/models/item/brass_tunnel.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/belt_tunnel/item",
+  "textures": {
+    "0": "create:block/brass_tunnel",
+    "1": "create:block/brass_tunnel_top",
+    "particle": "create:block/brass_block"
+  }
+}

src/generated/resources/assets/create/models/item/chute.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/chute/block"
+}

src/generated/resources/assets/create/models/item/depot.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/depot/block"
+}

src/generated/resources/assets/create/models/item/funnel.json

@@ -1,3 +0,0 @@
-{
-  "parent": "create:block/funnel/item"
-}

src/generated/resources/assets/create/models/item/packager.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/packager/item"
+}

src/generated/resources/data/create/advancements/mechanical_arm.json

@@ -0,0 +1,46 @@
+{
+  "parent": "create:brass_casing",
+  "display": {
+    "icon": {
+      "item": "create:mechanical_arm"
+    },
+    "title": {
+      "translate": "advancement.create.mechanical_arm"
+    },
+    "description": {
+      "translate": "advancement.create.mechanical_arm.desc"
+    },
+    "frame": "goal",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "0": {
+      "trigger": "minecraft:placed_block",
+      "conditions": {
+        "block": "create:mechanical_arm"
+      }
+    },
+    "1": {
+      "trigger": "create:kinetic_block",
+      "conditions": {
+        "block": "create:mechanical_arm"
+      }
+    },
+    "2": {
+      "trigger": "create:mechanical_arm"
+    }
+  },
+  "requirements": [
+    [
+      "0"
+    ],
+    [
+      "1"
+    ],
+    [
+      "2"
+    ]
+  ]
+}

src/generated/resources/data/create/advancements/musical_arm.json

@@ -0,0 +1,46 @@
+{
+  "parent": "create:mechanical_arm",
+  "display": {
+    "icon": {
+      "item": "minecraft:music_disc_13"
+    },
+    "title": {
+      "translate": "advancement.create.musical_arm"
+    },
+    "description": {
+      "translate": "advancement.create.musical_arm.desc"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "0": {
+      "trigger": "minecraft:placed_block",
+      "conditions": {
+        "block": "create:mechanical_arm"
+      }
+    },
+    "1": {
+      "trigger": "create:kinetic_block",
+      "conditions": {
+        "block": "create:mechanical_arm"
+      }
+    },
+    "2": {
+      "trigger": "create:musical_arm"
+    }
+  },
+  "requirements": [
+    [
+      "0"
+    ],
+    [
+      "1"
+    ],
+    [
+      "2"
+    ]
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/andesite_belt_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:andesite_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/andesite_chute_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:andesite_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/andesite_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:andesite_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/andesite_tunnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:andesite_tunnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/brass_belt_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:brass_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/brass_chute_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:brass_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/brass_funnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:brass_funnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/brass_tunnel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:brass_tunnel"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/chute.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "create:funnel"
+          "name": "create:chute"
         }
       ],
       "conditions": [

src/generated/resources/data/create/loot_tables/blocks/depot.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "create:funnel"
+          "name": "create:depot"
         }
       ],
       "conditions": [

src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "create:piston_extension_pole"
         }
       ],
       "conditions": [

src/generated/resources/data/create/loot_tables/blocks/packager.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "create:belt_tunnel"
+          "name": "create:packager"
         }
       ],
       "conditions": [

src/generated/resources/data/create/tags/blocks/brittle.json

@@ -0,0 +1,15 @@
+{
+  "replace": false,
+  "values": [
+    "create:nozzle",
+    "create:hand_crank",
+    "create:rope",
+    "create:pulley_magnet",
+    "create:furnace_engine",
+    "create:redstone_link",
+    "create:extractor",
+    "create:vertical_extractor",
+    "create:linked_extractor",
+    "create:vertical_linked_extractor"
+  ]
+}

src/generated/resources/data/create/tags/items/create_ingots.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "create:copper_ingot",
+    "create:zinc_ingot",
+    "create:brass_ingot"
+  ]
+}

src/generated/resources/data/forge/tags/items/beacon_payment.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#create:create_ingots"
+  ]
+}

src/generated/resources/data/forge/tags/items/cobblestone.json

@@ -0,0 +1,14 @@
+{
+  "replace": false,
+  "values": [
+    "create:granite_cobblestone",
+    "create:diorite_cobblestone",
+    "create:andesite_cobblestone",
+    "create:limestone_cobblestone",
+    "create:weathered_limestone_cobblestone",
+    "create:dolomite_cobblestone",
+    "create:gabbro_cobblestone",
+    "create:scoria_cobblestone",
+    "create:dark_scoria_cobblestone"
+  ]
+}

src/generated/resources/data/forge/tags/items/ingots.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#create:create_ingots"
+  ]
+}

src/generated/resources/data/forge/tags/items/nuggets.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "create:copper_nugget",
+    "create:zinc_nugget",
+    "create:brass_nugget"
+  ]
+}

src/generated/resources/data/forge/tags/items/plates.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "create:copper_sheet",
+    "create:brass_sheet",
+    "create:iron_sheet",
+    "create:golden_sheet"
+  ]
+}

src/main/java/com/simibubi/create/AllBlockPartials.java

@@ -29,7 +29,7 @@ public class AllBlockPartials {
 	private static List<AllBlockPartials> all = new ArrayList<>();
 	
 	public static final AllBlockPartials 
-	SCHEMATICANNON_CONNECTOR = get("schematicannon/connector"),
+		SCHEMATICANNON_CONNECTOR = get("schematicannon/connector"),
 		SCHEMATICANNON_PIPE = get("schematicannon/pipe"),
 
 		SHAFTLESS_COGWHEEL = get("cogwheel_shaftless"), 
@@ -58,8 +58,8 @@ public class AllBlockPartials {
 		DEPLOYER_HAND_HOLDING = get("deployer/hand_holding"),
 		ANALOG_LEVER_HANDLE = get("analog_lever/handle"), 
 		ANALOG_LEVER_INDICATOR = get("analog_lever/indicator"),
+		BELT_FUNNEL_FLAP = get("belt_funnel/flap"), 
 		BELT_TUNNEL_FLAP = get("belt_tunnel/flap"), 
-		BELT_TUNNEL_INDICATOR = get("belt_tunnel/indicator"),
 		FLEXPEATER_INDICATOR = get("diodes/indicator"), 
 		FLYWHEEL = get("flywheel/wheel"),
 		FLYWHEEL_UPPER_ROTATING = get("flywheel/upper_rotating_connector"),
@@ -77,6 +77,7 @@ public class AllBlockPartials {
 		ROPE_HALF = get("rope_pulley/rope_half"), 
 		ROPE_HALF_MAGNET = get("rope_pulley/rope_half_magnet"),
 		MILLSTONE_COG = get("millstone/inner"),
+		PACKAGER_SEALER = get("packager/sealer"),
 
 		SYMMETRY_PLANE = get("symmetry_effect/plane"), 
 		SYMMETRY_CROSSPLANE = get("symmetry_effect/crossplane"),
@@ -90,6 +91,11 @@ public class AllBlockPartials {
 		ARM_CLAW_BASE = get("mechanical_arm/claw_base"), 
 		ARM_CLAW_GRIP = get("mechanical_arm/claw_grip"), 
 		
+		FLAG_SHORT_IN = get("mechanical_arm/flag/short_in"), 
+		FLAG_SHORT_OUT = get("mechanical_arm/flag/short_out"), 
+		FLAG_LONG_IN = get("mechanical_arm/flag/long_in"), 
+		FLAG_LONG_OUT = get("mechanical_arm/flag/long_out"), 
+		
 		MECHANICAL_PUMP_ARROW = get("mechanical_pump/arrow"), 
 		MECHANICAL_PUMP_COG = get("mechanical_pump/cog"),
 		FLUID_PIPE_CASING = get("fluid_pipe/casing");

src/main/java/com/simibubi/create/AllBlocks.java

@@ -8,6 +8,7 @@ import static com.simibubi.create.foundation.data.CreateRegistrate.connectedText
 import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
 import static com.simibubi.create.foundation.data.ModelGen.oxidizedItemModel;
 
+import com.simibubi.create.AllTags.AllBlockTags;
 import com.simibubi.create.content.AllSections;
 import com.simibubi.create.content.contraptions.base.CasingBlock;
 import com.simibubi.create.content.contraptions.components.actors.DrillBlock;
@@ -62,6 +63,7 @@ import com.simibubi.create.content.contraptions.relays.advanced.sequencer.Sequen
 import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
 import com.simibubi.create.content.contraptions.relays.belt.BeltColor;
 import com.simibubi.create.content.contraptions.relays.belt.BeltGenerator;
+import com.simibubi.create.content.contraptions.relays.belt.BeltModel;
 import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
 import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem;
 import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
@@ -76,6 +78,12 @@ import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
 import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
 import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock;
 import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock;
+import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelCTBehaviour;
+import com.simibubi.create.content.logistics.block.chute.ChuteBlock;
+import com.simibubi.create.content.logistics.block.chute.ChuteGenerator;
+import com.simibubi.create.content.logistics.block.chute.ChuteItem;
+import com.simibubi.create.content.logistics.block.depot.DepotBlock;
 import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator;
 import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock;
 import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterGenerator;
@@ -88,11 +96,19 @@ import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator;
 import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock;
 import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorBlock;
 import com.simibubi.create.content.logistics.block.extractor.VerticalExtractorGenerator;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.AndesiteBeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.VerticalFunnelGenerator;
+import com.simibubi.create.content.logistics.block.funnel.AndesiteChuteFunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.AndesiteFunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.BeltFunnelGenerator;
+import com.simibubi.create.content.logistics.block.funnel.BrassBeltFunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.BrassChuteFunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.BrassFunnelBlock;
+import com.simibubi.create.content.logistics.block.funnel.ChuteFunnelGenerator;
 import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock;
 import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock;
 import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock;
+import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem;
+import com.simibubi.create.content.logistics.block.packager.PackagerBlock;
 import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock;
 import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
 import com.simibubi.create.content.logistics.block.redstone.NixieTubeGenerator;
@@ -103,6 +119,7 @@ import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock
 import com.simibubi.create.content.logistics.block.transposer.LinkedTransposerBlock;
 import com.simibubi.create.content.logistics.block.transposer.TransposerBlock;
 import com.simibubi.create.content.logistics.block.transposer.VerticalTransposerGenerator;
+import com.simibubi.create.content.palettes.MetalBlock;
 import com.simibubi.create.content.schematics.block.SchematicTableBlock;
 import com.simibubi.create.content.schematics.block.SchematicannonBlock;
 import com.simibubi.create.foundation.config.StressConfigDefaults;
@@ -125,6 +142,7 @@ import net.minecraft.item.DyeColor;
 import net.minecraft.state.properties.PistonType;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.Direction.Axis;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.generators.ConfiguredModel;
 import net.minecraftforge.common.ToolType;
 
@@ -255,9 +273,11 @@ public class AllBlocks {
 	public static final BlockEntry<BeltBlock> BELT = REGISTRATE.block("belt", BeltBlock::new)
 		.initialProperties(SharedProperties.beltMaterial, MaterialColor.GRAY)
 		.properties(p -> p.sound(SoundType.CLOTH))
+		.properties(p -> p.hardnessAndResistance(0.8F))
+		.blockstate(new BeltGenerator()::generate)
 		.transform(StressConfigDefaults.setImpact(1.0))
 		.onRegister(CreateRegistrate.blockColors(() -> BeltColor::new))
-		.blockstate(new BeltGenerator()::generate)
+		.onRegister(CreateRegistrate.blockModel(() -> BeltModel::new))
 		.register();
 
 	public static final BlockEntry<CreativeMotorBlock> CREATIVE_MOTOR =
@@ -290,6 +310,7 @@ public class AllBlocks {
 
 	public static final BlockEntry<NozzleBlock> NOZZLE = REGISTRATE.block("nozzle", NozzleBlock::new)
 		.initialProperties(SharedProperties::stone)
+		.tag(AllBlockTags.BRITTLE.tag)
 		.blockstate(BlockStateGen.directionalBlockProvider(true))
 		.addLayer(() -> RenderType::getCutoutMipped)
 		.item()
@@ -307,6 +328,7 @@ public class AllBlocks {
 		.initialProperties(SharedProperties::wooden)
 		.blockstate(BlockStateGen.directionalBlockProvider(true))
 		.transform(StressConfigDefaults.setCapacity(32.0))
+		.tag(AllBlockTags.BRITTLE.tag)
 		.item()
 		.transform(customItemModel())
 		.register();
@@ -377,6 +399,21 @@ public class AllBlocks {
 		.simpleItem()
 		.register();
 
+	public static final BlockEntry<DepotBlock> DEPOT = REGISTRATE.block("depot", DepotBlock::new)
+		.initialProperties(SharedProperties::stone)
+		.blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))
+		.item()
+		.transform(customItemModel("_", "block"))
+		.register();
+
+	public static final BlockEntry<ChuteBlock> CHUTE = REGISTRATE.block("chute", ChuteBlock::new)
+		.initialProperties(SharedProperties::softMetal)
+		.addLayer(() -> RenderType::getCutoutMipped)
+		.blockstate(new ChuteGenerator()::generate)
+		.item(ChuteItem::new)
+		.transform(customItemModel("_", "block"))
+		.register();
+
 	public static final BlockEntry<GaugeBlock> SPEEDOMETER = REGISTRATE.block("speedometer", GaugeBlock::speed)
 		.initialProperties(SharedProperties::wooden)
 		.transform(StressConfigDefaults.setNoImpact())
@@ -405,7 +442,7 @@ public class AllBlocks {
 
 	public static final BlockEntry<PumpBlock> MECHANICAL_PUMP = REGISTRATE.block("mechanical_pump", PumpBlock::new)
 		.initialProperties(SharedProperties::softMetal)
-		.blockstate(BlockStateGen.directionalBlockProvider(true))
+		.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true))
 		.transform(StressConfigDefaults.setImpact(4.0))
 		.item()
 		.transform(customItemModel())
@@ -432,21 +469,22 @@ public class AllBlocks {
 			.transform(BuilderTransformers.mechanicalPiston(PistonType.STICKY))
 			.register();
 
-	public static final BlockEntry<MechanicalPistonHeadBlock> MECHANICAL_PISTON_HEAD =
-		REGISTRATE.block("mechanical_piston_head", MechanicalPistonHeadBlock::new)
-			.initialProperties(() -> Blocks.PISTON_HEAD)
-			.blockstate((c, p) -> p.directionalBlock(c.get(), state -> p.models()
-				.getExistingFile(p.modLoc("block/mechanical_piston/" + state.get(MechanicalPistonHeadBlock.TYPE)
-					.getName() + "/head"))))
-			.register();
-
 	public static final BlockEntry<PistonExtensionPoleBlock> PISTON_EXTENSION_POLE =
 		REGISTRATE.block("piston_extension_pole", PistonExtensionPoleBlock::new)
 			.initialProperties(() -> Blocks.PISTON_HEAD)
-			.blockstate(BlockStateGen.directionalBlockProvider(false))
+			.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(false))
 			.simpleItem()
 			.register();
 
+	public static final BlockEntry<MechanicalPistonHeadBlock> MECHANICAL_PISTON_HEAD =
+		REGISTRATE.block("mechanical_piston_head", MechanicalPistonHeadBlock::new)
+			.initialProperties(() -> Blocks.PISTON_HEAD)
+			.loot((p, b) -> p.registerDropping(b, PISTON_EXTENSION_POLE.get()))
+			.blockstate((c, p) -> BlockStateGen.directionalBlockIgnoresWaterlogged(c, p, state -> p.models()
+				.getExistingFile(p.modLoc("block/mechanical_piston/" + state.get(MechanicalPistonHeadBlock.TYPE)
+					.getName() + "/head"))))
+			.register();
+
 	public static final BlockEntry<MechanicalBearingBlock> MECHANICAL_BEARING =
 		REGISTRATE.block("mechanical_bearing", MechanicalBearingBlock::new)
 			.transform(BuilderTransformers.bearing("mechanical", "gearbox"))
@@ -470,6 +508,7 @@ public class AllBlocks {
 
 	public static final BlockEntry<PulleyBlock.RopeBlock> ROPE = REGISTRATE.block("rope", PulleyBlock.RopeBlock::new)
 		.initialProperties(SharedProperties.beltMaterial, MaterialColor.BROWN)
+		.tag(AllBlockTags.BRITTLE.tag)
 		.properties(p -> p.sound(SoundType.CLOTH))
 		.blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
 			.getExistingFile(p.modLoc("block/rope_pulley/" + c.getName()))))
@@ -478,6 +517,7 @@ public class AllBlocks {
 	public static final BlockEntry<PulleyBlock.MagnetBlock> PULLEY_MAGNET =
 		REGISTRATE.block("pulley_magnet", PulleyBlock.MagnetBlock::new)
 			.initialProperties(SharedProperties::stone)
+			.tag(AllBlockTags.BRITTLE.tag)
 			.blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
 				.getExistingFile(p.modLoc("block/rope_pulley/" + c.getName()))))
 			.register();
@@ -654,6 +694,7 @@ public class AllBlocks {
 	public static final BlockEntry<FurnaceEngineBlock> FURNACE_ENGINE =
 		REGISTRATE.block("furnace_engine", FurnaceEngineBlock::new)
 			.initialProperties(SharedProperties::softMetal)
+			.tag(AllBlockTags.BRITTLE.tag)
 			.blockstate(BlockStateGen.horizontalBlockProvider(true))
 			.transform(StressConfigDefaults.setCapacity(1024.0))
 			.item()
@@ -675,6 +716,69 @@ public class AllBlocks {
 		REGISTRATE.startSection(AllSections.LOGISTICS);
 	}
 
+	public static final BlockEntry<ArmBlock> MECHANICAL_ARM = REGISTRATE.block("mechanical_arm", ArmBlock::new)
+		.initialProperties(SharedProperties::softMetal)
+		.blockstate((c, p) -> p.getVariantBuilder(c.get())
+			.forAllStates(s -> ConfiguredModel.builder()
+				.modelFile(AssetLookup.partialBaseModel(c, p))
+				.rotationX(s.get(ArmBlock.CEILING) ? 180 : 0)
+				.build()))
+		.transform(StressConfigDefaults.setImpact(8.0))
+		.item(ArmItem::new)
+		.transform(customItemModel())
+		.register();
+
+	public static final BlockEntry<AndesiteFunnelBlock> ANDESITE_FUNNEL =
+		REGISTRATE.block("andesite_funnel", AndesiteFunnelBlock::new)
+			.initialProperties(SharedProperties::stone)
+			.transform(BuilderTransformers.funnel("andesite", Create.asResource("block/andesite_casing")))
+			.register();
+
+	public static final BlockEntry<AndesiteBeltFunnelBlock> ANDESITE_BELT_FUNNEL =
+		REGISTRATE.block("andesite_belt_funnel", AndesiteBeltFunnelBlock::new)
+			.initialProperties(SharedProperties::stone)
+			.blockstate(new BeltFunnelGenerator("andesite")::generate)
+			.loot((p, b) -> p.registerDropping(b, ANDESITE_FUNNEL.get()))
+			.register();
+
+	public static final BlockEntry<AndesiteChuteFunnelBlock> ANDESITE_CHUTE_FUNNEL =
+		REGISTRATE.block("andesite_chute_funnel", AndesiteChuteFunnelBlock::new)
+			.initialProperties(SharedProperties::stone)
+			.blockstate(new ChuteFunnelGenerator("andesite")::generate)
+			.loot((p, b) -> p.registerDropping(b, ANDESITE_FUNNEL.get()))
+			.register();
+
+	public static final BlockEntry<BrassFunnelBlock> BRASS_FUNNEL =
+		REGISTRATE.block("brass_funnel", BrassFunnelBlock::new)
+			.initialProperties(SharedProperties::softMetal)
+			.transform(BuilderTransformers.funnel("brass", Create.asResource("block/brass_casing")))
+			.register();
+
+	public static final BlockEntry<BrassBeltFunnelBlock> BRASS_BELT_FUNNEL =
+		REGISTRATE.block("brass_belt_funnel", BrassBeltFunnelBlock::new)
+			.initialProperties(SharedProperties::softMetal)
+			.blockstate(new BeltFunnelGenerator("brass")::generate)
+			.loot((p, b) -> p.registerDropping(b, BRASS_FUNNEL.get()))
+			.register();
+
+	public static final BlockEntry<BrassChuteFunnelBlock> BRASS_CHUTE_FUNNEL =
+		REGISTRATE.block("brass_chute_funnel", BrassChuteFunnelBlock::new)
+			.initialProperties(SharedProperties::softMetal)
+			.blockstate(new ChuteFunnelGenerator("brass")::generate)
+			.loot((p, b) -> p.registerDropping(b, BRASS_FUNNEL.get()))
+			.register();
+
+	public static final BlockEntry<BeltTunnelBlock> ANDESITE_TUNNEL =
+		REGISTRATE.block("andesite_tunnel", BeltTunnelBlock::new)
+			.transform(BuilderTransformers.beltTunnel("andesite", new ResourceLocation("block/polished_andesite")))
+			.register();
+
+	public static final BlockEntry<BrassTunnelBlock> BRASS_TUNNEL =
+		REGISTRATE.block("brass_tunnel", BrassTunnelBlock::new)
+			.transform(BuilderTransformers.beltTunnel("brass", Create.asResource("block/brass_block")))
+			.onRegister(connectedTextures(new BrassTunnelCTBehaviour()))
+			.register();
+
 	public static final BlockEntry<RedstoneContactBlock> REDSTONE_CONTACT =
 		REGISTRATE.block("redstone_contact", RedstoneContactBlock::new)
 			.initialProperties(SharedProperties::stone)
@@ -686,6 +790,7 @@ public class AllBlocks {
 	public static final BlockEntry<RedstoneLinkBlock> REDSTONE_LINK =
 		REGISTRATE.block("redstone_link", RedstoneLinkBlock::new)
 			.initialProperties(SharedProperties::wooden)
+			.tag(AllBlockTags.BRITTLE.tag)
 			.blockstate(new RedstoneLinkGenerator()::generate)
 			.addLayer(() -> RenderType::getCutoutMipped)
 			.item()
@@ -727,30 +832,22 @@ public class AllBlocks {
 			.transform(customItemModel())
 			.register();
 
-	public static final BlockEntry<BeltTunnelBlock> BELT_TUNNEL = REGISTRATE.block("belt_tunnel", BeltTunnelBlock::new)
+	public static final BlockEntry<PackagerBlock> PACKAGER = REGISTRATE.block("packager", PackagerBlock::new)
-		.initialProperties(SharedProperties::stone)
-		.addLayer(() -> RenderType::getCutoutMipped)
-		.blockstate((c, p) -> p.getVariantBuilder(c.get())
-			.forAllStates(state -> ConfiguredModel.builder()
-				.modelFile(p.models()
-					.getExistingFile(p.modLoc("block/belt_tunnel/" + state.get(BeltTunnelBlock.SHAPE)
-						.getName())))
-				.rotationY(state.get(BeltTunnelBlock.HORIZONTAL_AXIS) == Axis.X ? 0 : 90)
-				.build()))
-		.item()
-		.transform(customItemModel())
-		.register();
-
-	public static final BlockEntry<ArmBlock> MECHANICAL_ARM = REGISTRATE.block("mechanical_arm", ArmBlock::new)
 		.initialProperties(SharedProperties::softMetal)
-		.blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p)))
+		.transform(StressConfigDefaults.setImpact(4.0))
-		.transform(StressConfigDefaults.setImpact(8.0))
+		.properties(p -> p.nonOpaque())
+		.blockstate((c, p) -> p.getVariantBuilder(c.get())
+			.forAllStates(s -> ConfiguredModel.builder()
+				.modelFile(AssetLookup.partialBaseModel(c, p))
+				.rotationY(s.get(PackagerBlock.HORIZONTAL_AXIS) == Axis.X ? 90 : 0)
+				.build()))
 		.item()
 		.transform(customItemModel())
 		.register();
 
 	public static final BlockEntry<ExtractorBlock> EXTRACTOR = REGISTRATE.block("extractor", ExtractorBlock::new)
 		.initialProperties(SharedProperties::softMetal)
+		.tag(AllBlockTags.BRITTLE.tag)
 		.blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, c.getName() + "/horizontal")))
 		.item()
 		.transform(customItemModel("_", "horizontal"))
@@ -759,12 +856,14 @@ public class AllBlocks {
 	public static final BlockEntry<ExtractorBlock.Vertical> VERTICAL_EXTRACTOR =
 		REGISTRATE.block("vertical_extractor", ExtractorBlock.Vertical::new)
 			.initialProperties(SharedProperties::softMetal)
+			.tag(AllBlockTags.BRITTLE.tag)
 			.blockstate(new VerticalExtractorGenerator(false)::generate)
 			.loot((p, b) -> p.registerDropping(b, EXTRACTOR.get()))
 			.register();
 
 	public static final BlockEntry<LinkedExtractorBlock> LINKED_EXTRACTOR = REGISTRATE
 		.block("linked_extractor", LinkedExtractorBlock::new)
+		.tag(AllBlockTags.BRITTLE.tag)
 		.initialProperties(SharedProperties::softMetal)
 		.addLayer(() -> RenderType::getCutoutMipped)
 		.blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, "extractor/horizontal_linked")))
@@ -775,26 +874,12 @@ public class AllBlocks {
 	public static final BlockEntry<LinkedExtractorBlock.Vertical> VERTICAL_LINKED_EXTRACTOR =
 		REGISTRATE.block("vertical_linked_extractor", LinkedExtractorBlock.Vertical::new)
 			.initialProperties(SharedProperties::softMetal)
+			.tag(AllBlockTags.BRITTLE.tag)
 			.blockstate(new VerticalExtractorGenerator(true)::generate)
 			.loot((p, b) -> p.registerDropping(b, LINKED_EXTRACTOR.get()))
 			.addLayer(() -> RenderType::getCutoutMipped)
 			.register();
 
-	public static final BlockEntry<FunnelBlock> FUNNEL = REGISTRATE.block("funnel", FunnelBlock::new)
-		.initialProperties(SharedProperties::softMetal)
-		.blockstate((c, p) -> p.horizontalBlock(c.get(), state -> p.models()
-			.getExistingFile(p.modLoc("block/funnel/horizontal" + (state.get(FunnelBlock.BELT) ? "_belt" : "")))))
-		.item()
-		.transform(customItemModel())
-		.register();
-
-	public static final BlockEntry<FunnelBlock.Vertical> VERTICAL_FUNNEL =
-		REGISTRATE.block("vertical_funnel", FunnelBlock.Vertical::new)
-			.initialProperties(SharedProperties::softMetal)
-			.blockstate(new VerticalFunnelGenerator()::generate)
-			.loot((p, b) -> p.registerDropping(b, FUNNEL.get()))
-			.register();
-
 	public static final BlockEntry<TransposerBlock> TRANSPOSER = REGISTRATE.block("transposer", TransposerBlock::new)
 		.initialProperties(SharedProperties::softMetal)
 		.blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, c.getName() + "/block"), 180))
@@ -903,7 +988,7 @@ public class AllBlocks {
 		.register();
 
 	public static final BlockEntry<OxidizingBlock> COPPER_BLOCK =
-		REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f))
+		REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f, true))
 			.initialProperties(() -> Blocks.IRON_BLOCK)
 			.transform(tagBlockAndItem("storage_blocks/copper"))
 			.transform(oxidizedItemModel())
@@ -919,19 +1004,20 @@ public class AllBlocks {
 			.transform(oxidizedBlockstate())
 			.register();
 
-	public static final BlockEntry<Block> ZINC_BLOCK = REGISTRATE.block("zinc_block", Block::new)
+	public static final BlockEntry<MetalBlock> ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new MetalBlock(p, true))
 		.initialProperties(() -> Blocks.IRON_BLOCK)
 		.transform(tagBlockAndItem("storage_blocks/zinc"))
 		.build()
 		.recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/zinc")), ctx, false))
 		.register();
 
-	public static final BlockEntry<Block> BRASS_BLOCK = REGISTRATE.block("brass_block", Block::new)
+	public static final BlockEntry<MetalBlock> BRASS_BLOCK =
-		.initialProperties(() -> Blocks.IRON_BLOCK)
+		REGISTRATE.block("brass_block", p -> new MetalBlock(p, true))
-		.transform(tagBlockAndItem("storage_blocks/brass"))
+			.initialProperties(() -> Blocks.IRON_BLOCK)
-		.build()
+			.transform(tagBlockAndItem("storage_blocks/brass"))
-		.recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/brass")), ctx, false))
+			.build()
-		.register();
+			.recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/brass")), ctx, false))
+			.register();
 
 	// Load this class
 

src/main/java/com/simibubi/create/AllItems.java

@@ -1,13 +1,16 @@
 package com.simibubi.create;
 
 import static com.simibubi.create.AllTags.forgeItemTag;
+import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS;
+import static com.simibubi.create.AllTags.AllItemTags.CRUSHED_ORES;
+import static com.simibubi.create.AllTags.AllItemTags.NUGGETS;
+import static com.simibubi.create.AllTags.AllItemTags.PLATES;
 import static com.simibubi.create.content.AllSections.CURIOSITIES;
 import static com.simibubi.create.content.AllSections.KINETICS;
 import static com.simibubi.create.content.AllSections.LOGISTICS;
 import static com.simibubi.create.content.AllSections.MATERIALS;
 import static com.simibubi.create.content.AllSections.SCHEMATICS;
 
-import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem;
 import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MinecartContraptionItem;
 import com.simibubi.create.content.contraptions.goggles.GogglesItem;
@@ -55,26 +58,26 @@ public class AllItems {
 	}
 
 	public static final ItemEntry<Item> COPPER_NUGGET =
-		taggedIngredient("copper_nugget", forgeItemTag("nuggets/copper")),
+		taggedIngredient("copper_nugget", forgeItemTag("nuggets/copper"), NUGGETS.tag),
-		ZINC_NUGGET = taggedIngredient("zinc_nugget", forgeItemTag("nuggets/zinc")),
+		ZINC_NUGGET = taggedIngredient("zinc_nugget", forgeItemTag("nuggets/zinc"), NUGGETS.tag),
-		BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass")),
+		BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass"), NUGGETS.tag),
 
-		COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper")),
+		COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper"), PLATES.tag),
-		BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass")),
+		BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass"), PLATES.tag),
-		IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron")),
+		IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), PLATES.tag),
-		GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold")),
+		GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag),
 		LAPIS_SHEET = ingredient("lapis_sheet"),
 
-		CRUSHED_IRON = taggedIngredient("crushed_iron_ore", AllItemTags.CRUSHED_ORES.tag),
+		CRUSHED_IRON = taggedIngredient("crushed_iron_ore", CRUSHED_ORES.tag),
-		CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", AllItemTags.CRUSHED_ORES.tag),
+		CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", CRUSHED_ORES.tag),
-		CRUSHED_COPPER = taggedIngredient("crushed_copper_ore", AllItemTags.CRUSHED_ORES.tag),
+		CRUSHED_COPPER = taggedIngredient("crushed_copper_ore", CRUSHED_ORES.tag),
-		CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", AllItemTags.CRUSHED_ORES.tag),
+		CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", CRUSHED_ORES.tag),
-		CRUSHED_BRASS = taggedIngredient("crushed_brass", AllItemTags.CRUSHED_ORES.tag),
+		CRUSHED_BRASS = taggedIngredient("crushed_brass", CRUSHED_ORES.tag),
 
 		ANDESITE_ALLOY = ingredient("andesite_alloy"),
-		COPPER_INGOT = taggedIngredient("copper_ingot", forgeItemTag("ingots/copper")),
+		COPPER_INGOT = taggedIngredient("copper_ingot", forgeItemTag("ingots/copper"), CREATE_INGOTS.tag),
-		ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc")),
+		ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), CREATE_INGOTS.tag),
-		BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass")),
+		BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass"), CREATE_INGOTS.tag),
 
 		WHEAT_FLOUR = ingredient("wheat_flour"), DOUGH = ingredient("dough"),
 		POWDERED_OBSIDIAN = ingredient("powdered_obsidian"), ROSE_QUARTZ = ingredient("rose_quartz"),
@@ -226,9 +229,10 @@ public class AllItems {
 			.register();
 	}
 
-	private static ItemEntry<Item> taggedIngredient(String name, Tag<Item> tag) {
+	@SafeVarargs
+	private static ItemEntry<Item> taggedIngredient(String name, Tag<Item>... tags) {
 		return REGISTRATE.item(name, Item::new)
-			.tag(tag)
+			.tag(tags)
 			.register();
 	}
 

src/main/java/com/simibubi/create/AllShapes.java

@@ -28,8 +28,6 @@ public class AllShapes {
 		CASING_11PX = shape(0, 0, 0, 16, 11, 16).forDirectional(),
 		MOTOR_BLOCK = shape(3, 0, 3, 13, 14, 13).forDirectional(),
 		FOUR_VOXEL_POLE = shape(6, 0, 6, 10, 16, 10).forAxis(), SIX_VOXEL_POLE = shape(5, 0, 5, 11, 16, 11).forAxis(),
-		BELT_FUNNEL = shape(3, -4, 11, 13, 8, 17).forHorizontal(SOUTH),
-		FUNNEL = shape(1, 1, 13, 15, 15, 17).forDirectional(SOUTH),
 		EXTRACTOR = shape(4, 2, 11, 12, 10, 17).forDirectional(SOUTH)
 			.withVerticalShapes(cuboid(4, 11, 4, 12, 17, 12)),
 		TRANSPOSER = shape(4, 4, -1, 12, 12, 1).add(5, 5, 0, 11, 11, 16)
@@ -65,6 +63,24 @@ public class AllShapes {
 		NIXIE_TUBE_CEILING = shape(0, 12, 0, 16, 16, 16).add(9, 1, 5, 15, 16, 11)
 			.add(1, 1, 5, 7, 16, 11)
 			.forHorizontalAxis(),
+		FUNNEL = shape(3, -2, 3, 13, 2, 13).add(2, 2, 2, 14, 6, 14)
+			.add(1, 6, 1, 15, 10, 15)
+			.add(0, 10, 0, 16, 16, 16)
+			.forDirectional(UP),
+		FUNNEL_COLLISION = shape(3, -2, 3, 13, 2, 13).add(2, 2, 2, 14, 6, 14)
+			.add(1, 6, 1, 15, 10, 15)
+			.add(0, 10, 0, 16, 13, 16)
+			.forDirectional(UP),
+		CHUTE_FUNNEL = shape(3, -2, 3, 13, 2, 13).add(2, 2, 2, 14, 6, 14)
+			.add(0, 8, 0, 16, 14, 16)
+			.add(1, 5, 1, 15, 18, 15)
+			.forDirectional(UP),
+		BELT_FUNNEL_RETRACTED = shape(3, -5, 14, 13, 13, 19).add(0, -5, 8, 16, 16, 14)
+			.forHorizontal(NORTH),
+		BELT_FUNNEL_EXTENDED = shape(3, -4, 6, 13, 13, 17).add(2, -4, 10, 14, 14, 14)
+			.add(1, -4, 6, 15, 15, 10)
+			.add(0, -5, 0, 16, 16, 6)
+			.forHorizontal(NORTH),
 		PUMP = shape(2, 0, 2, 14, 5, 14).add(4, 0, 4, 12, 16, 12)
 			.add(3, 12, 3, 13, 16, 13)
 			.forDirectional(Direction.UP)
@@ -120,12 +136,18 @@ public class AllShapes {
 			.build(),
 		MECHANICAL_ARM = shape(2, 0, 2, 14, 10, 14).add(3, 0, 3, 13, 14, 13)
 			.build(),
+		MECHANICAL_ARM_CEILING = shape(2, 6, 2, 14, 16, 14).add(3, 2, 3, 13, 16, 13)
+			.build(),
+		CHUTE = shape(1, 8, 1, 15, 16, 15).add(2, 0, 2, 14, 8, 14)
+			.build(),
 		TANK = shape(1, 0, 1, 15, 16, 15).build(), TANK_TOP = shape(TANK_TOP_LID).add(TANK)
 			.build(),
 		TANK_BOTTOM = shape(TANK_BOTTOM_LID).add(TANK)
 			.build(),
 		TANK_TOP_BOTTOM = shape(TANK_BOTTOM_LID).add(TANK_TOP_LID)
 			.add(TANK)
+			.build(),
+		DEPOT = shape(CASING_11PX.get(Direction.UP)).add(1, 11, 1, 15, 13, 15)
 			.build()
 
 	;

src/main/java/com/simibubi/create/AllSpriteShifts.java

@@ -47,10 +47,12 @@ public class AllSpriteShifts {
 		CHASSIS_STICKY = getCT(CTType.OMNIDIRECTIONAL, "linear_chassis_end_sticky");
 	
 	public static final CTSpriteShiftEntry 
+		BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"),
 		FLUID_TANK = getCT(CTType.OMNIDIRECTIONAL, "fluid_tank");
 
 	public static final SpriteShiftEntry 
 		BELT = SpriteShifter.get("block/belt", "block/belt_animated"),
+		ANDESIDE_BELT_CASING = SpriteShifter.get("block/brass_casing_belt", "block/andesite_casing_belt"),
 		CRAFTER_THINGIES = SpriteShifter.get("block/crafter_thingies", "block/crafter_thingies");
 
 	static {