diff --git a/.gitignore b/.gitignore index 45a3bec5d..c3c0dc596 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /classes /bin/ /run/ +logs/ *.classpath *.project diff --git a/build.gradle b/build.gradle index 2e335bfdb..a3d923970 100644 --- a/build.gradle +++ b/build.gradle @@ -83,7 +83,7 @@ dependencies { // at runtime, use the full JEI jar runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") - compile "curse.maven:fastworkbench:3003114" +// compile "curse.maven:fastworkbench:3003114" } jar { diff --git a/gradle.properties b/gradle.properties index 2d69d51e8..5ef755cd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.daemon=false mod_version=2.0 -mc_version=1.15.2 -mcp_version=20200514-1.15.1 -forge_version=31.2.36 -jei_version=6.0.3.15 \ No newline at end of file +mc_version=1.16.3 +mcp_version=20201028-1.16.3 +forge_version=34.1.35 +jei_version=7.6.0.49 \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1cce0a85a..ce558ec24 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -11,7 +11,7 @@ e78c7a80444f967401b8c53553aead94ba46e129 assets/actuallyadditions/blockstates/ca c8d5786cd66f324b82d201e6e4eb0ae0a5978d13 assets/actuallyadditions/blockstates/charcoal_block.json 430dacd737f49a79f85ff43f8cd0f58d353e49a6 assets/actuallyadditions/blockstates/chiseled_quartz_slab_block.json 8df24f43f7899e90261a95cdd697d906138df531 assets/actuallyadditions/blockstates/chiseled_quartz_stair_block.json -8603333b4c569c8652ccd7b13c7571bda133dbe3 assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json +be045f3ca9fc757e0f64e42d288ef3ed61715ff5 assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json 8ea0b541045ff036417a389874d51b0736260b6f assets/actuallyadditions/blockstates/coal_generator_block.json 8d63c5af67fa932b51e66ec642e3cd58625b928f assets/actuallyadditions/blockstates/coffee_block.json a49100a962fea3fa49d8fec98843a17cfa48bfc7 assets/actuallyadditions/blockstates/coffee_machine_block.json @@ -104,12 +104,12 @@ a47d29d2eb95cddf2ac5df59cbf31218e7700c16 assets/actuallyadditions/blockstates/ph b7a0c0a866ff1999a1d535c4c2a394ec0843f6d1 assets/actuallyadditions/blockstates/phantomface_block.json 52f4a046c260601c7296aa9edc74c27d4ac7adec assets/actuallyadditions/blockstates/pillar_quartz_slab_block.json 1799f629b489dc495904c1da16cfd206f45a5ea6 assets/actuallyadditions/blockstates/pillar_quartz_stair_block.json -68f5b40d0e4794a77892042c61135faeecd180c6 assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json +975f9c728ef0245f73fef800ccc4033887ca25ec assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json b8427a1cca9f804adcc1a152431bab60bd567782 assets/actuallyadditions/blockstates/placer_block.json 287cd9934a8994cebfc48aefe93ee319388d7488 assets/actuallyadditions/blockstates/player_interface_block.json 9c2630971e5bca3643aa0acdf6156d6d48c8e03e assets/actuallyadditions/blockstates/quartz_slab_block.json 5d81e22fa5298607209db438065314e832ed98fb assets/actuallyadditions/blockstates/quartz_stair_block.json -d76abb7e8406b7b26c5588dc9d4923ed1c5c8949 assets/actuallyadditions/blockstates/quartz_wall_block.json +2371d095cc32e97aa8f1019e65d4a00823449bd2 assets/actuallyadditions/blockstates/quartz_wall_block.json c3cf146fb712a6ab4476201a471ac14e47f90c67 assets/actuallyadditions/blockstates/ranged_collector_block.json 1a8b5eba2d9250f53a5cd6548921ee4881dac687 assets/actuallyadditions/blockstates/rice_block.json 735f788ce8087bd794ddb94041c3208cd641f860 assets/actuallyadditions/blockstates/shock_suppressor_block.json @@ -122,150 +122,153 @@ bdf1cc88bd235a3ee9451feb8acc081f7b6745b7 assets/actuallyadditions/blockstates/tr 1e76d2e4596765fb35e4f61c4535a8dcd9dcd248 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -dd4330e43169fb9da1895aa9a20e0f12bf161a16 assets/actuallyadditions/models/block/atomic_reconstructor_block.json -f170f3914fad0b1cc655646a69ba556ebae8870e assets/actuallyadditions/models/block/battery_box_block.json -d85b193f32c90e3aa0b4e3070c01116af047972b assets/actuallyadditions/models/block/bio_reactor_block.json -bcc7fef96575c94d25c7526b3a3f18f6f9134e4e assets/actuallyadditions/models/block/black_lotus_block.json -5a7b0ac3b6d52bf79b34bbf1dcc994da4b2e417d assets/actuallyadditions/models/block/black_quartz_block.json -4991d7348e4135e8703b19bc207a53c855cfa201 assets/actuallyadditions/models/block/black_quartz_chiseled_block.json -56b73cdf46eb10249f4d0eb79c77755eb9ddbce5 assets/actuallyadditions/models/block/black_quartz_pillar_block.json -c997f267118eede76f5fa77f069de5edb9fb2165 assets/actuallyadditions/models/block/breaker_block.json -43f8c3fd6ee798cedc373e9bdc8529c6d7e738cd assets/actuallyadditions/models/block/canola_block.json -34d26265d3c67f1b4bffa46c7bff13b6eee10fbc assets/actuallyadditions/models/block/canola_press_block.json -9a540ad5a64f7dd345cb124ee8a61c0610617016 assets/actuallyadditions/models/block/charcoal_block.json -947d2b174d010a4a6f537f9e926783d4699dc597 assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json -ebcbbc677f8850b139601bf17812997219477c49 assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json -a75705e040a51eceeaf300e34eec5bffad79748e assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json -6468ba6539c8a36e344cdaca7e64dba20345a3f9 assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json -9ca419608ec0ed538fd9aa0654364a43b3e92942 assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json -3951e9c3e010977bc3d37a04aa0dff75afbc7245 assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json -56c68732f577a44d344ab016447e7ea270700301 assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json -fc0d2f2f6ecddda8f88caeb7b4bbc9e63873aff3 assets/actuallyadditions/models/block/coal_generator_block.json -ea5e0bbf8a3a3c4fec88d1a641d48807820b2ac5 assets/actuallyadditions/models/block/coffee_block.json -8bb6faf3ff24d0a4069b7c8fc18350452b4566be assets/actuallyadditions/models/block/coffee_machine_block.json -61b9c4b7462ae2b070527d2fb588f9f655f4fbfc assets/actuallyadditions/models/block/crystal_cluster_coal_block.json -5ea5fb295aebf200318b2de66b8ebbd9dc5258fc assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json -b692054db445b77de512a155a0e5ab6e7efae3cd assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json -9d6c63c152c0190628a03e70b968bc53a32d0c50 assets/actuallyadditions/models/block/crystal_cluster_iron_block.json -8fc2c5dcf8f77be1b4fecde4b4b253c9684bdde8 assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json -fe9a86ac0b3ff6106762a2122c2221f10c0043c9 assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json -e7eefea8337adf2770613a8dc6d2df5c5b1fd58f assets/actuallyadditions/models/block/crystal_diamond_block.json -67e7e3a858beb3a88d71ea22d73f45f13ee6c657 assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json -ab9bb91b505dfdfadcb367e6ee0750f0af464677 assets/actuallyadditions/models/block/crystal_emerald_block.json -5585a2cdda8a473883264ca3013fb6dff24a0580 assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json -0b5d824a6d1c3a89bc19a9f89644d16d9d9b92e1 assets/actuallyadditions/models/block/crystal_lapis_block.json -b6f95d6a4a10f4ca6b79a7361ad99611ce78212b assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json -636d107d5727992a6ae1d4857fca6d0c18751a94 assets/actuallyadditions/models/block/crystal_quarts_block.json -bac92041a1ec523abe294f2674edf7ffefc8d655 assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json -69d44cf764b527bb75f50fdc5c50b9e7ede83226 assets/actuallyadditions/models/block/crystal_redstone_block.json -779205582ccc2b2a41516e996566d9a315bc4b82 assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json -3af0a54fd52423fe4ed116ec67dea46a36a8537e assets/actuallyadditions/models/block/crystal_void_block.json -185cab480bec2938bbe71dfedaa2712eb1e11f41 assets/actuallyadditions/models/block/crystal_void_empowered_block.json -c7a5c4af2a641e8f48f274a707d6495547a46c5e assets/actuallyadditions/models/block/directional_breaker_block.json -a875de5e87f608567464e1cfcf9c6b415cde611d assets/actuallyadditions/models/block/display_stand_block.json -dbd845876a209da30a4c2943175bc6436edda03b assets/actuallyadditions/models/block/dropper_block.json -dd6d46b45d36ed5b50317c47d50d821142b1d3d8 assets/actuallyadditions/models/block/empowerer_block.json -4e6d503bc29c2ea9eb1b023da24cca4192ec4b71 assets/actuallyadditions/models/block/ender_casing_block.json -d3ed435fc7ff1d22ee2ae8b256cd3b38143fd023 assets/actuallyadditions/models/block/enderpearl_block.json -06fbea4e0dfd8f9f06063d8f4102d517a859b33d assets/actuallyadditions/models/block/energizer_block.json -a31e274ef397c11687d32035125d5defb936a7f8 assets/actuallyadditions/models/block/enervator_block.json -25cfc2e2e1bae8beafa2591454ad3644e02af192 assets/actuallyadditions/models/block/farmer_block.json -c3019d2022c20cd80ba1d0340d8024bf1bf56259 assets/actuallyadditions/models/block/feeder_block.json -d3eea111ce3ef556148919d1fa1178dbaff44a55 assets/actuallyadditions/models/block/fermenting_barrel_block.json -bb0c10836f35ba82bc9b55e0666e1d3c1cf5a170 assets/actuallyadditions/models/block/firework_box_block.json -0630831d55d8ecd79ec8aa051638201b7695eeca assets/actuallyadditions/models/block/fishing_net_block.json -9576e2a52a248d9e3212c3aba227fd12096d0431 assets/actuallyadditions/models/block/flax_block.json -7bc86aac638d155c1beac5a2477964a259c449e2 assets/actuallyadditions/models/block/fluid_collector_block.json -ef6d0a4a3ed76cd64a8c66d9c18bf276573ac906 assets/actuallyadditions/models/block/fluid_placer_block.json -6c5b8d73122d55634d9b75d439060efa3b97918d assets/actuallyadditions/models/block/furnace_double_block.json -f186b5c90635660b63f86429527ad01ea8a231c5 assets/actuallyadditions/models/block/furnace_solar_block.json -a49a45cd7eebd3a569aa0e38c10a9465901a85de assets/actuallyadditions/models/block/green_fence_block_post.json -da0f10044c7ebaa5949a4b39f5d395de2d000db5 assets/actuallyadditions/models/block/green_fence_block_side.json -bf24eed6407afb19ee72d141880742c6a77ed539 assets/actuallyadditions/models/block/green_slab_block.json -fafc763d366f1dfd8d74b06348c393d2dc43201b assets/actuallyadditions/models/block/green_slab_block_top.json -af5993f71e98cdf013aaccdd6c8db030aadb3cae assets/actuallyadditions/models/block/green_stairs_block.json -5115af18b13acf9611dcb373c5ac14d4fca45136 assets/actuallyadditions/models/block/green_stairs_block_inner.json -1161d98777eb3f330aaaa30f8458f4cf5a251c3b assets/actuallyadditions/models/block/green_stairs_block_outer.json -40eab5b2ce126d1a988b15f9e1b43fe5e1b570b5 assets/actuallyadditions/models/block/green_wall_block.json -2ff872de17a3a2400dba3729e25a4a5286d3733c assets/actuallyadditions/models/block/greenhouse_glass_block.json -67b2e0d35048b21f331ac9df8b692d074e2eee4e assets/actuallyadditions/models/block/grinder_block.json -55fce00247c514b61beadc2c3f0a442800c7a3e3 assets/actuallyadditions/models/block/grinder_double_block.json -505eabb3315098fc0728a57fe8f73a7b7b8080a8 assets/actuallyadditions/models/block/heat_collector_block.json -4ddb18c3a44cbb0b186e185c611211fc20d45bbd assets/actuallyadditions/models/block/inputter_advanced_block.json -23932cdb7b57e576017128c179dd136c8e0c8558 assets/actuallyadditions/models/block/inputter_block.json -45285ac49683ea5efebb0dde4d3413f33171f547 assets/actuallyadditions/models/block/iron_casing_block.json -5164f967c08ce01e7005dcb193c0ebffb3fc5f7d assets/actuallyadditions/models/block/iron_casing_snow_block.json -2fc2e4320bd8e5616acaef66874201d02159a899 assets/actuallyadditions/models/block/item_repairer_block.json -931b368264a0f2eb130cbb717c05897d89aeab30 assets/actuallyadditions/models/block/item_viewer_block.json -c97db418d656ef1d71b65001daa6bc9c0b726a1f assets/actuallyadditions/models/block/item_viewer_hopping_block.json -804608db62c843311b6d4a3fbd79a9c7af4ddcd0 assets/actuallyadditions/models/block/lamp_black_block.json -008df2b4f008914577e2085a365aa9758f635d6e assets/actuallyadditions/models/block/lamp_blue_block.json -bbca6e6656cde7cdd4038372d5bc32a6c21080b2 assets/actuallyadditions/models/block/lamp_brown_block.json -18a6ec214ea695159c59e54f510a38d6792c0d3a assets/actuallyadditions/models/block/lamp_cyan_block.json -2cbe606a4eea171b3d30553ca352da54cbea91c9 assets/actuallyadditions/models/block/lamp_gray_block.json -91fc4131b7dc9d9b4fd89b8dc50aa2648dc387ed assets/actuallyadditions/models/block/lamp_green_block.json -49a1a886cbcc328d5503ac6f432fc56a48bc25ac assets/actuallyadditions/models/block/lamp_light_blue_block.json -9778f9c3d49e209dd5a5c712ffd93e849ff90b50 assets/actuallyadditions/models/block/lamp_light_gray_block.json -7bd0e99bf6d6b5604a782af393bb1a8254a171f4 assets/actuallyadditions/models/block/lamp_lime_block.json -c8e99ee31ba90ad9916aa433ed2dae3c34ebd079 assets/actuallyadditions/models/block/lamp_magenta_block.json -9009e603bd5ebe340943872cca13564008aed505 assets/actuallyadditions/models/block/lamp_orange_block.json -5ab855e039485647d177f64c8f9f8c3b21e65cec assets/actuallyadditions/models/block/lamp_pink_block.json -5c24b6f53e4ab00ddc4e786a1d46b017d5464a6a assets/actuallyadditions/models/block/lamp_powerer_block.json -83459205bd0cfcd44168a16808ffc39b7d39e623 assets/actuallyadditions/models/block/lamp_purple_block.json -e0aeb2b48172556c53e5cf7d863e714943c2e640 assets/actuallyadditions/models/block/lamp_red_block.json -840350110b5a19be9989926f8491aa9add59e9cf assets/actuallyadditions/models/block/lamp_white_block.json -f666f07ee1edacf6f697fb1a6d3177ae598d66fe assets/actuallyadditions/models/block/lamp_yellow_block.json -dc1dfd9df237b3a1501cb3868f6685f6bd5a185e assets/actuallyadditions/models/block/laser_relay_advanced_block.json -6a88cabac37795c7ccc0760e12943d8863772665 assets/actuallyadditions/models/block/laser_relay_block.json -e7da5bf440254d82468d1df5acbb3dcb90e84a04 assets/actuallyadditions/models/block/laser_relay_extreme_block.json -6847e1668051998742e6298af47f0f449e7ee786 assets/actuallyadditions/models/block/laser_relay_fluids_block.json -57c0ee212f88886033c52eb313da47129561819a assets/actuallyadditions/models/block/laser_relay_item_block.json -859e260c9bdde7297b4a0bad9c9332a7f002f951 assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json -b4de772d025f12c08a8dac1445f7580cae88871e assets/actuallyadditions/models/block/lava_factory_case_block.json -8a20e0409c330cdf2da4b99d84e45741afe25c6b assets/actuallyadditions/models/block/lava_factory_controller_block.json -8657b955bed601a07d7991b292661b164d1d3b50 assets/actuallyadditions/models/block/leaf_generator_block.json -2503dc2264e67de49dab0988a1eb778b6f550289 assets/actuallyadditions/models/block/miner_block.json -728131b29861f73022e06d0698cf2c1721c3f1b1 assets/actuallyadditions/models/block/oil_generator_block.json -63eba7737e1675ae964156a8ae6209e3dc821aed assets/actuallyadditions/models/block/ore_black_quartz_block.json -1aa563dba9e336afab11ffbec370f1b1cb81436c assets/actuallyadditions/models/block/phantom_booster_block.json -10b0c032e68e5004b3755090f1c0a8d4daee098f assets/actuallyadditions/models/block/phantom_breaker_block.json -48fb48465a9fb1a9ccd43a99c8bbc8f0b18bd0fa assets/actuallyadditions/models/block/phantom_energyface_block.json -3b6c232824e504f19f2912c0553cb63188edf815 assets/actuallyadditions/models/block/phantom_liquiface_block.json -7ef65594e659acd21ef37d392ab93320f8e9281e assets/actuallyadditions/models/block/phantom_placer_block.json -8f9dfc2e4676632944fb65b55a15c5660ab4f1d0 assets/actuallyadditions/models/block/phantom_redstoneface_block.json -0436049dcdaeaf086bd3da26b46f61e77f157a34 assets/actuallyadditions/models/block/phantomface_block.json -2203f8054fa7b766b0f57a14025320a9177c6c03 assets/actuallyadditions/models/block/pillar_quartz_slab_block.json -cba0863f40d6b2e0091ff01881dcd5ed50ba0ed5 assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json -a4ff61952afb5155397f6be6ac97d0749a93cd28 assets/actuallyadditions/models/block/pillar_quartz_stair_block.json -2279a249d88241c47a98cbd29b1986e2749926e1 assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json -323d933ee326a90027fb757ab0216529838804d8 assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json -ca600d2a953881059efb109c2c7420db4053d836 assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json -b83b5719554e6b3905a1ec5165f0eebbf8befab0 assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json -eab176c8fc22d89f9ab24ca1d8e4af822cad7743 assets/actuallyadditions/models/block/placer_block.json -b75a74e81ec77cd75468bc20189a73b30977e649 assets/actuallyadditions/models/block/player_interface_block.json -17c087646c5730f54d5f5e04e604299c2c8ac117 assets/actuallyadditions/models/block/quartz_slab_block.json -59289143b6860aba089f293060610ad3f50106c0 assets/actuallyadditions/models/block/quartz_slab_block_top.json -4e9f8a973a1ac526d3c5a90de6e301eec93c0324 assets/actuallyadditions/models/block/quartz_stair_block.json -f5bcd9f8b3564a40ed7f2f4346c6f8ef08d9a6d1 assets/actuallyadditions/models/block/quartz_stair_block_inner.json -7e4f23333a44449846f33aed592100673b07ea4e assets/actuallyadditions/models/block/quartz_stair_block_outer.json -d8d9a981622694da0256ab2b23d46d74a5663d18 assets/actuallyadditions/models/block/quartz_wall_block_post.json -77f77120d525a467000ed9c94f51fbc9ae24cc3d assets/actuallyadditions/models/block/quartz_wall_block_side.json -5ef3fa66941bc1f259fec20e3f1ad991d414819a assets/actuallyadditions/models/block/ranged_collector_block.json -09709997c55db12c37687ba05d8aa8e2cecfecb3 assets/actuallyadditions/models/block/rice_block.json -9a0776cad5eee223192242762cf678a288c7f8dd assets/actuallyadditions/models/block/shock_suppressor_block.json -5a58300b6f95d43e03afaa93712b94ca453f39a5 assets/actuallyadditions/models/block/smiley_cloud_block.json -8383a5fed14c4be703ed192dc34a8ca1b53afac6 assets/actuallyadditions/models/block/tiny_torch_block.json -cab99a2132c9690a466a76798d6239eb47a65b4b assets/actuallyadditions/models/block/treasure_chest_block.json -1c8fbf8bdf2ef18ee668e763e6de44f17d9d7f53 assets/actuallyadditions/models/block/white_fence_block_post.json -91d916994f00c8f16f4fb9744d67f1510c037d05 assets/actuallyadditions/models/block/white_fence_block_side.json -cdb89776c44ffbac3ccb7ae05f7700c305ac45a4 assets/actuallyadditions/models/block/white_slab_block.json -8fb7013837b0d45b0845e58e7ca59ea39d1b6196 assets/actuallyadditions/models/block/white_slab_block_top.json -283788ba54c99be1148aff8e6f5f3025bfa064b1 assets/actuallyadditions/models/block/white_stairs_block.json -eb67df9e4952fd16c63e4e87ddea8810229ec4b2 assets/actuallyadditions/models/block/white_stairs_block_inner.json -4456b91ed9095423fa4cb9d761ad1bc1e5ef8cad assets/actuallyadditions/models/block/white_stairs_block_outer.json -29e7ec0c3a189e3e2b105fd798090493048432a7 assets/actuallyadditions/models/block/white_wall_block.json -b724b7ceb466def32502ed41a2ef2924d577eb75 assets/actuallyadditions/models/block/wood_casing_block.json -8b8ed043afb64f4e711ff0097b867927537a540f assets/actuallyadditions/models/block/xp_solidifier_block.json +cc4fcbe75d6f858567a944e45cdc49711ad4c2cc assets/actuallyadditions/models/block/atomic_reconstructor_block.json +16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json +fb5b5a6492a2f7b43b2e799552814d565492efcc assets/actuallyadditions/models/block/bio_reactor_block.json +0358fc25923f6372371abd6dda1a707527507158 assets/actuallyadditions/models/block/black_lotus_block.json +dba6e3ace0c0ef6ef37e8dc67eaad506e77e2a64 assets/actuallyadditions/models/block/black_quartz_block.json +7f1737933224e107ccaa3341d622d3f5775de11a assets/actuallyadditions/models/block/black_quartz_chiseled_block.json +109888f0b2c7bb052650228193e942e2e5c5ccf7 assets/actuallyadditions/models/block/black_quartz_pillar_block.json +4d18e37db96f00f8b03f94672e0bbc97a182eada assets/actuallyadditions/models/block/breaker_block.json +5c3b93a6cc338110d2e78be04672a649f6c00a11 assets/actuallyadditions/models/block/canola_block.json +0edc82457a023aeb3333dd407f98d5aa0812f020 assets/actuallyadditions/models/block/canola_press_block.json +49e551c7f9943bd24b1fa09fb65836bae48096df assets/actuallyadditions/models/block/charcoal_block.json +3d2254e3badb613b7c58bad482c14097fffd64e0 assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json +bcae388ebbfa2b232ca846dc2716e3e5b80b76a8 assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json +251b824d3db3f4b6386362169deaeae4b42fceb1 assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json +0397bb0900c2097dd492b3a3baf6ca77d9052b85 assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json +ebcbbd421acfefa3b558fa3bba1796ef06f1d659 assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json +b9d38b614addaf33c23103c63395b960b4797c27 assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json +1cb145ca56e990192a6ccdc04f671c12747cfb53 assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json +41b38f848e1ee3961822598df0fbac11142972e3 assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side_tall.json +d9a7faeb2b573f95671a1388f25f81aa61b893cb assets/actuallyadditions/models/block/coal_generator_block.json +69b6de2b698d71252c3d9490290a4aaba16cab3e assets/actuallyadditions/models/block/coffee_block.json +e2ef0ef11a8eee45d910cba9b9d8cccb8e9a98f1 assets/actuallyadditions/models/block/coffee_machine_block.json +4ea250bc55fb285869e2fb2ecc013906531c6b0e assets/actuallyadditions/models/block/crystal_cluster_coal_block.json +becdabd73080d54dca7458c8154edab74804a8bf assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json +46b1503bdcab1e6950055e7d2cb3b93f777679ee assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json +2ad97812f729cf8d3b73ce6e5a0fb3dcb6fb32df assets/actuallyadditions/models/block/crystal_cluster_iron_block.json +44655a87991b3a77af0e9a703bc0b1a9e87aecce assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json +34cf63f648b6c93ba3ea832b6bafbd6d733bdc6a assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json +4d6ec58c6a406ce28372e8c63d4ee9b3e72455c9 assets/actuallyadditions/models/block/crystal_diamond_block.json +a7e89e1627ad4c09f630061cdff92dbec6a08175 assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json +d3be2f622ef6578cd8123b2364a72977d16ef636 assets/actuallyadditions/models/block/crystal_emerald_block.json +2c175cb2d1387d5c570c61f906a985014796204a assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json +9990157c643ca3a7d4f39b185e11b3f5a8b9e8a2 assets/actuallyadditions/models/block/crystal_lapis_block.json +2dca2982e3c6534eab3b8d74f09c166c25d3b990 assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json +fa292041b8ff3c1565c60482352aa0c96c1e2efc assets/actuallyadditions/models/block/crystal_quarts_block.json +063f41a23cf8b34ce3b29494b20d31e385e1d69e assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json +15a39b6af7591dd0f3f67b73131a73bccc6d69fe assets/actuallyadditions/models/block/crystal_redstone_block.json +10dbf32cfafdd42007f333e7f2946cd608147031 assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json +6f515acf2903ad23021e470dc7d0f016e9108e22 assets/actuallyadditions/models/block/crystal_void_block.json +439eacc83f9a2e5778b709da3abb8721cf3d2ec7 assets/actuallyadditions/models/block/crystal_void_empowered_block.json +af4bfeab7bf1a893e9982655146405d4a72d2b5c assets/actuallyadditions/models/block/directional_breaker_block.json +836016ab9803036468cda84a801e2c4e284a2870 assets/actuallyadditions/models/block/display_stand_block.json +f1c3add14ec2f3623cc7ffb06e416212b5f251f5 assets/actuallyadditions/models/block/dropper_block.json +1498af32c8f0eb35cc0f887729d272b78e6c541a assets/actuallyadditions/models/block/empowerer_block.json +0f9c0ccc0f135aa9b1af5e6fc334069bfc8ed8c2 assets/actuallyadditions/models/block/ender_casing_block.json +68126e3b5f9697c9b8c9ab8a1c22aaec223e08aa assets/actuallyadditions/models/block/enderpearl_block.json +1adbe21348ab1d204a96720aa8026f88e0da1caf assets/actuallyadditions/models/block/energizer_block.json +933a69e02050a935df270bf5ab463326955d15d0 assets/actuallyadditions/models/block/enervator_block.json +0fc00cb34d240fb8877f985e80dc9c884483a5f2 assets/actuallyadditions/models/block/farmer_block.json +105e7c553b839ec8025a91e2a53d81ae06f8c88c assets/actuallyadditions/models/block/feeder_block.json +9e486c09965b04ce25ddc61415ba496b0a3e6abe assets/actuallyadditions/models/block/fermenting_barrel_block.json +7aaac2625165e6e5e8634af74f46000eb28112b4 assets/actuallyadditions/models/block/firework_box_block.json +5e00be17b500f760df74f8046256f00e4ed1b3ed assets/actuallyadditions/models/block/fishing_net_block.json +801e34d17405a20062b5c72d362b9ae8fa3bc0be assets/actuallyadditions/models/block/flax_block.json +992c7f7cd2fd6bb80e84eef60930090e88aa9fe0 assets/actuallyadditions/models/block/fluid_collector_block.json +6d67b2ecdbbb8be56db49d0d28369211d7ca1ea6 assets/actuallyadditions/models/block/fluid_placer_block.json +97fd2df8af4218acb9da3cb3c513bf96f8854453 assets/actuallyadditions/models/block/furnace_double_block.json +b99d5254f05d62c6b3bf99cb8f7e74bd83296873 assets/actuallyadditions/models/block/furnace_solar_block.json +e8dceb40a71c3ea189142644879788ae27880bb4 assets/actuallyadditions/models/block/green_fence_block_post.json +7f15bdad8ea0ad26dc1f2f010b980c0b42b78297 assets/actuallyadditions/models/block/green_fence_block_side.json +7dc664f89cf7cd765a556b6595cbec9647d14b36 assets/actuallyadditions/models/block/green_slab_block.json +8478d3ca4c1c2b5515e19b3cb9f729bad3049e77 assets/actuallyadditions/models/block/green_slab_block_top.json +c7115f4ed8dff2277f5b613660d0d877ff80b769 assets/actuallyadditions/models/block/green_stairs_block.json +2338c4c2cf06951c7372b41239f763fb998d8c09 assets/actuallyadditions/models/block/green_stairs_block_inner.json +4bbd7c12f37b81aa243964b0c2d6f54efaae45b1 assets/actuallyadditions/models/block/green_stairs_block_outer.json +9efbbb43248fe7829ac93cfeb6f66ef84299972a assets/actuallyadditions/models/block/green_wall_block.json +fb6a2fdf86c26ea81bcde867e259b25681b6c010 assets/actuallyadditions/models/block/greenhouse_glass_block.json +c74c0b979b4b97611a41d94c489ba4a61e61018d assets/actuallyadditions/models/block/grinder_block.json +ad1a4e82aebb7be1f4270497ccbcd0bda53786fd assets/actuallyadditions/models/block/grinder_double_block.json +c5dd93f040f3e4fc68f10570262dccdd7a426244 assets/actuallyadditions/models/block/heat_collector_block.json +9f01386f2e051bc9d0a2d574d411561e22b77437 assets/actuallyadditions/models/block/inputter_advanced_block.json +c2ddb2191b6e38217fc7d696819c54849b93ac9e assets/actuallyadditions/models/block/inputter_block.json +9739b23c33c8d947fbd5144edc11c7f333de413b assets/actuallyadditions/models/block/iron_casing_block.json +7f3c845740543bddc867ed2f047e866dfffc6697 assets/actuallyadditions/models/block/iron_casing_snow_block.json +c4900a07f08780d97dabb77c9de00d059afdf322 assets/actuallyadditions/models/block/item_repairer_block.json +fde571d038e6adc16d4c667b8629ad8f857da749 assets/actuallyadditions/models/block/item_viewer_block.json +a2f7096ead7a3827e0ca7bc3f3bcb93d67ad02d3 assets/actuallyadditions/models/block/item_viewer_hopping_block.json +b867c090a5382962a8873532ea824645e279d1f1 assets/actuallyadditions/models/block/lamp_black_block.json +445ccde39132f123170cb5a7de0c30cf202f0c09 assets/actuallyadditions/models/block/lamp_blue_block.json +c4e348b4ae72830389c1783dd6c56526d89c369c assets/actuallyadditions/models/block/lamp_brown_block.json +6d41a20a57e4f2875d13ed0e361380600346eeb5 assets/actuallyadditions/models/block/lamp_cyan_block.json +78cd33bf32e7da43b6a1401108d8cabbbad52cd6 assets/actuallyadditions/models/block/lamp_gray_block.json +271e4f4db56fa5d3228d1906942feec09ea8168e assets/actuallyadditions/models/block/lamp_green_block.json +b62fa75409cddb78cea7b422a5f0f603bc2f0bb6 assets/actuallyadditions/models/block/lamp_light_blue_block.json +87c2fa382e98e6ff5761384ddcda7ef3311d034d assets/actuallyadditions/models/block/lamp_light_gray_block.json +146ec6deaeeea5c9c8242bc074089addfa0633f5 assets/actuallyadditions/models/block/lamp_lime_block.json +394be0fd7dd2a93e07d6e8188a78a0dfa3432c20 assets/actuallyadditions/models/block/lamp_magenta_block.json +86a636fc6a5745f7813288f9511dcee1e5b9d973 assets/actuallyadditions/models/block/lamp_orange_block.json +abfdb2ef140fcc7840c52b92d1619888e98ad148 assets/actuallyadditions/models/block/lamp_pink_block.json +e6e8654243c74044143a0b3eedc6be3ecf23533a assets/actuallyadditions/models/block/lamp_powerer_block.json +4bc54a3b954b460e4a1377647be3640da1645f8f assets/actuallyadditions/models/block/lamp_purple_block.json +ec45ec1bf4905e284e7ac658776e2dab71866ff7 assets/actuallyadditions/models/block/lamp_red_block.json +57fe02e80d34899d4b0242da97670de34c2112fc assets/actuallyadditions/models/block/lamp_white_block.json +50ed4e1ef3fde3389a0facdbb8b71be08604edcd assets/actuallyadditions/models/block/lamp_yellow_block.json +ef0c07b81b1e664c03784342469e1c965056f828 assets/actuallyadditions/models/block/laser_relay_advanced_block.json +48fde7eed178dadfbf2960ff37c14b93ff8930bd assets/actuallyadditions/models/block/laser_relay_block.json +8cfd7b217ba4621e8dccc7dbbf0fbe863e54ed3f assets/actuallyadditions/models/block/laser_relay_extreme_block.json +ec228780157fa6ce4fa5a5538a8a45b688e56f4d assets/actuallyadditions/models/block/laser_relay_fluids_block.json +eca990b256131ccb403adbf9d240e3ce047defb2 assets/actuallyadditions/models/block/laser_relay_item_block.json +ffd4b90c7129a76d928d542fb8a286ca18876fa8 assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json +4a334b0f83aa2ce80b679114f49f1db83b1317b1 assets/actuallyadditions/models/block/lava_factory_case_block.json +096e3debb3967eec7d4f5dfb1da1fecece6e6f70 assets/actuallyadditions/models/block/lava_factory_controller_block.json +7d087ae2b9fd29b87e90d96f22816706a9dc2966 assets/actuallyadditions/models/block/leaf_generator_block.json +f8f604945995e928eec8b6b86b67a54e9170640a assets/actuallyadditions/models/block/miner_block.json +3147b5c3061ee811c90f8e2124a31238932e90f5 assets/actuallyadditions/models/block/oil_generator_block.json +034fa56048dfdb6d489890050cf078e20dec2e39 assets/actuallyadditions/models/block/ore_black_quartz_block.json +9875d8478c70e82d50f07ef46b972e3deca2c51e assets/actuallyadditions/models/block/phantom_booster_block.json +4b77c724124be7239e13359f70c029a485c3b2aa assets/actuallyadditions/models/block/phantom_breaker_block.json +9a3893bbeac2f5dcc9f1d983302d1a78f16c5ee3 assets/actuallyadditions/models/block/phantom_energyface_block.json +ded3687763c370df87b1dd639786780dc607d5a2 assets/actuallyadditions/models/block/phantom_liquiface_block.json +adfc6bf3c16fb3fcdec3d7cc0a0534b9a88fc719 assets/actuallyadditions/models/block/phantom_placer_block.json +9436afe3e0d94ddb286863b43aabc163dd680477 assets/actuallyadditions/models/block/phantom_redstoneface_block.json +a9e25e4cbbe51bb6a51d79b999a56a7b6ea36bec assets/actuallyadditions/models/block/phantomface_block.json +0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/pillar_quartz_slab_block.json +b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json +480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/pillar_quartz_stair_block.json +a1c50e555b7742b8215806214ceb6bfc5b728155 assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json +d229a8d1ae3e1644d83c85ef1edafb7a0d923e70 assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json +5e370e4176e71c8755c84c9b0cd3ae4994501aac assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json +b89da02bf59fe8c49c1fdbc436219bfc202151f9 assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json +a4dfc98dbd73ba2759b0cd6f20d7e21eb9d0ee0a assets/actuallyadditions/models/block/pillar_quartz_wall_block_side_tall.json +d205a86ca92ffdd06b7ecc60ce18cf5de0a392c8 assets/actuallyadditions/models/block/placer_block.json +0836a6dde9651cd21ee4fffd3cca88232ac6e925 assets/actuallyadditions/models/block/player_interface_block.json +83d41e95a7d032dc6ce960ebbaa9d808a1d44126 assets/actuallyadditions/models/block/quartz_slab_block.json +02b5f964815edb299171a220b104042fe793a837 assets/actuallyadditions/models/block/quartz_slab_block_top.json +7f3141ee52fe873a17a5d0210a43d4a94fb3465a assets/actuallyadditions/models/block/quartz_stair_block.json +72d00d5d8723ec0d3b953a9ccac5f09e0ffedf4d assets/actuallyadditions/models/block/quartz_stair_block_inner.json +f277709029801d7292d300b13876189a32d1b3a4 assets/actuallyadditions/models/block/quartz_stair_block_outer.json +93b61ddd8e53f61ca25c4768de3a3b95a23297b4 assets/actuallyadditions/models/block/quartz_wall_block_post.json +1c617e7845d3211b4f7cda38a9bee59208de8c23 assets/actuallyadditions/models/block/quartz_wall_block_side.json +46c7aa812a7af600d4f927eba5fa3f5b4956fa28 assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json +22719a41dff1dad8c02ee7489142249c72d690b1 assets/actuallyadditions/models/block/ranged_collector_block.json +12b2c1647534d2cc5cb6df7446cf34377c56f64a assets/actuallyadditions/models/block/rice_block.json +b3be81956ac79cbccc690e66589f362aecc7caf1 assets/actuallyadditions/models/block/shock_suppressor_block.json +4e64efe87f0364f0d94a94bda701673994825e1b assets/actuallyadditions/models/block/smiley_cloud_block.json +d4566284fbb72145915dd3c7804f674f8d1c98be assets/actuallyadditions/models/block/tiny_torch_block.json +18d7ca4ca3d062756fb9455258a070c4580413dc assets/actuallyadditions/models/block/treasure_chest_block.json +45bf495c1cf419512139b2fc1c2a5e9b96ba9296 assets/actuallyadditions/models/block/white_fence_block_post.json +d597a9b7cc805de40b04f768c2bba1d4274e4806 assets/actuallyadditions/models/block/white_fence_block_side.json +f897a126aaef29c26152725f89b860570c392be3 assets/actuallyadditions/models/block/white_slab_block.json +dbe133d943d82467857fcfad45efc16a6c8eae6d assets/actuallyadditions/models/block/white_slab_block_top.json +e15ab8887f2dc7cb3053e5de36459b4674bfa3cd assets/actuallyadditions/models/block/white_stairs_block.json +d902b69fd284f4d1b434e5f216ea6373ad25b56f assets/actuallyadditions/models/block/white_stairs_block_inner.json +e2e134c8211fad3af8101068eaa8e3a7a7054b10 assets/actuallyadditions/models/block/white_stairs_block_outer.json +a6297276b8e80986289d808fb9de1202ce342080 assets/actuallyadditions/models/block/white_wall_block.json +51dfe7c1ab6f58f20395d921e475867ce35950b4 assets/actuallyadditions/models/block/wood_casing_block.json +d9c371a1569a8bfdaa4c6d2f90af550e28378772 assets/actuallyadditions/models/block/xp_solidifier_block.json 0d4828e975031e17a4a424d3b30d7e0f1f67db55 assets/actuallyadditions/models/item/atomic_reconstructor_block.json 79997f39e94dc9b67a2e4b0ee71938651d872904 assets/actuallyadditions/models/item/battery_box_block.json 07ad7900cb640f36da5a94953203d2ec1d9be705 assets/actuallyadditions/models/item/bio_reactor_block.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json index 32c0c6d5d..611379583 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json @@ -10,7 +10,27 @@ }, { "when": { - "north": "true" + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" }, "apply": { "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", @@ -19,7 +39,16 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", - "y": 90, + "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json index 4ea6624c4..eeb9322ef 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json @@ -10,7 +10,27 @@ }, { "when": { - "north": "true" + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/pillar_quartz_wall_block_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" }, "apply": { "model": "actuallyadditions:block/pillar_quartz_wall_block_side", @@ -19,7 +39,16 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "actuallyadditions:block/pillar_quartz_wall_block_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "actuallyadditions:block/pillar_quartz_wall_block_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side", - "y": 90, + "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json index 8d6715ff8..e68bdc088 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json @@ -10,7 +10,27 @@ }, { "when": { - "north": "true" + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/quartz_wall_block_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" }, "apply": { "model": "actuallyadditions:block/quartz_wall_block_side", @@ -19,7 +39,16 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "actuallyadditions:block/quartz_wall_block_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "actuallyadditions:block/quartz_wall_block_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side", - "y": 90, + "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json b/src/generated/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json index 8d7ed86ad..13d16a380 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/atomic_reconstructor_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/battery_box_block.json b/src/generated/resources/assets/actuallyadditions/models/block/battery_box_block.json index 14c96b6be..2684e20f1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/battery_box_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/battery_box_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/battery_box_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/bio_reactor_block.json b/src/generated/resources/assets/actuallyadditions/models/block/bio_reactor_block.json index 02200cfaf..812b777b1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/bio_reactor_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/bio_reactor_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/bio_reactor_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json index d64c6802a..4075c61f8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/black_lotus_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_block.json index 7f8c990c9..a3b0c38cd 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/black_quartz_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json index 96d1c6c06..402b83740 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/black_quartz_chiseled_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json index b03faaaba..d58ef3d3d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/black_quartz_pillar_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/breaker_block.json b/src/generated/resources/assets/actuallyadditions/models/block/breaker_block.json index 04a090625..5edfa7b7f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/breaker_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/breaker_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/breaker_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/canola_block.json b/src/generated/resources/assets/actuallyadditions/models/block/canola_block.json index ab3d8a981..1bf274ab2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/canola_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/canola_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/canola_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/canola_press_block.json b/src/generated/resources/assets/actuallyadditions/models/block/canola_press_block.json index f05055380..cf86859db 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/canola_press_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/canola_press_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/canola_press_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json b/src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json index c6a114b53..2f90e93a1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/charcoal_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json index 50f179881..451112615 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "actuallyadditions:block/black_quartz_chiseled_block", "bottom": "actuallyadditions:block/black_quartz_chiseled_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json index cc58d8e41..9985ee09f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "actuallyadditions:block/black_quartz_chiseled_block", "bottom": "actuallyadditions:block/black_quartz_chiseled_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json index 0ad00cc7d..b2ba3a50f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "actuallyadditions:block/black_quartz_chiseled_block", "bottom": "actuallyadditions:block/black_quartz_chiseled_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json index 1afb56868..c13b12544 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_chiseled_block", "bottom": "actuallyadditions:block/black_quartz_chiseled_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json index 7a241ed9c..091e7d427 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_chiseled_block", "bottom": "actuallyadditions:block/black_quartz_chiseled_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json index 7ae205b4c..abe54cab9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_post", + "parent": "minecraft:block/template_wall_post", "textures": { "wall": "actuallyadditions:block/black_quartz_chiseled_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json index aeec94bc7..d290a13bd 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_side", + "parent": "minecraft:block/template_wall_side", "textures": { "wall": "actuallyadditions:block/black_quartz_chiseled_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side_tall.json new file mode 100644 index 000000000..f7150011c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_chiseled_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coal_generator_block.json b/src/generated/resources/assets/actuallyadditions/models/block/coal_generator_block.json index 6cb7f276e..92d11974a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coal_generator_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coal_generator_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/coal_generator_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee_block.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee_block.json index 118ae6824..2060e2352 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coffee_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/coffee_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee_machine_block.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee_machine_block.json index 6f5c941f0..f8482e186 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coffee_machine_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee_machine_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/coffee_machine_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json index 15f12a208..b2f3ee6ed 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_coal_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json index 1b8ec79cc..c6a31b8ea 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_diamond_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json index 6b71354cf..b40842e59 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_emerald_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json index 17aa98ae6..34ff2733a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_iron_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json index e37a69dfb..c060ad102 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_lapis_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json index 090e25c5c..4fc60cc61 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_cluster_redstone_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json index d7372f988..c4098bcbc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_diamond_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json index e9a3b6f90..6adc3b109 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_diamond_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json index bccdad282..a740d3094 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_emerald_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json index ee0f8be3a..e9b21b0a8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_emerald_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json index 26972fc3a..2f02cabec 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_lapis_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json index 65358f4fa..7bd961856 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_lapis_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json index 346672431..9d5c28a2c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_quarts_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json index 9045903d8..dd133f1cc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_quarts_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json index 1733eff22..1ef29395d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_redstone_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json index be58789d4..b301c439a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_redstone_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_block.json index 2d71d8a75..432f6023c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_void_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json index 1b0628c9b..b6c4308e9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/crystal_void_empowered_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/directional_breaker_block.json b/src/generated/resources/assets/actuallyadditions/models/block/directional_breaker_block.json index bdd6a6d43..736147eb9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/directional_breaker_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/directional_breaker_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/directional_breaker_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/display_stand_block.json b/src/generated/resources/assets/actuallyadditions/models/block/display_stand_block.json index 935a08ca6..7a9091101 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/display_stand_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/display_stand_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/display_stand_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/dropper_block.json b/src/generated/resources/assets/actuallyadditions/models/block/dropper_block.json index 62c4bba72..fa1209464 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/dropper_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/dropper_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/dropper_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/empowerer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowerer_block.json index de1d25fa3..46e7e706c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/empowerer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowerer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/empowerer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ender_casing_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ender_casing_block.json index 4f44b06c2..ea2d09e43 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/ender_casing_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/ender_casing_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/ender_casing_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/enderpearl_block.json b/src/generated/resources/assets/actuallyadditions/models/block/enderpearl_block.json index 1c2b2918c..b68e73c25 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/enderpearl_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/enderpearl_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/enderpearl_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/energizer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/energizer_block.json index 2690446de..de804a0ef 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/energizer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/energizer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/energizer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/enervator_block.json b/src/generated/resources/assets/actuallyadditions/models/block/enervator_block.json index 62993915a..04479ef11 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/enervator_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/enervator_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/enervator_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/farmer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/farmer_block.json index f7b90dd09..4270c3c91 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/farmer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/farmer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/farmer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/feeder_block.json b/src/generated/resources/assets/actuallyadditions/models/block/feeder_block.json index 48a6b67b8..74044dd48 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/feeder_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/feeder_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/feeder_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json index d5a5d1568..b97506431 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/fermenting_barrel_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/firework_box_block.json b/src/generated/resources/assets/actuallyadditions/models/block/firework_box_block.json index f6dc44723..c27b67b81 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/firework_box_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/firework_box_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/firework_box_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json index a023284ea..1d1851e86 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/fishing_net_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/flax_block.json b/src/generated/resources/assets/actuallyadditions/models/block/flax_block.json index 734ece169..f7fba2d1d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/flax_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/flax_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/flax_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fluid_collector_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fluid_collector_block.json index c700e0f4f..62bd6f283 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/fluid_collector_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/fluid_collector_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/fluid_collector_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fluid_placer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fluid_placer_block.json index d7820c76d..8ec1f9a1f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/fluid_placer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/fluid_placer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/fluid_placer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json b/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json index f685baa86..241977d3d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/furnace_double_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json b/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json index 00b830807..949f73954 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/furnace_solar_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json index 488a9566b..7cae4cc31 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_post", + "parent": "minecraft:block/fence_post", "textures": { "texture": "actuallyadditions:block/green_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json index 8c38c6e14..dfd3dfd95 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_side", + "parent": "minecraft:block/fence_side", "textures": { "texture": "actuallyadditions:block/green_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json index 53bd4c076..022619632 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "actuallyadditions:block/green_wall_block", "bottom": "actuallyadditions:block/green_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json index abaa0edda..8acfc9f7c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "actuallyadditions:block/green_wall_block", "bottom": "actuallyadditions:block/green_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json index 9481443fc..67de62444 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "actuallyadditions:block/green_wall_block", "bottom": "actuallyadditions:block/green_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json index 38ab22265..15f80f8b9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "actuallyadditions:block/green_wall_block", "bottom": "actuallyadditions:block/green_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json index 0e534ea57..9821c83f4 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "actuallyadditions:block/green_wall_block", "bottom": "actuallyadditions:block/green_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json index 61128053e..847f55a2b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/green_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json b/src/generated/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json index 4902ceddf..76a8ff411 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/greenhouse_glass_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json b/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json index eeb9b9169..179cbad5e 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/grinder_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json b/src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json index 9a9195c10..0dfa5b0ea 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/grinder_double_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/heat_collector_block.json b/src/generated/resources/assets/actuallyadditions/models/block/heat_collector_block.json index 86854fd54..3e48fca4f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/heat_collector_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/heat_collector_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/heat_collector_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json index bd2f3c83b..8b6356d28 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/inputter_advanced_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json b/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json index 9338954ff..3b55364ac 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/inputter_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_block.json b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_block.json index 325e4ae30..673f31063 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/iron_casing_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json index dfee42b56..bc9116c9f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/iron_casing_snow_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json index 68d043e71..7aff24f6c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/item_repairer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json index 51ad014a5..9cb24380e 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/item_viewer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json index 79cb6e8b9..a000ad6bc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/item_viewer_hopping_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_black_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black_block.json index 8350d48c5..44527d0d1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_black_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_black_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue_block.json index e6af106b7..9cbeea4ef 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_blue_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown_block.json index b6a3d8f1f..626db0d7a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_brown_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json index f54accd40..688d70e65 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_cyan_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray_block.json index 2e0d90b63..4bf8865ad 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_gray_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_green_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green_block.json index 6ad93c377..6d9efa6db 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_green_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_green_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json index 302777e07..0b470891c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_light_blue_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json index 61710f77c..6cf1055f3 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_light_gray_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime_block.json index 32d741204..4963e7182 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_lime_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json index 0f6a5747c..bb44f0f45 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_magenta_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange_block.json index dea2af863..9e48bae8f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_orange_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink_block.json index 330f5151e..6dcf9fabe 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_pink_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json index f848b09c9..03f775415 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_powerer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple_block.json index 4df428b29..49752de04 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_purple_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_red_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red_block.json index df6be966a..c2cb786d6 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_red_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_red_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_white_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white_block.json index f941b793d..0f2589124 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_white_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_white_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json index cff33f0dc..47cebabcc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lamp_yellow_on_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json index bef87b572..ee3046ac8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_advanced_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json index e949d09a7..c2f84c888 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json index d0463c654..0871e5ea8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_extreme_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json index 38e93cd9d..bb73b2078 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_fluids_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json index 24841f410..53e0fd742 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_item_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json index d06e4ac0c..dd1c2a117 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/laser_relay_item_whitelist_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json index 8f5862e18..e5a52d44c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lava_factory_case_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json index b75fc92cc..c8c8cc175 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/lava_factory_controller_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/leaf_generator_block.json b/src/generated/resources/assets/actuallyadditions/models/block/leaf_generator_block.json index a604f4974..cce13a091 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/leaf_generator_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/leaf_generator_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/leaf_generator_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/miner_block.json b/src/generated/resources/assets/actuallyadditions/models/block/miner_block.json index 5a978e932..53eb9c674 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/miner_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/miner_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/miner_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/oil_generator_block.json b/src/generated/resources/assets/actuallyadditions/models/block/oil_generator_block.json index b60e82e9b..6df91ca04 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/oil_generator_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/oil_generator_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/oil_generator_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json index b0bce669c..29c89c43f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/ore_black_quartz_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_booster_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_booster_block.json index a7b403e3a..d60be692a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_booster_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_booster_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_booster_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json index 548e54240..628203153 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_breaker_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json index 69bb4a639..6255ba9b8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_energyface_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json index 54fbb504b..d5bd6451a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_liquiface_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_placer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_placer_block.json index 69c10e71b..b140b7f3b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_placer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_placer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_placer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json index a24da4f0c..515f6a665 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantom_redstoneface_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/phantomface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/phantomface_block.json index 6d109ec6f..9f2f9cdac 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/phantomface_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/phantomface_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/phantomface_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json index 68f296c4a..0a0f23623 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "actuallyadditions:block/black_quartz_pillar_block", "bottom": "actuallyadditions:block/black_quartz_pillar_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json index cf681db9b..d78688a40 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "actuallyadditions:block/black_quartz_pillar_block", "bottom": "actuallyadditions:block/black_quartz_pillar_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json index d88773b37..4f2d05ff7 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "actuallyadditions:block/black_quartz_pillar_block", "bottom": "actuallyadditions:block/black_quartz_pillar_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json index 73ef68e1c..9260827f8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_pillar_block", "bottom": "actuallyadditions:block/black_quartz_pillar_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json index 20fcc94fd..8f066f932 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_pillar_block", "bottom": "actuallyadditions:block/black_quartz_pillar_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json index f0f338ddf..5a2062f9b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_post", + "parent": "minecraft:block/template_wall_post", "textures": { "wall": "actuallyadditions:block/black_quartz_pillar_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json index 13c83da3d..98be3ea92 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_side", + "parent": "minecraft:block/template_wall_side", "textures": { "wall": "actuallyadditions:block/black_quartz_pillar_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side_tall.json new file mode 100644 index 000000000..76f000e96 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_pillar_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/placer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/placer_block.json index 5f057309b..8f8c3b11c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/placer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/placer_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/placer_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/player_interface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/player_interface_block.json index f38463e29..b58bbb491 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/player_interface_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/player_interface_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/player_interface_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json index 41f9ca7fe..10b5c29ff 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "actuallyadditions:block/black_quartz_block", "bottom": "actuallyadditions:block/black_quartz_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json index a5138a941..b3c597dc9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "actuallyadditions:block/black_quartz_block", "bottom": "actuallyadditions:block/black_quartz_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json index 4afa0657e..285f6236b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "actuallyadditions:block/black_quartz_block", "bottom": "actuallyadditions:block/black_quartz_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json index 244a99e46..ca5a0895d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_block", "bottom": "actuallyadditions:block/black_quartz_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json index 5d72cb72f..79039e653 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "actuallyadditions:block/black_quartz_block", "bottom": "actuallyadditions:block/black_quartz_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json index 9cf333ceb..f06e99665 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_post", + "parent": "minecraft:block/template_wall_post", "textures": { "wall": "actuallyadditions:block/black_quartz_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json index 21344b22f..9f888e2d2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json @@ -1,5 +1,5 @@ { - "parent": "block/template_wall_side", + "parent": "minecraft:block/template_wall_side", "textures": { "wall": "actuallyadditions:block/black_quartz_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json new file mode 100644 index 000000000..8040b4b2a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/black_quartz_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ranged_collector_block.json b/src/generated/resources/assets/actuallyadditions/models/block/ranged_collector_block.json index 84641f332..e047b0673 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/ranged_collector_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/ranged_collector_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/ranged_collector_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/rice_block.json b/src/generated/resources/assets/actuallyadditions/models/block/rice_block.json index c0d1b5ace..2a3e7f989 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/rice_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/rice_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/rice_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json b/src/generated/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json index d67f3c3c2..377b4daff 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/shock_suppressor_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json b/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json index 6e9925eb2..e7e3fdb2d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/smiley_cloud_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/tiny_torch_block.json b/src/generated/resources/assets/actuallyadditions/models/block/tiny_torch_block.json index 4b5ccce99..ed85c7b4a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/tiny_torch_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/tiny_torch_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/tiny_torch_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json b/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json index b78088300..3e649e5ae 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/treasure_chest_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json index 548e35faa..c3116fda5 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_post", + "parent": "minecraft:block/fence_post", "textures": { "texture": "actuallyadditions:block/white_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json index e0d34418a..c5e2b9c37 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_side", + "parent": "minecraft:block/fence_side", "textures": { "texture": "actuallyadditions:block/white_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json index 453ad4075..6a19866ab 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json @@ -1,5 +1,5 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { "side": "actuallyadditions:block/white_wall_block", "bottom": "actuallyadditions:block/white_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json index 97152d6ba..3823d601c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json @@ -1,5 +1,5 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { "side": "actuallyadditions:block/white_wall_block", "bottom": "actuallyadditions:block/white_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json index 00e7fbf50..c7af75a6b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { "side": "actuallyadditions:block/white_wall_block", "bottom": "actuallyadditions:block/white_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json index 988b95771..7b1b86e6a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json @@ -1,5 +1,5 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { "side": "actuallyadditions:block/white_wall_block", "bottom": "actuallyadditions:block/white_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json index 5eb7a742b..fa4498e28 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json @@ -1,5 +1,5 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { "side": "actuallyadditions:block/white_wall_block", "bottom": "actuallyadditions:block/white_wall_block", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json index b83e1cea4..c41d4303d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/white_wall_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/wood_casing_block.json b/src/generated/resources/assets/actuallyadditions/models/block/wood_casing_block.json index a6cc53cc0..eccc2e0af 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/wood_casing_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/wood_casing_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/wood_casing_block" } diff --git a/src/generated/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json b/src/generated/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json index 24edaa33f..dc5562046 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "actuallyadditions:block/xp_solidifier_block" } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java index fa294c31e..3b4d63baa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/types/Crystals.java @@ -21,7 +21,7 @@ public enum Crystals implements IStringSerializable { } @Override - public String getName() { + public String getString() { return this.name; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java index df3d8243c..fe30f066b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java @@ -2,7 +2,7 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import net.minecraft.data.DataGenerator; -import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java index 673b4b99a..c286ceae9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -8,7 +8,7 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.common.data.ExistingFileHelper; import java.util.function.Supplier; diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java index 409990916..3cf2325a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java @@ -4,9 +4,9 @@ import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; -import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.fml.RegistryObject; public class GeneratorItemModels extends ItemModelProvider { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3c28d790e..37ff221bd 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,10 +1,11 @@ modLoader="javafml" -loaderVersion="[31,)" +loaderVersion="[34,)" issueTrackerURL="http://github.com/Ellpeck/ActuallyAdditions/issues" displayURL="http://github.com/Ellpeck/ActuallyAdditions" logoFile="logo.png" credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp" authors="Ellpeck" +license="MIT" [[mods]] modId="actuallyadditions" @@ -12,16 +13,9 @@ authors="Ellpeck" displayName="Actually Additions" description="Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!" - [[dependencies.actuallyadditions]] - modId="forge" - mandatory=true - versionRange="[31.2,)" - ordering="NONE" - side="BOTH" - - [[dependencies.actuallyadditions]] - modId="minecraft" - mandatory=true - versionRange="[1.15.2]" - ordering="NONE" - side="BOTH" \ No newline at end of file +[[dependencies.actuallyadditions]] + modId="forge" + mandatory=true + versionRange="[34,)" + ordering="NONE" + side="BOTH" \ No newline at end of file