From f2429457914ffbf10e0ed6f055fe9c20883948aa Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 21 Nov 2020 13:11:30 +0000 Subject: [PATCH] Hmm, all the fixes :cry: --- src/generated/resources/.cache/cache | 260 +++++++++--------- .../advanced_item_laser_relay_block.json | 7 + ... => black_chiseled_quartz_slab_block.json} | 4 +- ...=> black_chiseled_quartz_stair_block.json} | 80 +++--- ... => black_chiseled_quartz_wall_block.json} | 18 +- ...on => black_pillar_quartz_slab_block.json} | 4 +- ...n => black_pillar_quartz_stair_block.json} | 80 +++--- ...on => black_pillar_quartz_wall_block.json} | 18 +- ...lock.json => black_quartz_slab_block.json} | 4 +- ...ock.json => black_quartz_stair_block.json} | 80 +++--- ...lock.json => black_quartz_wall_block.json} | 18 +- .../blockstates/crusher_block.json | 7 + .../blockstates/crusher_double_block.json | 7 + .../crystal_cluster_coal_block.json | 7 - .../crystal_cluster_diamatine_block.json | 7 + .../crystal_cluster_diamond_block.json | 7 - .../crystal_cluster_emeradic_block.json | 7 + .../crystal_cluster_emerald_block.json | 7 - .../crystal_cluster_enori_block.json | 7 + .../crystal_cluster_iron_block.json | 7 - .../crystal_cluster_lapis_block.json | 7 - .../crystal_cluster_palis_block.json | 7 + .../crystal_cluster_redstone_block.json | 7 - .../crystal_cluster_restonia_block.json | 7 + .../crystal_cluster_void_block.json | 7 + .../blockstates/crystal_diamatine_block.json | 7 + .../crystal_diamatine_empowered_block.json | 7 + .../blockstates/crystal_diamond_block.json | 7 - .../crystal_diamond_empowered_block.json | 7 - .../blockstates/crystal_emeradic_block.json | 7 + .../crystal_emeradic_empowered_block.json | 7 + .../blockstates/crystal_emerald_block.json | 7 - .../crystal_emerald_empowered_block.json | 7 - .../blockstates/crystal_lapis_block.json | 7 - .../crystal_lapis_empowered_block.json | 7 - .../blockstates/crystal_palis_block.json | 7 + .../crystal_palis_empowered_block.json | 7 + .../blockstates/crystal_redstone_block.json | 7 - .../crystal_redstone_empowered_block.json | 7 - .../blockstates/crystal_restonia_block.json | 7 + .../crystal_restonia_empowered_block.json | 7 + .../energy_laser_relay_advanced_block.json | 7 + .../blockstates/energy_laser_relay_block.json | 7 + .../energy_laser_relay_extreme_block.json | 7 + .../blockstates/esd_advanced_block.json | 7 + .../blockstates/esd_block.json | 7 + .../blockstates/fluids_laser_relay_block.json | 7 + .../blockstates/furnace_double_block.json | 7 - .../blockstates/furnace_solar_block.json | 7 - .../blockstates/grinder_block.json | 7 - .../blockstates/grinder_double_block.json | 7 - .../hopping_item_interface_block.json | 7 + .../blockstates/inputter_advanced_block.json | 7 - .../blockstates/inputter_block.json | 7 - .../blockstates/item_interface_block.json | 7 + .../blockstates/item_laser_relay_block.json | 7 + .../blockstates/item_viewer_block.json | 7 - .../item_viewer_hopping_block.json | 7 - .../blockstates/lamp_controller_block.json | 7 + .../blockstates/lamp_powerer_block.json | 7 - .../laser_relay_advanced_block.json | 7 - .../blockstates/laser_relay_block.json | 7 - .../laser_relay_extreme_block.json | 7 - .../blockstates/laser_relay_fluids_block.json | 7 - .../blockstates/laser_relay_item_block.json | 7 - .../laser_relay_item_whitelist_block.json | 7 - .../blockstates/powered_furnace_block.json | 7 + .../blockstates/solar_panel_block.json | 7 + .../assets/actuallyadditions/lang/en_us.json | 128 +++++++++ ...n => advanced_item_laser_relay_block.json} | 2 +- ... => black_chiseled_quartz_slab_block.json} | 0 ...black_chiseled_quartz_slab_block_top.json} | 0 ...=> black_chiseled_quartz_stair_block.json} | 0 ...ck_chiseled_quartz_stair_block_inner.json} | 0 ...ck_chiseled_quartz_stair_block_outer.json} | 0 ...lack_chiseled_quartz_wall_block_post.json} | 0 ...lack_chiseled_quartz_wall_block_side.json} | 0 ...chiseled_quartz_wall_block_side_tall.json} | 0 ...on => black_pillar_quartz_slab_block.json} | 0 ...> black_pillar_quartz_slab_block_top.json} | 0 ...n => black_pillar_quartz_stair_block.json} | 0 ...lack_pillar_quartz_stair_block_inner.json} | 0 ...lack_pillar_quartz_stair_block_outer.json} | 0 ... black_pillar_quartz_wall_block_post.json} | 0 ... black_pillar_quartz_wall_block_side.json} | 0 ...k_pillar_quartz_wall_block_side_tall.json} | 0 ...lock.json => black_quartz_slab_block.json} | 0 ....json => black_quartz_slab_block_top.json} | 0 ...ock.json => black_quartz_stair_block.json} | 0 ...on => black_quartz_stair_block_inner.json} | 0 ...on => black_quartz_stair_block_outer.json} | 0 ...json => black_quartz_wall_block_post.json} | 0 ...json => black_quartz_wall_block_side.json} | 0 ...=> black_quartz_wall_block_side_tall.json} | 0 ...{grinder_block.json => crusher_block.json} | 2 +- ...r_block.json => crusher_double_block.json} | 2 +- .../block/crystal_cluster_coal_block.json | 6 - ...n => crystal_cluster_diamatine_block.json} | 2 +- .../block/crystal_cluster_diamond_block.json | 6 - ...on => crystal_cluster_emeradic_block.json} | 2 +- ....json => crystal_cluster_enori_block.json} | 2 +- .../block/crystal_cluster_iron_block.json | 6 - .../block/crystal_cluster_palis_block.json | 6 + .../block/crystal_cluster_restonia_block.json | 6 + .../block/crystal_cluster_void_block.json | 6 + .../models/block/crystal_diamatine_block.json | 6 + .../crystal_diamatine_empowered_block.json | 6 + ...block.json => crystal_emeradic_block.json} | 2 +- ... => crystal_emeradic_empowered_block.json} | 2 +- .../block/crystal_lapis_empowered_block.json | 6 - ...is_block.json => crystal_palis_block.json} | 2 +- ...son => crystal_palis_empowered_block.json} | 2 +- .../models/block/crystal_restonia_block.json | 6 + ... => crystal_restonia_empowered_block.json} | 2 +- .../energy_laser_relay_advanced_block.json | 6 + .../block/energy_laser_relay_block.json | 6 + .../energy_laser_relay_extreme_block.json | 6 + ...rer_block.json => esd_advanced_block.json} | 2 +- .../{inputter_block.json => esd_block.json} | 2 +- .../block/fluids_laser_relay_block.json | 6 + .../models/block/grinder_double_block.json | 6 - .../block/hopping_item_interface_block.json | 6 + .../models/block/inputter_advanced_block.json | 6 - ...e_block.json => item_interface_block.json} | 2 +- .../models/block/item_laser_relay_block.json | 6 + .../block/item_viewer_hopping_block.json | 6 - ..._block.json => lamp_controller_block.json} | 2 +- .../block/laser_relay_advanced_block.json | 6 - .../models/block/laser_relay_block.json | 6 - .../block/laser_relay_extreme_block.json | 6 - .../block/laser_relay_fluids_block.json | 6 - .../models/block/laser_relay_item_block.json | 6 - ..._block.json => powered_furnace_block.json} | 2 +- ...ewer_block.json => solar_panel_block.json} | 2 +- .../item/advanced_item_laser_relay_block.json | 3 + .../black_chiseled_quartz_slab_block.json | 3 + .../black_chiseled_quartz_stair_block.json | 3 + .../black_chiseled_quartz_wall_block.json | 3 + .../item/black_pillar_quartz_slab_block.json | 3 + .../item/black_pillar_quartz_stair_block.json | 3 + .../item/black_pillar_quartz_wall_block.json | 3 + .../models/item/black_quartz_slab_block.json | 3 + .../models/item/black_quartz_stair_block.json | 3 + .../models/item/black_quartz_wall_block.json | 3 + .../models/item/booklet.json | 6 + .../item/chiseled_quartz_slab_block.json | 3 - .../item/chiseled_quartz_stair_block.json | 3 - .../item/chiseled_quartz_wall_block.json | 3 - .../models/item/crusher_block.json | 3 + .../models/item/crusher_double_block.json | 3 + .../item/crystal_cluster_coal_block.json | 3 - .../item/crystal_cluster_diamatine_block.json | 3 + .../item/crystal_cluster_diamond_block.json | 3 - .../item/crystal_cluster_emeradic_block.json | 3 + .../item/crystal_cluster_emerald_block.json | 3 - .../item/crystal_cluster_enori_block.json | 3 + .../item/crystal_cluster_iron_block.json | 3 - .../item/crystal_cluster_lapis_block.json | 3 - .../item/crystal_cluster_palis_block.json | 3 + .../item/crystal_cluster_redstone_block.json | 3 - .../item/crystal_cluster_restonia_block.json | 3 + .../item/crystal_cluster_void_block.json | 3 + .../models/item/crystal_diamatine_block.json | 3 + .../crystal_diamatine_empowered_block.json | 3 + .../models/item/crystal_diamond_block.json | 3 - .../item/crystal_diamond_empowered_block.json | 3 - .../models/item/crystal_emeradic_block.json | 3 + .../crystal_emeradic_empowered_block.json | 3 + .../models/item/crystal_emerald_block.json | 3 - .../item/crystal_emerald_empowered_block.json | 3 - .../models/item/crystal_lapis_block.json | 3 - .../item/crystal_lapis_empowered_block.json | 3 - .../models/item/crystal_palis_block.json | 3 + .../item/crystal_palis_empowered_block.json | 3 + .../models/item/crystal_redstone_block.json | 3 - .../crystal_redstone_empowered_block.json | 3 - .../models/item/crystal_restonia_block.json | 3 + .../crystal_restonia_empowered_block.json | 3 + .../energy_laser_relay_advanced_block.json | 3 + .../models/item/energy_laser_relay_block.json | 3 + .../energy_laser_relay_extreme_block.json | 3 + .../models/item/esd_advanced_block.json | 3 + .../models/item/esd_block.json | 3 + .../models/item/fluids_laser_relay_block.json | 3 + .../models/item/furnace_double_block.json | 3 - .../models/item/furnace_solar_block.json | 3 - .../models/item/grinder_block.json | 3 - .../models/item/grinder_double_block.json | 3 - .../item/hopping_item_interface_block.json | 3 + .../models/item/inputter_advanced_block.json | 3 - .../models/item/inputter_block.json | 3 - .../models/item/item_interface_block.json | 3 + .../models/item/item_laser_relay_block.json | 3 + .../models/item/item_viewer_block.json | 3 - .../item/item_viewer_hopping_block.json | 3 - .../models/item/lamp_controller_block.json | 3 + .../models/item/lamp_powerer_block.json | 3 - .../item/laser_relay_advanced_block.json | 3 - .../models/item/laser_relay_block.json | 3 - .../item/laser_relay_extreme_block.json | 3 - .../models/item/laser_relay_fluids_block.json | 3 - .../models/item/laser_relay_item_block.json | 3 - .../laser_relay_item_whitelist_block.json | 3 - .../models/item/pillar_quartz_slab_block.json | 3 - .../item/pillar_quartz_stair_block.json | 3 - .../models/item/pillar_quartz_wall_block.json | 3 - .../models/item/powered_furnace_block.json | 3 + .../models/item/quartz_slab_block.json | 3 - .../models/item/quartz_stair_block.json | 3 - .../models/item/quartz_wall_block.json | 3 - .../models/item/solar_panel_block.json | 3 + .../common/blocks/ActuallyBlocks.java | 24 +- .../data/GeneratorItemModels.java | 2 + ...ng => advanced_item_laser_relay_block.png} | Bin .../{grinder_block.png => crusher_block.png} | Bin ...ck_bottom.png => crusher_block_bottom.png} | Bin ...nder_block_on.png => crusher_block_on.png} | Bin ...er_block_top.png => crusher_block_top.png} | Bin ...ble_block.png => crusher_double_block.png} | Bin ...ng => crystal_cluster_diamatine_block.png} | Bin ...png => crystal_cluster_emeradic_block.png} | Bin ...ck.png => crystal_cluster_enori_block.png} | Bin ...ck.png => crystal_cluster_palis_block.png} | Bin ...png => crystal_cluster_restonia_block.png} | Bin ...ock.png => crystal_cluster_void_block.png} | Bin ..._block.png => crystal_diamatine_block.png} | Bin ... => crystal_diamatine_empowered_block.png} | Bin ...d_block.png => crystal_emeradic_block.png} | Bin ...g => crystal_emeradic_empowered_block.png} | Bin ...apis_block.png => crystal_palis_block.png} | Bin ....png => crystal_palis_empowered_block.png} | Bin ...e_block.png => crystal_restonia_block.png} | Bin ...g => crystal_restonia_empowered_block.png} | Bin ... => energy_laser_relay_advanced_block.png} | Bin ...block.png => energy_laser_relay_block.png} | Bin ...g => energy_laser_relay_extreme_block.png} | Bin ...anced_block.png => esd_advanced_block.png} | Bin .../{inputter_block.png => esd_block.png} | Bin ...block.png => fluids_laser_relay_block.png} | Bin ...k.png => hopping_item_interface_block.png} | Bin ...> hopping_item_interface_block_inside.png} | Bin ...g => hopping_item_interface_block_top.png} | Bin ...wer_block.png => item_interface_block.png} | Bin ...m_block.png => item_laser_relay_block.png} | Bin ...er_block.png => lamp_controller_block.png} | Bin ...ck.png => lamp_controller_front_block.png} | Bin ...le_block.png => powered_furnace_block.png} | Bin ...nt.png => powered_furnace_block_front.png} | Bin ..._top.png => powered_furnace_block_top.png} | Bin ...block.png => powered_furnace_on_block.png} | Bin ..._solar_block.png => solar_panel_block.png} | Bin 251 files changed, 838 insertions(+), 700 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/advanced_item_laser_relay_block.json rename src/generated/resources/assets/actuallyadditions/blockstates/{chiseled_quartz_slab_block.json => black_chiseled_quartz_slab_block.json} (53%) rename src/generated/resources/assets/actuallyadditions/blockstates/{chiseled_quartz_stair_block.json => black_chiseled_quartz_stair_block.json} (53%) rename src/generated/resources/assets/actuallyadditions/blockstates/{chiseled_quartz_wall_block.json => black_chiseled_quartz_wall_block.json} (58%) rename src/generated/resources/assets/actuallyadditions/blockstates/{pillar_quartz_slab_block.json => black_pillar_quartz_slab_block.json} (53%) rename src/generated/resources/assets/actuallyadditions/blockstates/{pillar_quartz_stair_block.json => black_pillar_quartz_stair_block.json} (54%) rename src/generated/resources/assets/actuallyadditions/blockstates/{pillar_quartz_wall_block.json => black_pillar_quartz_wall_block.json} (59%) rename src/generated/resources/assets/actuallyadditions/blockstates/{quartz_slab_block.json => black_quartz_slab_block.json} (54%) rename src/generated/resources/assets/actuallyadditions/blockstates/{quartz_stair_block.json => black_quartz_stair_block.json} (57%) rename src/generated/resources/assets/actuallyadditions/blockstates/{quartz_wall_block.json => black_quartz_wall_block.json} (61%) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crusher_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crusher_double_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_coal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamatine_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamond_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emeradic_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emerald_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_enori_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_iron_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_lapis_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_palis_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_redstone_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_restonia_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_void_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_advanced_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_extreme_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/esd_advanced_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/esd_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/fluids_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/furnace_double_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/furnace_solar_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/grinder_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/grinder_double_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/inputter_advanced_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/inputter_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_interface_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/lamp_powerer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_whitelist_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/lang/en_us.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_diamond_empowered_block.json => advanced_item_laser_relay_block.json} (51%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_slab_block.json => black_chiseled_quartz_slab_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_slab_block_top.json => black_chiseled_quartz_slab_block_top.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_stair_block.json => black_chiseled_quartz_stair_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_stair_block_inner.json => black_chiseled_quartz_stair_block_inner.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_stair_block_outer.json => black_chiseled_quartz_stair_block_outer.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_wall_block_post.json => black_chiseled_quartz_wall_block_post.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_wall_block_side.json => black_chiseled_quartz_wall_block_side.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{chiseled_quartz_wall_block_side_tall.json => black_chiseled_quartz_wall_block_side_tall.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_slab_block.json => black_pillar_quartz_slab_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_slab_block_top.json => black_pillar_quartz_slab_block_top.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_stair_block.json => black_pillar_quartz_stair_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_stair_block_inner.json => black_pillar_quartz_stair_block_inner.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_stair_block_outer.json => black_pillar_quartz_stair_block_outer.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_wall_block_post.json => black_pillar_quartz_wall_block_post.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_wall_block_side.json => black_pillar_quartz_wall_block_side.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{pillar_quartz_wall_block_side_tall.json => black_pillar_quartz_wall_block_side_tall.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_slab_block.json => black_quartz_slab_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_slab_block_top.json => black_quartz_slab_block_top.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_stair_block.json => black_quartz_stair_block.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_stair_block_inner.json => black_quartz_stair_block_inner.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_stair_block_outer.json => black_quartz_stair_block_outer.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_wall_block_post.json => black_quartz_wall_block_post.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_wall_block_side.json => black_quartz_wall_block_side.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{quartz_wall_block_side_tall.json => black_quartz_wall_block_side_tall.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{grinder_block.json => crusher_block.json} (55%) rename src/generated/resources/assets/actuallyadditions/models/block/{furnace_solar_block.json => crusher_double_block.json} (52%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_emerald_empowered_block.json => crystal_cluster_diamatine_block.json} (51%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_cluster_redstone_block.json => crystal_cluster_emeradic_block.json} (51%) rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_cluster_lapis_block.json => crystal_cluster_enori_block.json} (50%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_redstone_block.json => crystal_emeradic_block.json} (51%) rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_redstone_empowered_block.json => crystal_emeradic_empowered_block.json} (51%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_lapis_block.json => crystal_palis_block.json} (52%) rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_cluster_emerald_block.json => crystal_palis_empowered_block.json} (50%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{laser_relay_item_whitelist_block.json => crystal_restonia_empowered_block.json} (51%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{lamp_powerer_block.json => esd_advanced_block.json} (52%) rename src/generated/resources/assets/actuallyadditions/models/block/{inputter_block.json => esd_block.json} (54%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{furnace_double_block.json => item_interface_block.json} (52%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_emerald_block.json => lamp_controller_block.json} (51%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_diamond_block.json => powered_furnace_block.json} (51%) rename src/generated/resources/assets/actuallyadditions/models/block/{item_viewer_block.json => solar_panel_block.json} (53%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_item_laser_relay_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/booklet.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_slab_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_stair_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crusher_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crusher_double_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_coal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamatine_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamond_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emeradic_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emerald_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_enori_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_iron_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_lapis_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_palis_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_redstone_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_restonia_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_void_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_advanced_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_extreme_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/esd_advanced_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/esd_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/fluids_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/furnace_double_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/furnace_solar_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/grinder_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/grinder_double_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/inputter_advanced_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/inputter_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_interface_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_viewer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lamp_controller_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_whitelist_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_slab_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_stair_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/powered_furnace_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_slab_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_stair_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_item_whitelist_block.png => advanced_item_laser_relay_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{grinder_block.png => crusher_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{grinder_block_bottom.png => crusher_block_bottom.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{grinder_block_on.png => crusher_block_on.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{grinder_block_top.png => crusher_block_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{grinder_double_block.png => crusher_double_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_coal_block.png => crystal_cluster_diamatine_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_diamond_block.png => crystal_cluster_emeradic_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_emerald_block.png => crystal_cluster_enori_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_iron_block.png => crystal_cluster_palis_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_lapis_block.png => crystal_cluster_restonia_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_cluster_redstone_block.png => crystal_cluster_void_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_diamond_block.png => crystal_diamatine_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_diamond_empowered_block.png => crystal_diamatine_empowered_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_emerald_block.png => crystal_emeradic_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_emerald_empowered_block.png => crystal_emeradic_empowered_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_lapis_block.png => crystal_palis_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_lapis_empowered_block.png => crystal_palis_empowered_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_redstone_block.png => crystal_restonia_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_redstone_empowered_block.png => crystal_restonia_empowered_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_advanced_block.png => energy_laser_relay_advanced_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_block.png => energy_laser_relay_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_extreme_block.png => energy_laser_relay_extreme_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{inputter_advanced_block.png => esd_advanced_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{inputter_block.png => esd_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_fluids_block.png => fluids_laser_relay_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_viewer_hopping_block.png => hopping_item_interface_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_viewer_hopping_block_inside.png => hopping_item_interface_block_inside.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_viewer_hopping_block_top.png => hopping_item_interface_block_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{item_viewer_block.png => item_interface_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{laser_relay_item_block.png => item_laser_relay_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_powerer_block.png => lamp_controller_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{lamp_powerer_front_block.png => lamp_controller_front_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{furnace_double_block.png => powered_furnace_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{furnace_double_block_front.png => powered_furnace_block_front.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{furnace_double_block_top.png => powered_furnace_block_top.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{furnace_double_on_block.png => powered_furnace_on_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{furnace_solar_block.png => solar_panel_block.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c8c0a0557..951659a70 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,36 +1,45 @@ +308eb79ef3014c4cf1cc0453e827f43e0a9bcf5f assets/actuallyadditions/blockstates/advanced_item_laser_relay_block.json a5e93227e5cf3956d4b4753dfca19878e5d3b0a9 assets/actuallyadditions/blockstates/atomic_reconstructor_block.json 6cc10cd01255886d05b71b898b05faa76e2ccc8a assets/actuallyadditions/blockstates/battery_box_block.json b25315def4a9ff486d8a564449764cfb76b00d78 assets/actuallyadditions/blockstates/bio_reactor_block.json +eefccdcc7bb6e2e26af2195d266691148bb2c25b assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json +c36a97288df2eea0cf76a32146fd7582e33e7022 assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json +d736c7c359adf5ff961898e55fea00e09aa00e2e assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json a5d9ac64ea48bee6e29c196abec1596778516b70 assets/actuallyadditions/blockstates/black_lotus_block.json +3f625990d244d8be3e67729086769ca9f7724d63 assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json +78807210fb5821006b8875abf1a9cbdcce39d69e assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json +eec126e116a0cbee9def33009609a95d666dacf7 assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json f4b3482fd851ad2e0071caf4aedbd7ee45fe0a31 assets/actuallyadditions/blockstates/black_quartz_block.json 51406ff61c7836448b670b144bcc5d6e9ad02e1d assets/actuallyadditions/blockstates/black_quartz_chiseled_block.json 31b696d84e073be37ae3ce210463fd1568cdce47 assets/actuallyadditions/blockstates/black_quartz_pillar_block.json +bbf1deec87fd98d99d7049b8bad53811780f66f9 assets/actuallyadditions/blockstates/black_quartz_slab_block.json +927434c25a7630a6102159a781e9c70a0ec45472 assets/actuallyadditions/blockstates/black_quartz_stair_block.json +919cc431226ebfbaa8e4dda1c1a8b1460031747f assets/actuallyadditions/blockstates/black_quartz_wall_block.json ce5d4537a1716feb2be4df416d42a09cc4aa3ad3 assets/actuallyadditions/blockstates/breaker_block.json e78c7a80444f967401b8c53553aead94ba46e129 assets/actuallyadditions/blockstates/canola_block.json 27c54cdd6c5daa9f4b595ec11f5b85c66df5356e assets/actuallyadditions/blockstates/canola_press_block.json 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 -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 -7812beff6bb1242211c5f749a5427f18734f6764 assets/actuallyadditions/blockstates/crystal_cluster_coal_block.json -245e3eb8e174a6298f2bb78be57225f3d4b16eaa assets/actuallyadditions/blockstates/crystal_cluster_diamond_block.json -72f0d1e2cee03d9dba2b657a21b498c778f9b254 assets/actuallyadditions/blockstates/crystal_cluster_emerald_block.json -a39529a7b7c894ab208b02d1a791a7f0fa50e5b8 assets/actuallyadditions/blockstates/crystal_cluster_iron_block.json -ed5616db6ad719ca3e31fa61614de9d038670422 assets/actuallyadditions/blockstates/crystal_cluster_lapis_block.json -3fdbeb49e83d68ce7cf42a0b69b73dc91268ad45 assets/actuallyadditions/blockstates/crystal_cluster_redstone_block.json -ccf7b2fd77bf99f6bf1bf003a79ae430e268d1b0 assets/actuallyadditions/blockstates/crystal_diamond_block.json -97c83a73f0eb1f186e29ee075db083fe716d5979 assets/actuallyadditions/blockstates/crystal_diamond_empowered_block.json -d2a9b4064ee6f5aa72052038b169a7491bba7cad assets/actuallyadditions/blockstates/crystal_emerald_block.json -ae3b15032415b4f6727062319811f24d252d563b assets/actuallyadditions/blockstates/crystal_emerald_empowered_block.json -5c1afe24862e0e463a77b238ebeffd71cbd92b5d assets/actuallyadditions/blockstates/crystal_lapis_block.json -e3212e702798ba07b127555ca9fa7fc1a420171c assets/actuallyadditions/blockstates/crystal_lapis_empowered_block.json +48428eb125f04c2dc172698f2543c3252b67f682 assets/actuallyadditions/blockstates/crusher_block.json +3a6d45b1104c747ad7c1a5d5ac2e57ae1e160c7f assets/actuallyadditions/blockstates/crusher_double_block.json +85697f6419f11fd44d27eb80886f91ce7a1774ac assets/actuallyadditions/blockstates/crystal_cluster_diamatine_block.json +774b00cc25f6fec41b924bf70e7dc8dec1661de1 assets/actuallyadditions/blockstates/crystal_cluster_emeradic_block.json +4866f59db19c92f8f9364b4a0f0181e0ac26bc01 assets/actuallyadditions/blockstates/crystal_cluster_enori_block.json +3f3c48fa16cf2327a9e32d7910d8e8883770d3ce assets/actuallyadditions/blockstates/crystal_cluster_palis_block.json +1b61cb2fc5501dc21fb43fdbbc20a339147aaa23 assets/actuallyadditions/blockstates/crystal_cluster_restonia_block.json +30fff110e654f7c0db03719174cbaaec008025ab assets/actuallyadditions/blockstates/crystal_cluster_void_block.json +85e2a2c116fe78a65490287ad495cffe42fcee0b assets/actuallyadditions/blockstates/crystal_diamatine_block.json +a757320af880ae84e22a98350dd873253111a97e assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json +a9f79bb1d3ab85883d89ab56ebecbb3b71ce59ab assets/actuallyadditions/blockstates/crystal_emeradic_block.json +a99dc8ba0864988f9e20513e11b60c1d9c47f18b assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json +de129f49b2fc5184a23851544be9d4282bf13b85 assets/actuallyadditions/blockstates/crystal_palis_block.json +5d053e3ae3ca4d25c2a20e7cb93f1ee9eae6eaae assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json 661abe022841ca315050cd42ab1513a6bf7f129d assets/actuallyadditions/blockstates/crystal_quarts_block.json 1f76d7b4fd66b4656708245c645ce54dd18b2ede assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json -cc04e27459aaedb021e9d4eef7d7dd85a7d25528 assets/actuallyadditions/blockstates/crystal_redstone_block.json -a1cda4bee78fc070aeaf4647b0891da9d85ca9a7 assets/actuallyadditions/blockstates/crystal_redstone_empowered_block.json +0a5efe6937f35891b879ec88dfbe841b83c0e11b assets/actuallyadditions/blockstates/crystal_restonia_block.json +894c6c628df3c766d7d8a19711470899bb030368 assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json 8ad2faa40e3c592773cb5bfb5f428fb9b33be0e3 assets/actuallyadditions/blockstates/crystal_void_block.json 7a1994cb961ecd57074238b230bbf4f962d3a5ee assets/actuallyadditions/blockstates/crystal_void_empowered_block.json 41aea74853f695b0453a1550bfafd89a3c60010c assets/actuallyadditions/blockstates/directional_breaker_block.json @@ -40,7 +49,12 @@ a1cda4bee78fc070aeaf4647b0891da9d85ca9a7 assets/actuallyadditions/blockstates/cr add2b2e8ddef448b10134a0bf161dade15dbf6c5 assets/actuallyadditions/blockstates/ender_casing_block.json 3e68964f4c1aae40f9caacb0f75ead4c7968f44b assets/actuallyadditions/blockstates/enderpearl_block.json 7990ec5a0d31c9d6808b5fa2d31287652985257d assets/actuallyadditions/blockstates/energizer_block.json +1be214fe93644e42370ecf41e15ca7ff19549b49 assets/actuallyadditions/blockstates/energy_laser_relay_advanced_block.json +249bf6214b7e9d568a6879310acac310860a8f2c assets/actuallyadditions/blockstates/energy_laser_relay_block.json +0bf18e810f343c7099371270b651733e620151e0 assets/actuallyadditions/blockstates/energy_laser_relay_extreme_block.json 9b41e8bdc87affb8a42a616866458cf5457c6978 assets/actuallyadditions/blockstates/enervator_block.json +9aa912cc090fd6b34887a7bca8381f3c9e83a6f6 assets/actuallyadditions/blockstates/esd_advanced_block.json +340bd64bc0a155872145319367b5b7874b0da897 assets/actuallyadditions/blockstates/esd_block.json ef7d485db00e32c6d5b25361f8976e24c3f86c27 assets/actuallyadditions/blockstates/farmer_block.json 1d1dee2cead6c8e6ef8ac5caa60c5a828dfa31f4 assets/actuallyadditions/blockstates/feeder_block.json f194ac52c1183dcdd0746cd00145ce19ddcc2c20 assets/actuallyadditions/blockstates/fermenting_barrel_block.json @@ -49,26 +63,23 @@ a14d5a20522d4369cd53fa4bd52b211102312af5 assets/actuallyadditions/blockstates/fi c3cb96f297ec4e3fd0571dcacc331883e56414f8 assets/actuallyadditions/blockstates/flax_block.json 6ab4ddadd6e44f4c6661ce2b8dd6a5dc78202554 assets/actuallyadditions/blockstates/fluid_collector_block.json 495c7ffb20099457fc8642c1450855d8673cd6f2 assets/actuallyadditions/blockstates/fluid_placer_block.json -d557be9d9d46025ac38e7f5a4f4704c01293100f assets/actuallyadditions/blockstates/furnace_double_block.json -855df565f35f8459eafea8c9af724bce8cd888e1 assets/actuallyadditions/blockstates/furnace_solar_block.json +c361e00ee977a53e4ff68869a221c57e8b794ce4 assets/actuallyadditions/blockstates/fluids_laser_relay_block.json 1da0061dfba859490a0d9fba8482fad61be6ae9b assets/actuallyadditions/blockstates/green_fence_block.json 3793635a0e676cda0c4bc29df48d1be5505e3e9d assets/actuallyadditions/blockstates/green_slab_block.json f54fe2d4ebaa81e1bef8ca575e40cabc72814d0e assets/actuallyadditions/blockstates/green_stairs_block.json 28cea920c23fc74e6b84e856afbac2c22f04f611 assets/actuallyadditions/blockstates/green_wall_block.json 7a7d204e8a120ef29249c784855afb9736dde472 assets/actuallyadditions/blockstates/greenhouse_glass_block.json -d89114187f7af5c046b2ecd24b1491992344ef5c assets/actuallyadditions/blockstates/grinder_block.json -cec234e64bd88e58f711e7094f5413bbb3cb463d assets/actuallyadditions/blockstates/grinder_double_block.json 7fa4f8d30b6afb1a1ef20862d2a3dda65d9cd040 assets/actuallyadditions/blockstates/heat_collector_block.json -5ad2843d205f57fd26d178bf9c70fc7175dd8fda assets/actuallyadditions/blockstates/inputter_advanced_block.json -2b9430f088e81c22ff458798720cc38f87dc896d assets/actuallyadditions/blockstates/inputter_block.json +6d3608a54573e2096bd36089163721b6b18fc8a7 assets/actuallyadditions/blockstates/hopping_item_interface_block.json e2782f6ef5da9a08d2ca997dd0975ec1c70e4872 assets/actuallyadditions/blockstates/iron_casing_block.json ca449143d056ad64729043ad10ac444169752574 assets/actuallyadditions/blockstates/iron_casing_snow_block.json +78319cb5664292f412af2ff5d5f99bed4b2f9d0d assets/actuallyadditions/blockstates/item_interface_block.json +66c2062159dfa7743d3f567439be26cb4c708582 assets/actuallyadditions/blockstates/item_laser_relay_block.json d60404de40fab972c26afdf99c88847098b9553b assets/actuallyadditions/blockstates/item_repairer_block.json -78f7e9ba48b4efc36ba1240904470bb166e59d04 assets/actuallyadditions/blockstates/item_viewer_block.json -b4bebb2f4c57d4844be3ebc6cf2f9b674154eeb6 assets/actuallyadditions/blockstates/item_viewer_hopping_block.json 49437918199e264073ac399ca343bb7e13473408 assets/actuallyadditions/blockstates/lamp_black_block.json 1182ed7e3470d500c8bc0d0f721ed29a5ab6886b assets/actuallyadditions/blockstates/lamp_blue_block.json dac6d62d802fe5289bc419ab1c40a1a599be51c9 assets/actuallyadditions/blockstates/lamp_brown_block.json +55edb6363e6b983fb2a1da559e44cf958acaecb9 assets/actuallyadditions/blockstates/lamp_controller_block.json 36a42127297eea02a2f389493644c7d6be1cfe62 assets/actuallyadditions/blockstates/lamp_cyan_block.json e09d7b95f0432ca3f86e19165c7c67a4d940115f assets/actuallyadditions/blockstates/lamp_gray_block.json 06158f5530d15cf561f4a21c3bd3ca089fa8104e assets/actuallyadditions/blockstates/lamp_green_block.json @@ -78,17 +89,10 @@ b469702253e0c6bd752b3a1da73d6443d96da63b assets/actuallyadditions/blockstates/la a75ab479eab5a05ffa474bb19307d6d023bf5500 assets/actuallyadditions/blockstates/lamp_magenta_block.json 9c1558a7bd526f6408fcf8dc9dfddf37ed3c0329 assets/actuallyadditions/blockstates/lamp_orange_block.json f4e225f82e81c799a9a24fe29a82fdcf5037abde assets/actuallyadditions/blockstates/lamp_pink_block.json -8d9a891d40ec19e99ae5095188473cc18d11d516 assets/actuallyadditions/blockstates/lamp_powerer_block.json 7537b4fcb2f39104cd55081eac89ac51bab9ccaf assets/actuallyadditions/blockstates/lamp_purple_block.json 50556189133d3097de7ce53e18ae631a96051dce assets/actuallyadditions/blockstates/lamp_red_block.json 9b55f5c1f15e5db2498e20627b93de5bb220aedf assets/actuallyadditions/blockstates/lamp_white_block.json 127c977a79add94e77bb233f8dd9d8935caac72f assets/actuallyadditions/blockstates/lamp_yellow_block.json -7768ce46ab3888609e1155ca906df246a7830f18 assets/actuallyadditions/blockstates/laser_relay_advanced_block.json -b7b2c8d634ca8cc4ec3d67314924444a0a432760 assets/actuallyadditions/blockstates/laser_relay_block.json -caa862a6d1efbcc6babc67e3859a8fef7a56658a assets/actuallyadditions/blockstates/laser_relay_extreme_block.json -ceb28cd17cffbd1f490a524d2e06e867cbe17850 assets/actuallyadditions/blockstates/laser_relay_fluids_block.json -c0b24b7c36209afb1ba825ccbaac84e6049c33f7 assets/actuallyadditions/blockstates/laser_relay_item_block.json -a619ecb908febac57db2cc1bd54c4bcbf9ca8624 assets/actuallyadditions/blockstates/laser_relay_item_whitelist_block.json b8cc5e8899edc8226f817c0ff62acb8b51f4048c assets/actuallyadditions/blockstates/lava_factory_case_block.json 55b2bfbb000946ea74d5556c12cc11982451a108 assets/actuallyadditions/blockstates/lava_factory_controller_block.json db42fe614f84ab4b2bc3009b7e897f8feb7c4531 assets/actuallyadditions/blockstates/leaf_generator_block.json @@ -102,18 +106,14 @@ ea72dc9626035841b23b2058b8106cf485af0311 assets/actuallyadditions/blockstates/ph 2398416eaffc8ac0d7c4581069e2c6b2521565f7 assets/actuallyadditions/blockstates/phantom_placer_block.json a47d29d2eb95cddf2ac5df59cbf31218e7700c16 assets/actuallyadditions/blockstates/phantom_redstoneface_block.json 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 -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 -2371d095cc32e97aa8f1019e65d4a00823449bd2 assets/actuallyadditions/blockstates/quartz_wall_block.json +2425d58705d4d12bd8d692699fbc00ec503b12bc assets/actuallyadditions/blockstates/powered_furnace_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 58bfb26fb6c8c0692630e1af82a704c463e66926 assets/actuallyadditions/blockstates/smiley_cloud_block.json +0f310d143c8504d103ca060957a553bd58cf2259 assets/actuallyadditions/blockstates/solar_panel_block.json 5e4a1515853930ee4db617a7ebe2d81e8d00eac1 assets/actuallyadditions/blockstates/tiny_torch_block.json bdf1cc88bd235a3ee9451feb8acc081f7b6745b7 assets/actuallyadditions/blockstates/treasure_chest_block.json 24610c651f3b6d77b7277c412a58170d4a813f67 assets/actuallyadditions/blockstates/white_fence_block.json @@ -122,44 +122,64 @@ 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 +c8e01af1c651c88d2bd8e9cd03cabf079b0e4c7a assets/actuallyadditions/lang/en_us.json +8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_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 +3d2254e3badb613b7c58bad482c14097fffd64e0 assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block.json +bcae388ebbfa2b232ca846dc2716e3e5b80b76a8 assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block_top.json +251b824d3db3f4b6386362169deaeae4b42fceb1 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block.json +0397bb0900c2097dd492b3a3baf6ca77d9052b85 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_inner.json +ebcbbd421acfefa3b558fa3bba1796ef06f1d659 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_outer.json +b9d38b614addaf33c23103c63395b960b4797c27 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json +1cb145ca56e990192a6ccdc04f671c12747cfb53 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json +41b38f848e1ee3961822598df0fbac11142972e3 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json 0358fc25923f6372371abd6dda1a707527507158 assets/actuallyadditions/models/block/black_lotus_block.json +0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block.json +b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block_top.json +480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block.json +a1c50e555b7742b8215806214ceb6bfc5b728155 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_inner.json +d229a8d1ae3e1644d83c85ef1edafb7a0d923e70 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_outer.json +5e370e4176e71c8755c84c9b0cd3ae4994501aac assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json +b89da02bf59fe8c49c1fdbc436219bfc202151f9 assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json +a4dfc98dbd73ba2759b0cd6f20d7e21eb9d0ee0a assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side_tall.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 +83d41e95a7d032dc6ce960ebbaa9d808a1d44126 assets/actuallyadditions/models/block/black_quartz_slab_block.json +02b5f964815edb299171a220b104042fe793a837 assets/actuallyadditions/models/block/black_quartz_slab_block_top.json +7f3141ee52fe873a17a5d0210a43d4a94fb3465a assets/actuallyadditions/models/block/black_quartz_stair_block.json +72d00d5d8723ec0d3b953a9ccac5f09e0ffedf4d assets/actuallyadditions/models/block/black_quartz_stair_block_inner.json +f277709029801d7292d300b13876189a32d1b3a4 assets/actuallyadditions/models/block/black_quartz_stair_block_outer.json +93b61ddd8e53f61ca25c4768de3a3b95a23297b4 assets/actuallyadditions/models/block/black_quartz_wall_block_post.json +1c617e7845d3211b4f7cda38a9bee59208de8c23 assets/actuallyadditions/models/block/black_quartz_wall_block_side.json +46c7aa812a7af600d4f927eba5fa3f5b4956fa28 assets/actuallyadditions/models/block/black_quartz_wall_block_side_tall.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 +694893c91e55517aad487abed3237f804734b51a assets/actuallyadditions/models/block/crusher_block.json +e1ab6659b23ea442b15b805eb48488dee5fbd421 assets/actuallyadditions/models/block/crusher_double_block.json +e288db030b68be7ce1911ede86bea8b87690424f assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json +70bd4b2ab00217f92b143fe05d8c2643a8c46fb5 assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json +e40591c041a7d064dbeac6994dffe3fe79122700 assets/actuallyadditions/models/block/crystal_cluster_enori_block.json +c988df36707140e6b67b0d8a85b289f4d469778a assets/actuallyadditions/models/block/crystal_cluster_palis_block.json +306fbbe7f2b333f5c91caf898ddaf7d4a542cd11 assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json +4359168263f0832d7934ca2b2c9347504c290b5d assets/actuallyadditions/models/block/crystal_cluster_void_block.json +579321f6d7c51b16f7183b1b50d56910398a26c0 assets/actuallyadditions/models/block/crystal_diamatine_block.json +64a6619bceaab9846ebfe2326c2d1dc0299fda70 assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json +ea5b05b6a39d8844628c832d73b524b20801704b assets/actuallyadditions/models/block/crystal_emeradic_block.json +5fa3ac72ebb891302c2a2dd91909cfd6c973af80 assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json +e8c5da8af297132ee5bb0a0736eb5524e5ae0085 assets/actuallyadditions/models/block/crystal_palis_block.json +c6335ebc65b2a6f72888157e0b12ca65667b5b21 assets/actuallyadditions/models/block/crystal_palis_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 +58326e64c25814d1aa0961c61a51faaecc30bead assets/actuallyadditions/models/block/crystal_restonia_block.json +1a8955bcbf454617c0ca3ffc9f8a8536381eaebd assets/actuallyadditions/models/block/crystal_restonia_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 @@ -169,7 +189,12 @@ f1c3add14ec2f3623cc7ffb06e416212b5f251f5 assets/actuallyadditions/models/block/d 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 +28b406aee539ae6fe60a7552da98fee8abb913e1 assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json +26f9f178506b5d7de6c87a7783d1c05c2b64f5b7 assets/actuallyadditions/models/block/energy_laser_relay_block.json +8bc1a9d4b738510c5d4869555a6e0f4d0f4588a2 assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json 933a69e02050a935df270bf5ab463326955d15d0 assets/actuallyadditions/models/block/enervator_block.json +3c1c4c665efe2ac2bbacf4258bb7867070a8218b assets/actuallyadditions/models/block/esd_advanced_block.json +83cbdc29900e83b7a2753b3093682aec6656402f assets/actuallyadditions/models/block/esd_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 @@ -178,8 +203,7 @@ f1c3add14ec2f3623cc7ffb06e416212b5f251f5 assets/actuallyadditions/models/block/d 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 +13c818ed50a0226ec4f66960ce3cda19f337a767 assets/actuallyadditions/models/block/fluids_laser_relay_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 @@ -189,19 +213,17 @@ c7115f4ed8dff2277f5b613660d0d877ff80b769 assets/actuallyadditions/models/block/g 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 +d43971145be2910eefae6632306e4c36c1db54a5 assets/actuallyadditions/models/block/hopping_item_interface_block.json 9739b23c33c8d947fbd5144edc11c7f333de413b assets/actuallyadditions/models/block/iron_casing_block.json 7f3c845740543bddc867ed2f047e866dfffc6697 assets/actuallyadditions/models/block/iron_casing_snow_block.json +f7f5a6ea0e799648572bf20802c49f59555c74a5 assets/actuallyadditions/models/block/item_interface_block.json +e4ed24c971e1758b3e580211ef42c1e23579de5e assets/actuallyadditions/models/block/item_laser_relay_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 +3efd60e091ee95c6c2057ac87945e02a7e87351c assets/actuallyadditions/models/block/lamp_controller_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 @@ -211,17 +233,10 @@ b62fa75409cddb78cea7b422a5f0f603bc2f0bb6 assets/actuallyadditions/models/block/l 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 @@ -235,28 +250,14 @@ ded3687763c370df87b1dd639786780dc607d5a2 assets/actuallyadditions/models/block/p 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 +0db63dc40c279726376559ffbc2aef7c0e4a11e6 assets/actuallyadditions/models/block/powered_furnace_block.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 +63f7b900998eb89aa4106c4daa8c03d34c9bb9f3 assets/actuallyadditions/models/block/solar_panel_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 @@ -269,40 +270,50 @@ e2e134c8211fad3af8101068eaa8e3a7a7054b10 assets/actuallyadditions/models/block/w 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 +f8092e976c50d90ff29ca2dd4bccfd845ab299b7 assets/actuallyadditions/models/item/advanced_item_laser_relay_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 +fa3f47abe215fc8df67a24b20294cc45fa9c9c32 assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json +365764b67f52be3bad2f8bd5cc4704b643fb5f78 assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json +7128592505005a4585b9c6a21a62cf609e1e3950 assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json d825c4bf0752cb0cbe1b25c425c2253547672a6e assets/actuallyadditions/models/item/black_lotus_block.json +641231a2f0637bd1ac45263e08583220e3f2fa7f assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json +95d32e4f070679e9425d1b99c158e1fbc4711671 assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json +672b0bfd546bda3aee14a59acd574dd7a272df6a assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json 08f5dfde00eed3a0686cfd09efae9b08c3d1a28a assets/actuallyadditions/models/item/black_quartz.json 37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json 914cf520c2529c678328aab983bf615657701404 assets/actuallyadditions/models/item/black_quartz_chiseled_block.json 50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json +8526296e18863679e70ce91a57562ba547a6ddf2 assets/actuallyadditions/models/item/black_quartz_slab_block.json +0d6700a1829ebf2a89a748adfb2fa3c0ebf9dd10 assets/actuallyadditions/models/item/black_quartz_stair_block.json +25d3567ff6e7a1ec01a3d960780d71255aa89bea assets/actuallyadditions/models/item/black_quartz_wall_block.json +0651f54c6f231fea74e3cc4c10a2c2a50019366e assets/actuallyadditions/models/item/booklet.json 10b81cec3e9c5beebb11ca22ef3f442746a75125 assets/actuallyadditions/models/item/breaker_block.json ee0b4baf15ba02b3be1c7ca35bce2f1643bdb4cb assets/actuallyadditions/models/item/canola_block.json 24019c51220a0c94db10069d33f21d9118ea162d assets/actuallyadditions/models/item/canola_press_block.json 83b47876ba2c85d3ba83e36ee9b02a8d458f7230 assets/actuallyadditions/models/item/charcoal_block.json -b19fac6cbc423f742922b408365980e8e2706f30 assets/actuallyadditions/models/item/chiseled_quartz_slab_block.json -d710588785cadbfa0bfdc3d417395867cb0a8758 assets/actuallyadditions/models/item/chiseled_quartz_stair_block.json -9939eefbeac5ab2827420ac7c88ddbce9796081b assets/actuallyadditions/models/item/chiseled_quartz_wall_block.json 20a2d270552790a5a59e27a77c89998e16c1d46c assets/actuallyadditions/models/item/coal_generator_block.json c18c953d22b7a648c039940495d952e338ed50be assets/actuallyadditions/models/item/coffee_block.json db30af1b256d0462c880fe984d1abe38f3e792e4 assets/actuallyadditions/models/item/coffee_machine_block.json -5f0695a1d4a3231eaabfbe762b2f37efa40dfd70 assets/actuallyadditions/models/item/crystal_cluster_coal_block.json -5e612db24b8c02a7fede12c8173c94aa7f16cd57 assets/actuallyadditions/models/item/crystal_cluster_diamond_block.json -472326153ab4e3966b02702df6f0ca6f27ed9aff assets/actuallyadditions/models/item/crystal_cluster_emerald_block.json -271dfc5e1232ee40b7bef62de2c6667e785973e4 assets/actuallyadditions/models/item/crystal_cluster_iron_block.json -ac05a18c99177b4185bbd605cab74a4f11944331 assets/actuallyadditions/models/item/crystal_cluster_lapis_block.json -6db8a990cfbd4b4fd3e42d42a6384fca73a7d9f7 assets/actuallyadditions/models/item/crystal_cluster_redstone_block.json -c06509b1556f9b16aa0d4b419079366dfbcee59c assets/actuallyadditions/models/item/crystal_diamond_block.json -a2a8cf087f1532447441e559cbd63970d626124c assets/actuallyadditions/models/item/crystal_diamond_empowered_block.json -cc1ca3e3191594d306f0fc5063102030ea06cc7d assets/actuallyadditions/models/item/crystal_emerald_block.json -1a439bb0f191f01cad81a17af734f588842ce592 assets/actuallyadditions/models/item/crystal_emerald_empowered_block.json -6d30a1c937f48483ca319b4c179029e5e583b751 assets/actuallyadditions/models/item/crystal_lapis_block.json -7544f3157099173ec79ce7ee0a3f895ada7481e0 assets/actuallyadditions/models/item/crystal_lapis_empowered_block.json +18561149a3eeefc7343b50773ba7baee7d42ef2f assets/actuallyadditions/models/item/crusher_block.json +19c7cbef771242663f02ab6eff97fdbabc3e2b98 assets/actuallyadditions/models/item/crusher_double_block.json +b9a7c38fd829f09b2bb4dffb2d7101e6d9428899 assets/actuallyadditions/models/item/crystal_cluster_diamatine_block.json +86df9ed96b07eab866573d7a3351da6887c0eba6 assets/actuallyadditions/models/item/crystal_cluster_emeradic_block.json +c7a4c16801d226cf48cbcafd446050a179980b08 assets/actuallyadditions/models/item/crystal_cluster_enori_block.json +37a9ed124aab808cead63308689fa89422f5ef77 assets/actuallyadditions/models/item/crystal_cluster_palis_block.json +90de93584dbd0d99df63313de62136ee7ce0cfc0 assets/actuallyadditions/models/item/crystal_cluster_restonia_block.json +5d330faed975d0da1f8373f1c6cd5b98798b0516 assets/actuallyadditions/models/item/crystal_cluster_void_block.json +14be150d864c45bd70db5c29a620d5d5d6657030 assets/actuallyadditions/models/item/crystal_diamatine_block.json +b5e60c58aa8d54b81be41e542130b814ed902613 assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json +e144d9a646c1eb32c6787601109f89311d05b873 assets/actuallyadditions/models/item/crystal_emeradic_block.json +3dfc6cdcf60315b4e40d2b6359184488c6880c9d assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json +f8780e974f2da4b88d3b65d53fde0c05650f6f54 assets/actuallyadditions/models/item/crystal_palis_block.json +dca305818e1daf966bce9eb424d13dbcbdcf127a assets/actuallyadditions/models/item/crystal_palis_empowered_block.json cc937bf0402633637bb503680139ab98b5b819a1 assets/actuallyadditions/models/item/crystal_quarts_block.json 6aedd71e14def214e372e61ba034bbdfc623bd42 assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json -736595751213544eeeb8d0981dd41379d676a3a6 assets/actuallyadditions/models/item/crystal_redstone_block.json -5e6ffa9f1488bc4479865e66ef122ebd18f7baaa assets/actuallyadditions/models/item/crystal_redstone_empowered_block.json +73710173d48090a864754cafe34975657f0e4adb assets/actuallyadditions/models/item/crystal_restonia_block.json +0cad4a4ebd25b5c9bde998dbfd882fba3265e938 assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json af1f5da310b381b33448253efb60dbe483a45aa3 assets/actuallyadditions/models/item/crystal_void_block.json 49746606ac712682e5214b7ab7a17dc0623c7b9b assets/actuallyadditions/models/item/crystal_void_empowered_block.json 9e7e70f1efd1fdc83d78d0526657c229acf7293d assets/actuallyadditions/models/item/diamatine_axe.json @@ -341,6 +352,9 @@ ae4d3aee8bfa1fa9b1edb644eb3e970be8a90e43 assets/actuallyadditions/models/item/em 3d14817e38f054a2ce4fcc6cd700bd0cf787f36d assets/actuallyadditions/models/item/ender_casing_block.json d401c1e85e78657275a1e8334f78c59916ac33bd assets/actuallyadditions/models/item/enderpearl_block.json b1a602bdd49d0ccc7c9c7a42e03b8897ad5f463b assets/actuallyadditions/models/item/energizer_block.json +00b20e4f74de558ddbcf25b1f3c4aef4b15224e1 assets/actuallyadditions/models/item/energy_laser_relay_advanced_block.json +e766bdc01496e450c56f1e4f3e448aecaff056ab assets/actuallyadditions/models/item/energy_laser_relay_block.json +e825d00bc65e1c3a7cc106d619c1de96ddfb9574 assets/actuallyadditions/models/item/energy_laser_relay_extreme_block.json 7e3e0cf6399c050df5555c0242f5dcb1be1e364c assets/actuallyadditions/models/item/enervator_block.json 9da6d04e1afdb1605234f885bdb00581ab4e21da assets/actuallyadditions/models/item/enori_axe.json 792b648a3ec5c6aaa304db5d249fd818f092e132 assets/actuallyadditions/models/item/enori_boots.json @@ -352,6 +366,8 @@ fb640c28e67d6f8371452f516caf213b782357c1 assets/actuallyadditions/models/item/en a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/enori_pickaxe.json 3b242598d0f2f6a4ad68ba825be8ad40c3b3a938 assets/actuallyadditions/models/item/enori_shovel.json 26c0ad839f51a9f49d254d966c98738ebf2b6906 assets/actuallyadditions/models/item/enori_sword.json +962e796825fdbab24249330340cb1f4fb9adc650 assets/actuallyadditions/models/item/esd_advanced_block.json +2d060aca29615cd078324de4f00ce59896651560 assets/actuallyadditions/models/item/esd_block.json 1278d7db6357414569c98a2e952be64dc986327d assets/actuallyadditions/models/item/farmer_block.json 3960955f0e96a0088d4b48881d42182d2f0006c2 assets/actuallyadditions/models/item/feeder_block.json 83611e64f98be7713c8d59468143c2ec8468ae8e assets/actuallyadditions/models/item/fermenting_barrel_block.json @@ -360,26 +376,23 @@ a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/en 9473fbfc3050a9652a5aeeb5f85dab643ee0ce45 assets/actuallyadditions/models/item/flax_block.json 86dc57da732f6dccb9fbf215baef75a9fc2a35fd assets/actuallyadditions/models/item/fluid_collector_block.json e09bdbddcd177907aaed963f848dfa0f51271ed4 assets/actuallyadditions/models/item/fluid_placer_block.json -45f5b08fa5fb245b1fc6cfbbcddfec80b26a676e assets/actuallyadditions/models/item/furnace_double_block.json -74248ce179bd2711d30bc325f49bb5a8f7dde88b assets/actuallyadditions/models/item/furnace_solar_block.json +fa68689be3f4311d003c628b7831ecee9fd80e72 assets/actuallyadditions/models/item/fluids_laser_relay_block.json 19641ba14214334fa4c502f34cc109d8804f3323 assets/actuallyadditions/models/item/green_fence_block.json 4c5a678dc881c854dcb2d6f2123ed5e459fb4856 assets/actuallyadditions/models/item/green_slab_block.json b25412614db4eb1b196fb8c1d29db3929506eaec assets/actuallyadditions/models/item/green_stairs_block.json 2eb66d4cffb3400d6aa08f21d0bb0bd2e762a628 assets/actuallyadditions/models/item/green_wall_block.json 2cc84f5398d18cdbda0f283b0f9caf9b75493758 assets/actuallyadditions/models/item/greenhouse_glass_block.json -3a25d24da92dda33bdaf0d647f14c01d58d1fa1a assets/actuallyadditions/models/item/grinder_block.json -5c31da962d9568ad85948d49f442e2305ca57172 assets/actuallyadditions/models/item/grinder_double_block.json 66471a00731b2df91c36c59827f9e07444c9c301 assets/actuallyadditions/models/item/heat_collector_block.json -8528533c2970c7e2c903d428ecfc561f75a1426e assets/actuallyadditions/models/item/inputter_advanced_block.json -9439f0a93e0e6083501d75a99772b6d5c89a06ce assets/actuallyadditions/models/item/inputter_block.json +76ed4ff443bb3a205e1548283fb32a7be5cefde9 assets/actuallyadditions/models/item/hopping_item_interface_block.json cc05fca55e55883f67ceac4cb3415f66d5781839 assets/actuallyadditions/models/item/iron_casing_block.json 5d2d679627727fe3d72531c5385cef5349282f7a assets/actuallyadditions/models/item/iron_casing_snow_block.json +bd1cb3ca86dfb9dfe128e207c067e95417fe7acc assets/actuallyadditions/models/item/item_interface_block.json +681f91c05610fb0a9a0448ce97fd66b2bb4f6abf assets/actuallyadditions/models/item/item_laser_relay_block.json 35a21070654764edd4a7fe580be7e73fe64a4bdd assets/actuallyadditions/models/item/item_repairer_block.json -77d6a28b16be41d29b69909e4234f0ca446e10ff assets/actuallyadditions/models/item/item_viewer_block.json -a77253623e0f3f5adc69c2a9e8f2ac6ccbdb7ac4 assets/actuallyadditions/models/item/item_viewer_hopping_block.json a97d1910bf7d91d2740f4fb138303db13d6fb34a assets/actuallyadditions/models/item/lamp_black_block.json 46a815ab863a329716a5c56f72525940f45bb6ea assets/actuallyadditions/models/item/lamp_blue_block.json aff2bb271e9db49d31fca1ec20879682091acb41 assets/actuallyadditions/models/item/lamp_brown_block.json +e8ecba4fda0c7a076477279ee05cafda1eee76ae assets/actuallyadditions/models/item/lamp_controller_block.json 205a420e45ffb6b22f5306769b910d9819b5cf1c assets/actuallyadditions/models/item/lamp_cyan_block.json be50edc193756b24d85d3ba9610d617f33db39fe assets/actuallyadditions/models/item/lamp_gray_block.json c418b302b4fc8c6ca6f932db2920f4849765420a assets/actuallyadditions/models/item/lamp_green_block.json @@ -389,17 +402,10 @@ f7331d882f1b72a9e2e3f84da7766094046b31ea assets/actuallyadditions/models/item/la 88afed50535c5e3900ed7f9dd125abf6779a969f assets/actuallyadditions/models/item/lamp_magenta_block.json b52ea14250fede6e2d2e7c79b40f9261bef9e4f9 assets/actuallyadditions/models/item/lamp_orange_block.json 865fbd2978d97c7c9c76f3f46591fd9548396bf6 assets/actuallyadditions/models/item/lamp_pink_block.json -7865dd7565e878496de62ee472ca83ac9bfacf5a assets/actuallyadditions/models/item/lamp_powerer_block.json cce34e8562d22827c0b2a5c1a335bdd22f2f3273 assets/actuallyadditions/models/item/lamp_purple_block.json 252d4da70bcaae954ff5e189907de6c3a704d4a6 assets/actuallyadditions/models/item/lamp_red_block.json 0b1100c04a3d094474f0aec211b6752f5de6f523 assets/actuallyadditions/models/item/lamp_white_block.json 080441c84716c888510ac03dc6c0b07b36aaf0f4 assets/actuallyadditions/models/item/lamp_yellow_block.json -b0263e7cc29bb76c4ac9f6d0bb92518ad98b1897 assets/actuallyadditions/models/item/laser_relay_advanced_block.json -b164479aadf77da458e695d351273e5bcd4f3f73 assets/actuallyadditions/models/item/laser_relay_block.json -028193f172e5749b4e1bbd009f90cef6bc6446de assets/actuallyadditions/models/item/laser_relay_extreme_block.json -10cf9b09aa7ce410ece80178b4753fe2f4092f9c assets/actuallyadditions/models/item/laser_relay_fluids_block.json -e29a79d13486d81bbeef23d4dfeb79e3e87160f0 assets/actuallyadditions/models/item/laser_relay_item_block.json -9d292c713a2902cbfd1bf1aad46b72b4bf49624b assets/actuallyadditions/models/item/laser_relay_item_whitelist_block.json 743a65e40d1cbe597837ca9f22c0f1c698a5568c assets/actuallyadditions/models/item/lava_factory_case_block.json 35bfe573e7a312ed7c225f0d848053b9c0d3dc2a assets/actuallyadditions/models/item/lava_factory_controller_block.json 925910d216200453c6f33a3023254a5a60507441 assets/actuallyadditions/models/item/leaf_generator_block.json @@ -432,11 +438,9 @@ e11b239b9d734e214193f45a00f7a6919ab6d2c1 assets/actuallyadditions/models/item/ph 513bdbdb5e9fd256c34351c18ac4eb2efe818bc4 assets/actuallyadditions/models/item/phantom_placer_block.json f5cf5dc0ee09ae6ff3736255d82b4652a68b1412 assets/actuallyadditions/models/item/phantom_redstoneface_block.json a7d4c776d58c9292f99150b35aa6bb84146f290f assets/actuallyadditions/models/item/phantomface_block.json -0d00e9079f04d0d4e74a4da64166f7df62045876 assets/actuallyadditions/models/item/pillar_quartz_slab_block.json -19cd57cd7a064c11eeeff37c7462f961715c53ce assets/actuallyadditions/models/item/pillar_quartz_stair_block.json -9684021c3fa8261a313baf5ee643987a3e37c771 assets/actuallyadditions/models/item/pillar_quartz_wall_block.json 11af1e02606f2283a629725d4e428b4903e6af26 assets/actuallyadditions/models/item/placer_block.json c1160cdeb93906066fe48941bff15df1d2a0eba0 assets/actuallyadditions/models/item/player_interface_block.json +883ee3452093e194ba6ce9d0080503f8632c4769 assets/actuallyadditions/models/item/powered_furnace_block.json 7bba09610775eb952d606503b2a3d1cf53c879ff assets/actuallyadditions/models/item/quartz_axe.json 54fb808aed07fcfb05f00a106ec5702741bc4039 assets/actuallyadditions/models/item/quartz_boots.json 2925dd7f88077a3b4785896bc1629e578ce6431c assets/actuallyadditions/models/item/quartz_chest.json @@ -445,10 +449,7 @@ eb82609dc88ed0191e68c525c85709eaf7e56a3e assets/actuallyadditions/models/item/qu e7defe0b4ca9c8de825236c45430005dd52e7006 assets/actuallyadditions/models/item/quartz_leggings.json af0512cfb813e6fb43bb920db3eb1f1c2976ace6 assets/actuallyadditions/models/item/quartz_pickaxe.json 10afec0e4b4f4adfab5e4286455ffc2c5b1f845f assets/actuallyadditions/models/item/quartz_shovel.json -40667318f04e85c1234afdc064e1e3672b9f4332 assets/actuallyadditions/models/item/quartz_slab_block.json -d4622aaad54b32b2429b06e9970667cce625b4a0 assets/actuallyadditions/models/item/quartz_stair_block.json bb0fbcacce026c672b8d98db22694fd2b6eefb20 assets/actuallyadditions/models/item/quartz_sword.json -4502aca75666bab68c2d1033750a210f26cb8d61 assets/actuallyadditions/models/item/quartz_wall_block.json dc81fa6e9280a8403f7f747e9edcb259575ae5d5 assets/actuallyadditions/models/item/ranged_collector_block.json 5300d3a0ece8b26a0bc0631df9151bebaef8a1b9 assets/actuallyadditions/models/item/restonia_axe.json 5ceb9b78fdc192c7b916df639da93dc5114e850f assets/actuallyadditions/models/item/restonia_boots.json @@ -463,6 +464,7 @@ bb5a27e6545bd6d9e5935ea59b1fb59c640b4fd6 assets/actuallyadditions/models/item/re 12fafb570deeab62b84d76b645f5eb79a1b65923 assets/actuallyadditions/models/item/rice_block.json a2d1eda557476e8f4a21ba40635949106b828b71 assets/actuallyadditions/models/item/shock_suppressor_block.json ed85d0bf06c97604436d25c0f8167ffaa690342c assets/actuallyadditions/models/item/smiley_cloud_block.json +f9b2e4a02149284e112cf645c70404b55b1b75aa assets/actuallyadditions/models/item/solar_panel_block.json 10bb7fb456cb1ce636b40844d607b617e43ee45a assets/actuallyadditions/models/item/tiny_torch_block.json 0443cb44ad47bce4b409577f727f7e61ed8ff748 assets/actuallyadditions/models/item/treasure_chest_block.json 861ae2abeaca3a3f16ceeffefc15764c6b845b60 assets/actuallyadditions/models/item/void_axe.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/advanced_item_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/advanced_item_laser_relay_block.json new file mode 100644 index 000000000..c1c37bdcf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/advanced_item_laser_relay_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/advanced_item_laser_relay_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json index d3f160ec0..2360649ac 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json @@ -1,10 +1,10 @@ { "variants": { "type=top": { - "model": "actuallyadditions:block/chiseled_quartz_slab_block_top" + "model": "actuallyadditions:block/black_chiseled_quartz_slab_block_top" }, "type=bottom": { - "model": "actuallyadditions:block/chiseled_quartz_slab_block" + "model": "actuallyadditions:block/black_chiseled_quartz_slab_block" }, "type=double": { "model": "actuallyadditions:block/black_quartz_chiseled_block" diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json index 68a4c6613..6fe95afa4 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json @@ -1,209 +1,209 @@ { "variants": { "facing=north,half=top,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=straight": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block" + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block" }, "facing=north,half=top,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner" + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner" }, "facing=west,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_inner" + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_inner" }, "facing=north,half=top,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer" + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer" }, "facing=west,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/chiseled_quartz_stair_block_outer" + "model": "actuallyadditions:block/black_chiseled_quartz_stair_block_outer" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json similarity index 58% rename from src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json index 611379583..f1408fc76 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_post" + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_post" } }, { @@ -13,7 +13,7 @@ "east": "low" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", "y": 90, "uvlock": true } @@ -23,7 +23,7 @@ "east": "tall" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", "y": 90, "uvlock": true } @@ -33,7 +33,7 @@ "north": "low" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", "uvlock": true } }, @@ -42,7 +42,7 @@ "north": "tall" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", "uvlock": true } }, @@ -51,7 +51,7 @@ "south": "low" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", "y": 180, "uvlock": true } @@ -61,7 +61,7 @@ "south": "tall" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", "y": 180, "uvlock": true } @@ -71,7 +71,7 @@ "west": "low" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", "y": 270, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "actuallyadditions:block/chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", "y": 270, "uvlock": true } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json index 535508bfe..3968b7611 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json @@ -1,10 +1,10 @@ { "variants": { "type=top": { - "model": "actuallyadditions:block/pillar_quartz_slab_block_top" + "model": "actuallyadditions:block/black_pillar_quartz_slab_block_top" }, "type=bottom": { - "model": "actuallyadditions:block/pillar_quartz_slab_block" + "model": "actuallyadditions:block/black_pillar_quartz_slab_block" }, "type=double": { "model": "actuallyadditions:block/black_quartz_pillar_block" diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json index 05304db10..87d04a0c1 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json @@ -1,209 +1,209 @@ { "variants": { "facing=north,half=top,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=straight": { - "model": "actuallyadditions:block/pillar_quartz_stair_block" + "model": "actuallyadditions:block/black_pillar_quartz_stair_block" }, "facing=north,half=top,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner" + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner" }, "facing=west,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_inner" + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_inner" }, "facing=north,half=top,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer" + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer" }, "facing=west,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer", + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/pillar_quartz_stair_block_outer" + "model": "actuallyadditions:block/black_pillar_quartz_stair_block_outer" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json similarity index 59% rename from src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json index eeb9322ef..eaa6f9b3d 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/pillar_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_post" + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_post" } }, { @@ -13,7 +13,7 @@ "east": "low" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", "y": 90, "uvlock": true } @@ -23,7 +23,7 @@ "east": "tall" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", "y": 90, "uvlock": true } @@ -33,7 +33,7 @@ "north": "low" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", "uvlock": true } }, @@ -42,7 +42,7 @@ "north": "tall" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", "uvlock": true } }, @@ -51,7 +51,7 @@ "south": "low" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", "y": 180, "uvlock": true } @@ -61,7 +61,7 @@ "south": "tall" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", "y": 180, "uvlock": true } @@ -71,7 +71,7 @@ "west": "low" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", "y": 270, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "actuallyadditions:block/pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", "y": 270, "uvlock": true } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab_block.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/blockstates/quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab_block.json index c7a60bb37..5f7b1ab8b 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_slab_block.json @@ -1,10 +1,10 @@ { "variants": { "type=top": { - "model": "actuallyadditions:block/quartz_slab_block_top" + "model": "actuallyadditions:block/black_quartz_slab_block_top" }, "type=bottom": { - "model": "actuallyadditions:block/quartz_slab_block" + "model": "actuallyadditions:block/black_quartz_slab_block" }, "type=double": { "model": "actuallyadditions:block/black_quartz_block" diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair_block.json similarity index 57% rename from src/generated/resources/assets/actuallyadditions/blockstates/quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair_block.json index 7869f7cfd..488c66e3b 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_stair_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_stair_block.json @@ -1,209 +1,209 @@ { "variants": { "facing=north,half=top,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block", + "model": "actuallyadditions:block/black_quartz_stair_block", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=straight": { - "model": "actuallyadditions:block/quartz_stair_block" + "model": "actuallyadditions:block/black_quartz_stair_block" }, "facing=north,half=top,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner" + "model": "actuallyadditions:block/black_quartz_stair_block_inner" }, "facing=west,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=inner_left": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=north,half=top,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "uvlock": true }, "facing=south,half=top,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner", + "model": "actuallyadditions:block/black_quartz_stair_block_inner", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "actuallyadditions:block/quartz_stair_block_inner" + "model": "actuallyadditions:block/black_quartz_stair_block_inner" }, "facing=north,half=top,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=east,half=top,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=north,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer" + "model": "actuallyadditions:block/black_quartz_stair_block_outer" }, "facing=west,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=north,half=top,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "uvlock": true }, "facing=south,half=top,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 180, "uvlock": true }, "facing=west,half=top,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 270, "uvlock": true }, "facing=south,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 90, "uvlock": true }, "facing=west,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer", + "model": "actuallyadditions:block/black_quartz_stair_block_outer", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=outer_right": { - "model": "actuallyadditions:block/quartz_stair_block_outer" + "model": "actuallyadditions:block/black_quartz_stair_block_outer" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall_block.json similarity index 61% rename from src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall_block.json index e68bdc088..1153da487 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_wall_block.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_post" + "model": "actuallyadditions:block/black_quartz_wall_block_post" } }, { @@ -13,7 +13,7 @@ "east": "low" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_wall_block_side", "y": 90, "uvlock": true } @@ -23,7 +23,7 @@ "east": "tall" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_wall_block_side_tall", "y": 90, "uvlock": true } @@ -33,7 +33,7 @@ "north": "low" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_wall_block_side", "uvlock": true } }, @@ -42,7 +42,7 @@ "north": "tall" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_wall_block_side_tall", "uvlock": true } }, @@ -51,7 +51,7 @@ "south": "low" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_wall_block_side", "y": 180, "uvlock": true } @@ -61,7 +61,7 @@ "south": "tall" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_wall_block_side_tall", "y": 180, "uvlock": true } @@ -71,7 +71,7 @@ "west": "low" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_wall_block_side", "y": 270, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "actuallyadditions:block/quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_wall_block_side_tall", "y": 270, "uvlock": true } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crusher_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_block.json new file mode 100644 index 000000000..e698c7e12 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crusher_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double_block.json new file mode 100644 index 000000000..4ae4839ff --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crusher_double_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crusher_double_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_coal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_coal_block.json deleted file mode 100644 index 6b039ba71..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_coal_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_coal_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamatine_block.json new file mode 100644 index 000000000..a0067b97e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamatine_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_diamatine_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamond_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamond_block.json deleted file mode 100644 index 2b0a08522..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_diamond_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_diamond_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emeradic_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emeradic_block.json new file mode 100644 index 000000000..2c9bcc462 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emeradic_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_emeradic_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emerald_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emerald_block.json deleted file mode 100644 index d8d543624..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_emerald_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_emerald_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_enori_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_enori_block.json new file mode 100644 index 000000000..f9a23bb82 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_enori_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_enori_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_iron_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_iron_block.json deleted file mode 100644 index 57f5eb1fe..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_iron_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_iron_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_lapis_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_lapis_block.json deleted file mode 100644 index 335cf5a72..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_lapis_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_lapis_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_palis_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_palis_block.json new file mode 100644 index 000000000..480f8f7de --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_palis_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_palis_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_redstone_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_redstone_block.json deleted file mode 100644 index 03d899cee..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_redstone_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_cluster_redstone_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_restonia_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_restonia_block.json new file mode 100644 index 000000000..5cbba8589 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_restonia_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_restonia_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_void_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_void_block.json new file mode 100644 index 000000000..59c39b169 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_cluster_void_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_cluster_void_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_block.json new file mode 100644 index 000000000..4c7fbbe37 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_diamatine_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json new file mode 100644 index 000000000..5e79718ea --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_diamatine_empowered_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_block.json deleted file mode 100644 index fd0b66a0a..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_diamond_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_empowered_block.json deleted file mode 100644 index 109e401af..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_diamond_empowered_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_diamond_empowered_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_block.json new file mode 100644 index 000000000..cada0d99b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_emeradic_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json new file mode 100644 index 000000000..a90ee1a13 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_emeradic_empowered_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_block.json deleted file mode 100644 index d78655b64..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_emerald_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_empowered_block.json deleted file mode 100644 index 323c5a4ac..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_emerald_empowered_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_emerald_empowered_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_block.json deleted file mode 100644 index 0a6bc010a..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_lapis_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_empowered_block.json deleted file mode 100644 index 49146aba5..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_lapis_empowered_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_lapis_empowered_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_block.json new file mode 100644 index 000000000..85c724edd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_palis_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json new file mode 100644 index 000000000..d01d851dd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_palis_empowered_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_block.json deleted file mode 100644 index 99d2c444e..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_redstone_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_empowered_block.json deleted file mode 100644 index b4c46ed0c..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_redstone_empowered_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_redstone_empowered_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_block.json new file mode 100644 index 000000000..cf8746e65 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_restonia_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json new file mode 100644 index 000000000..f83cdb5db --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_restonia_empowered_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_advanced_block.json new file mode 100644 index 000000000..f3d631a2a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_advanced_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/energy_laser_relay_advanced_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_block.json new file mode 100644 index 000000000..b5cc5fdc1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/energy_laser_relay_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_extreme_block.json new file mode 100644 index 000000000..5ec808fe4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/energy_laser_relay_extreme_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/energy_laser_relay_extreme_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/esd_advanced_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/esd_advanced_block.json new file mode 100644 index 000000000..60f751e25 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/esd_advanced_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/esd_advanced_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/esd_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/esd_block.json new file mode 100644 index 000000000..4b5be8d24 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/esd_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/esd_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/fluids_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/fluids_laser_relay_block.json new file mode 100644 index 000000000..116032779 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/fluids_laser_relay_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/fluids_laser_relay_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/furnace_double_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/furnace_double_block.json deleted file mode 100644 index 5573d16c4..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/furnace_double_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/furnace_double_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/furnace_solar_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/furnace_solar_block.json deleted file mode 100644 index b43728a28..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/furnace_solar_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/furnace_solar_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/grinder_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/grinder_block.json deleted file mode 100644 index f824b8010..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/grinder_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/grinder_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/grinder_double_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/grinder_double_block.json deleted file mode 100644 index 61c7a699b..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/grinder_double_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/grinder_double_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface_block.json new file mode 100644 index 000000000..605679bae --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/hopping_item_interface_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/inputter_advanced_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/inputter_advanced_block.json deleted file mode 100644 index f9972e096..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/inputter_advanced_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/inputter_advanced_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/inputter_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/inputter_block.json deleted file mode 100644 index a9179def2..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/inputter_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/inputter_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_interface_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_interface_block.json new file mode 100644 index 000000000..ed6fc713d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/item_interface_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/item_interface_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_laser_relay_block.json new file mode 100644 index 000000000..6a5816914 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/item_laser_relay_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/item_laser_relay_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_block.json deleted file mode 100644 index 6c0aca4db..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/item_viewer_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping_block.json deleted file mode 100644 index 06f39dca8..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/item_viewer_hopping_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller_block.json new file mode 100644 index 000000000..cf281ba2b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_controller_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/lamp_controller_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_powerer_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/lamp_powerer_block.json deleted file mode 100644 index 6236d2293..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/lamp_powerer_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/lamp_powerer_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced_block.json deleted file mode 100644 index 23c268c10..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_advanced_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_advanced_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_block.json deleted file mode 100644 index b2bceda7f..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme_block.json deleted file mode 100644 index 5fba1fa27..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_extreme_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_extreme_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids_block.json deleted file mode 100644 index c2a29fd30..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_fluids_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_fluids_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_block.json deleted file mode 100644 index 143ee6042..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_item_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_whitelist_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_whitelist_block.json deleted file mode 100644 index fd9cead6b..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/laser_relay_item_whitelist_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/laser_relay_item_whitelist_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace_block.json new file mode 100644 index 000000000..04d87734b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/powered_furnace_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/powered_furnace_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json new file mode 100644 index 000000000..bfddf4aa0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/solar_panel_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json new file mode 100644 index 000000000..9296f209c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -0,0 +1,128 @@ +{ + "block.actuallyadditions.advanced_item_laser_relay_block": "Advanced Item Laser Relay", + "block.actuallyadditions.atomic_reconstructor_block": "Atomic Reconstructor", + "block.actuallyadditions.battery_box_block": "Battery Box", + "block.actuallyadditions.bio_reactor_block": "Bio Reactor", + "block.actuallyadditions.black_chiseled_quartz_slab_block": "Chiseled Black Quartz Slab", + "block.actuallyadditions.black_chiseled_quartz_stair_block": "Chiseled Black Quartz Stairs", + "block.actuallyadditions.black_chiseled_quartz_wall_block": "Chiseled Black Quartz Wall", + "block.actuallyadditions.black_lotus_block": "Black lotus", + "block.actuallyadditions.black_pillar_quartz_slab_block": "Black Quartz Pillar Slab", + "block.actuallyadditions.black_pillar_quartz_stair_block": "Black Quartz Pillar Stairs", + "block.actuallyadditions.black_pillar_quartz_wall_block": "Black Quartz Wall Pillar", + "block.actuallyadditions.black_quartz_block": "Block of Black Quartz", + "block.actuallyadditions.black_quartz_chiseled_block": "Chiseled Black Quartz", + "block.actuallyadditions.black_quartz_pillar_block": "Black Quartz Pillar", + "block.actuallyadditions.black_quartz_slab_block": "Black Quartz Slab", + "block.actuallyadditions.black_quartz_stair_block": "Black Quartz Stairs", + "block.actuallyadditions.black_quartz_wall_block": "Black Quartz Wall", + "block.actuallyadditions.breaker_block": "Auto-Breaker", + "block.actuallyadditions.canola_block": "Canola", + "block.actuallyadditions.canola_press_block": "Conola Press", + "block.actuallyadditions.charcoal_block": "Charcoal", + "block.actuallyadditions.coal_generator_block": "Coal Generator", + "block.actuallyadditions.coffee_block": "Coffee", + "block.actuallyadditions.coffee_machine_block": "Coffee Machine", + "block.actuallyadditions.crusher_block": "Grinder", + "block.actuallyadditions.crusher_double_block": "Double Crusher", + "block.actuallyadditions.crystal_cluster_diamatine_block": "Diamatine Crystal Cluster", + "block.actuallyadditions.crystal_cluster_emeradic_block": "Emeradic Crystal Cluster", + "block.actuallyadditions.crystal_cluster_enori_block": "Enori Crystal Cluster", + "block.actuallyadditions.crystal_cluster_palis_block": "Palis Crystal Cluster", + "block.actuallyadditions.crystal_cluster_restonia_block": "Restonia Crystal Cluster", + "block.actuallyadditions.crystal_cluster_void_block": "Void Crystal Cluster", + "block.actuallyadditions.crystal_diamatine_block": "Block of Diamatine Crystals", + "block.actuallyadditions.crystal_diamatine_empowered_block": "Block of Empowered Diamatine Crystals", + "block.actuallyadditions.crystal_emeradic_block": "Block of Emeradic Crystals", + "block.actuallyadditions.crystal_emeradic_empowered_block": "Block of Empowered Emeradic Crystals", + "block.actuallyadditions.crystal_palis_block": "Block of Palis Crystals", + "block.actuallyadditions.crystal_palis_empowered_block": "Block of Empowered Palis Crystals", + "block.actuallyadditions.crystal_quarts_block": "?", + "block.actuallyadditions.crystal_quarts_empowered_block": "", + "block.actuallyadditions.crystal_restonia_block": "Block of Restonia Crystals", + "block.actuallyadditions.crystal_restonia_empowered_block": "Block of Empowered Restonia Crystals", + "block.actuallyadditions.crystal_void_block": "Block of Void Crystals", + "block.actuallyadditions.crystal_void_empowered_block": "Block of Empowered Void Crystals", + "block.actuallyadditions.directional_breaker_block": "Directional Breaker", + "block.actuallyadditions.display_stand_block": "Display Stand", + "block.actuallyadditions.dropper_block": "Precision Dropper", + "block.actuallyadditions.empowerer_block": "Empowerer", + "block.actuallyadditions.ender_casing_block": "Ender Casing", + "block.actuallyadditions.enderpearl_block": "Block of Ender Pearls", + "block.actuallyadditions.energizer_block": "Energizer", + "block.actuallyadditions.energy_laser_relay_advanced_block": "Advanced Energy Laser Relay", + "block.actuallyadditions.energy_laser_relay_block": "Energy Laser relay", + "block.actuallyadditions.energy_laser_relay_extreme_block": "Extreme Energy Laser Relay", + "block.actuallyadditions.enervator_block": "Enervator", + "block.actuallyadditions.esd_advanced_block": "Advanced ASD", + "block.actuallyadditions.esd_block": "ESD", + "block.actuallyadditions.farmer_block": "Farmer", + "block.actuallyadditions.feeder_block": "Feeder", + "block.actuallyadditions.fermenting_barrel_block": "Fermenting Barrel", + "block.actuallyadditions.firework_box_block": "Firework Box", + "block.actuallyadditions.fishing_net_block": "Fishing Net", + "block.actuallyadditions.flax_block": "Flax", + "block.actuallyadditions.fluid_collector_block": "Fluid Collector", + "block.actuallyadditions.fluid_placer_block": "Fluid Placer", + "block.actuallyadditions.fluids_laser_relay_block": "Fluid Laser Relay", + "block.actuallyadditions.green_fence_block": "Ethentic Green Fence", + "block.actuallyadditions.green_slab_block": "Ethentic Green Slab", + "block.actuallyadditions.green_stairs_block": "Ethentic Green Stairs", + "block.actuallyadditions.green_wall_block": "Ethentic Green Wall", + "block.actuallyadditions.greenhouse_glass_block": "Greenhouse Glass", + "block.actuallyadditions.heat_collector_block": "Heat Collector", + "block.actuallyadditions.hopping_item_interface_block": "Hopping Item Interface", + "block.actuallyadditions.iron_casing_block": "Iron Casing", + "block.actuallyadditions.iron_casing_snow_block": "?", + "block.actuallyadditions.item_interface_block": "Item Interface", + "block.actuallyadditions.item_laser_relay_block": "Item Laser Relay", + "block.actuallyadditions.item_repairer_block": "Item Repairer", + "block.actuallyadditions.lamp_black_block": "Black Lamp", + "block.actuallyadditions.lamp_blue_block": "Blue Lamp", + "block.actuallyadditions.lamp_brown_block": "Brown Lamp", + "block.actuallyadditions.lamp_controller_block": "Lamp Controller", + "block.actuallyadditions.lamp_cyan_block": "Cyan Lamp", + "block.actuallyadditions.lamp_gray_block": "Gray Lamp", + "block.actuallyadditions.lamp_green_block": "Green Lamp", + "block.actuallyadditions.lamp_light_blue_block": "Light Blue Lamp", + "block.actuallyadditions.lamp_light_gray_block": "Light Gray Lamp", + "block.actuallyadditions.lamp_lime_block": "Lime Lamp", + "block.actuallyadditions.lamp_magenta_block": "Magenta Lamp", + "block.actuallyadditions.lamp_orange_block": "Orange Lamp", + "block.actuallyadditions.lamp_pink_block": "Pink Lamp", + "block.actuallyadditions.lamp_purple_block": "Purple Lamp", + "block.actuallyadditions.lamp_red_block": "Red Lamp", + "block.actuallyadditions.lamp_white_block": "White Lamp", + "block.actuallyadditions.lamp_yellow_block": "Yellow Lamp", + "block.actuallyadditions.lava_factory_case_block": "Casing", + "block.actuallyadditions.lava_factory_controller_block": "Lava Factory Controller", + "block.actuallyadditions.leaf_generator_block": "Leaf Generator", + "block.actuallyadditions.miner_block": "Miner", + "block.actuallyadditions.oil_generator_block": "Oil Generator", + "block.actuallyadditions.ore_black_quartz_block": "Black Quartz Ore", + "block.actuallyadditions.phantom_booster_block": "Phantom Booster", + "block.actuallyadditions.phantom_breaker_block": "Phantom Breaker", + "block.actuallyadditions.phantom_energyface_block": "Phantom Energyface", + "block.actuallyadditions.phantom_liquiface_block": "Phantom Liquiface", + "block.actuallyadditions.phantom_placer_block": "Phantom Placer", + "block.actuallyadditions.phantom_redstoneface_block": "Phantom Restoneface", + "block.actuallyadditions.phantomface_block": "Phantomface", + "block.actuallyadditions.placer_block": "Auto-Placer", + "block.actuallyadditions.player_interface_block": "Player Interface", + "block.actuallyadditions.powered_furnace_block": "Powered Furnace", + "block.actuallyadditions.ranged_collector_block": "Ranged Collector", + "block.actuallyadditions.rice_block": "Rice", + "block.actuallyadditions.shock_suppressor_block": "Shock", + "block.actuallyadditions.smiley_cloud_block": "Smiley Cloud", + "block.actuallyadditions.solar_panel_block": "Solar Panel", + "block.actuallyadditions.tiny_torch_block": "Tiny Torch", + "block.actuallyadditions.treasure_chest_block": "Treasure Chest", + "block.actuallyadditions.white_fence_block": "Ethentic Quartz Fence", + "block.actuallyadditions.white_slab_block": "Ethentic Quartz Slab", + "block.actuallyadditions.white_stairs_block": "Ethentic Quartz Stairs", + "block.actuallyadditions.white_wall_block": "Ethentic Quartz Wall", + "block.actuallyadditions.wood_casing_block": "Wood Casing", + "block.actuallyadditions.xp_solidifier_block": "XP Solidifier", + "itemGroup.actuallyadditions": "Actually Additions", + "misc.message.so_cute": "So cute!" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json index 6adc3b109..521691981 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_diamond_empowered_block" + "all": "actuallyadditions:block/advanced_item_laser_relay_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block_top.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_slab_block_top.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_slab_block_top.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_inner.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_inner.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_inner.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_outer.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_stair_block_outer.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_outer.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_post.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json 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/black_chiseled_quartz_wall_block_side_tall.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/chiseled_quartz_wall_block_side_tall.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_slab_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_slab_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_slab_block_top.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_slab_block_top.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_slab_block_top.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_inner.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_inner.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_inner.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_outer.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_stair_block_outer.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_outer.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_post.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json 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/black_pillar_quartz_wall_block_side_tall.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/pillar_quartz_wall_block_side_tall.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side_tall.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_block_top.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_slab_block_top.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_block_top.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block_inner.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_inner.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block_inner.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block_outer.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_stair_block_outer.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_block_outer.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_post.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_post.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_post.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_side.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_side.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_side_tall.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/quartz_wall_block_side_tall.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_block_side_tall.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crusher_block.json similarity index 55% rename from src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crusher_block.json index 179cbad5e..79db79a61 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/grinder_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crusher_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/grinder_block" + "all": "actuallyadditions:block/crusher_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crusher_double_block.json similarity index 52% rename from src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crusher_double_block.json index 949f73954..b53936935 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/furnace_solar_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crusher_double_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/furnace_solar_block" + "all": "actuallyadditions:block/crusher_double_block" } } \ No newline at end of file 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 deleted file mode 100644 index b2f3ee6ed..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_coal_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_cluster_coal_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json index e9b21b0a8..c2d976d22 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_emerald_empowered_block" + "all": "actuallyadditions:block/crystal_cluster_diamatine_block" } } \ No newline at end of file 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 deleted file mode 100644 index c6a31b8ea..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_diamond_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_cluster_diamond_block" - } -} \ No newline at end of file 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_emeradic_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json index 4fc60cc61..dced63d37 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_redstone_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_cluster_redstone_block" + "all": "actuallyadditions:block/crystal_cluster_emeradic_block" } } \ No newline at end of file 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_enori_block.json similarity index 50% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json index c060ad102..daaa5c651 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_lapis_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_cluster_lapis_block" + "all": "actuallyadditions:block/crystal_cluster_enori_block" } } \ No newline at end of file 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 deleted file mode 100644 index 34ff2733a..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_iron_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_cluster_iron_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json new file mode 100644 index 000000000..d5d834635 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_cluster_palis_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json new file mode 100644 index 000000000..67a533852 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_cluster_restonia_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json new file mode 100644 index 000000000..f4c6cbbfe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_cluster_void_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json new file mode 100644 index 000000000..6bd6d1429 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_diamatine_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json new file mode 100644 index 000000000..1588bbe57 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_diamatine_empowered_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json index 1ef29395d..5b25d61d7 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_redstone_block" + "all": "actuallyadditions:block/crystal_emeradic_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json index b301c439a..43a8cba40 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_redstone_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_redstone_empowered_block" + "all": "actuallyadditions:block/crystal_emeradic_empowered_block" } } \ No newline at end of file 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 deleted file mode 100644 index 7bd961856..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_empowered_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_lapis_empowered_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_block.json similarity index 52% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_block.json index 2f02cabec..7b6557b12 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_lapis_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_lapis_block" + "all": "actuallyadditions:block/crystal_palis_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json similarity index 50% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json index b40842e59..047eb04b5 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_cluster_emerald_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_cluster_emerald_block" + "all": "actuallyadditions:block/crystal_palis_empowered_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json new file mode 100644 index 000000000..87cacb725 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_restonia_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json index dd1c2a117..b0e8e9402 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_whitelist_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/laser_relay_item_whitelist_block" + "all": "actuallyadditions:block/crystal_restonia_empowered_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json new file mode 100644 index 000000000..1ba252c3b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/energy_laser_relay_advanced_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json new file mode 100644 index 000000000..abe37a3eb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/energy_laser_relay_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json new file mode 100644 index 000000000..d4f29c74c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/energy_laser_relay_extreme_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/esd_advanced_block.json similarity index 52% rename from src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/esd_advanced_block.json index 03f775415..44b8fcebf 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_powerer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/esd_advanced_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_powerer_block" + "all": "actuallyadditions:block/esd_advanced_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json b/src/generated/resources/assets/actuallyadditions/models/block/esd_block.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/esd_block.json index 3b55364ac..af92f54b2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/inputter_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/esd_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/inputter_block" + "all": "actuallyadditions:block/esd_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json new file mode 100644 index 000000000..6b3c3fae8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/fluids_laser_relay_block" + } +} \ No newline at end of file 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 deleted file mode 100644 index 0dfa5b0ea..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/grinder_double_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/grinder_double_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json b/src/generated/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json new file mode 100644 index 000000000..e1e0fab4a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/hopping_item_interface_block" + } +} \ No newline at end of file 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 deleted file mode 100644 index 8b6356d28..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/inputter_advanced_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/inputter_advanced_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_interface_block.json similarity index 52% rename from src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/item_interface_block.json index 241977d3d..57a6234e1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/furnace_double_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/item_interface_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/furnace_double_block" + "all": "actuallyadditions:block/item_interface_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json new file mode 100644 index 000000000..f253dbc82 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/item_laser_relay_block" + } +} \ No newline at end of file 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 deleted file mode 100644 index a000ad6bc..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_hopping_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/item_viewer_hopping_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_controller_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/lamp_controller_block.json index a740d3094..080add135 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_emerald_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_controller_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_emerald_block" + "all": "actuallyadditions:block/lamp_controller_block" } } \ No newline at end of file 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 deleted file mode 100644 index ee3046ac8..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_advanced_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/laser_relay_advanced_block" - } -} \ No newline at end of file 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 deleted file mode 100644 index c2f84c888..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/laser_relay_block" - } -} \ No newline at end of file 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 deleted file mode 100644 index 0871e5ea8..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_extreme_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/laser_relay_extreme_block" - } -} \ No newline at end of file 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 deleted file mode 100644 index bb73b2078..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_fluids_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/laser_relay_fluids_block" - } -} \ No newline at end of file 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 deleted file mode 100644 index 53e0fd742..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/laser_relay_item_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/laser_relay_item_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json b/src/generated/resources/assets/actuallyadditions/models/block/powered_furnace_block.json similarity index 51% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/powered_furnace_block.json index c4098bcbc..e4fee317c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_diamond_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/powered_furnace_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_diamond_block" + "all": "actuallyadditions:block/powered_furnace_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json index 9cb24380e..800a02405 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_viewer_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/item_viewer_block" + "all": "actuallyadditions:block/solar_panel_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_item_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_item_laser_relay_block.json new file mode 100644 index 000000000..b5c08e29c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_item_laser_relay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/advanced_item_laser_relay_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json new file mode 100644 index 000000000..58b30acbc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_chiseled_quartz_slab_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json new file mode 100644 index 000000000..cf182cfe4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_chiseled_quartz_stair_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json new file mode 100644 index 000000000..33e9e9ca2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_chiseled_quartz_wall_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json new file mode 100644 index 000000000..7ab58a8f8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_pillar_quartz_slab_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json new file mode 100644 index 000000000..c53a2ac97 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_pillar_quartz_stair_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json new file mode 100644 index 000000000..d06f3e320 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_pillar_quartz_wall_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab_block.json new file mode 100644 index 000000000..28c8ffd05 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_slab_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair_block.json new file mode 100644 index 000000000..a5e9b59ec --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_stair_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json new file mode 100644 index 000000000..e9ee6a083 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_wall_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/booklet.json b/src/generated/resources/assets/actuallyadditions/models/item/booklet.json new file mode 100644 index 000000000..742e0d1bd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/booklet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/booklet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_slab_block.json deleted file mode 100644 index 42959a99e..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_slab_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/chiseled_quartz_slab_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_stair_block.json deleted file mode 100644 index 0646b4676..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_stair_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/chiseled_quartz_stair_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_wall_block.json deleted file mode 100644 index 830383c45..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_quartz_wall_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/chiseled_quartz_wall_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crusher_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crusher_block.json new file mode 100644 index 000000000..7ed0c57b6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crusher_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crusher_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crusher_double_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crusher_double_block.json new file mode 100644 index 000000000..33f2f69ed --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crusher_double_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crusher_double_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_coal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_coal_block.json deleted file mode 100644 index 198f09300..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_coal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_coal_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamatine_block.json new file mode 100644 index 000000000..f118c1e92 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamatine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_diamatine_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamond_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamond_block.json deleted file mode 100644 index 7329bd7e5..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_diamond_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_diamond_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emeradic_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emeradic_block.json new file mode 100644 index 000000000..1f9a440f3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emeradic_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_emeradic_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emerald_block.json deleted file mode 100644 index d0e5b40d7..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_emerald_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_emerald_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_enori_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_enori_block.json new file mode 100644 index 000000000..510d14124 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_enori_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_enori_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_iron_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_iron_block.json deleted file mode 100644 index 09dc17cab..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_iron_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_iron_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_lapis_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_lapis_block.json deleted file mode 100644 index 9a3b1ff50..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_lapis_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_lapis_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_palis_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_palis_block.json new file mode 100644 index 000000000..5264cebb4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_palis_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_palis_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_redstone_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_redstone_block.json deleted file mode 100644 index 3098a3def..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_redstone_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_cluster_redstone_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_restonia_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_restonia_block.json new file mode 100644 index 000000000..d6d5563da --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_restonia_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_restonia_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_void_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_void_block.json new file mode 100644 index 000000000..39d06de98 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_cluster_void_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_cluster_void_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_block.json new file mode 100644 index 000000000..a719355c9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_diamatine_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json new file mode 100644 index 000000000..6c8224828 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_diamatine_empowered_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_block.json deleted file mode 100644 index 94aaee482..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_diamond_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_empowered_block.json deleted file mode 100644 index 88079bd77..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_diamond_empowered_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_diamond_empowered_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_block.json new file mode 100644 index 000000000..9df89ca3c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_emeradic_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json new file mode 100644 index 000000000..a13244253 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_emeradic_empowered_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_block.json deleted file mode 100644 index df17bbfb5..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_emerald_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_empowered_block.json deleted file mode 100644 index 346b0d0b3..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_emerald_empowered_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_emerald_empowered_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_block.json deleted file mode 100644 index 06fbd7b0d..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_lapis_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_empowered_block.json deleted file mode 100644 index 5ef95e452..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_lapis_empowered_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_lapis_empowered_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_block.json new file mode 100644 index 000000000..25256dcbd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_palis_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_empowered_block.json new file mode 100644 index 000000000..b51e76f16 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_palis_empowered_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_palis_empowered_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_block.json deleted file mode 100644 index d39ab58ce..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_redstone_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_empowered_block.json deleted file mode 100644 index dcbba3362..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_redstone_empowered_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_redstone_empowered_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_block.json new file mode 100644 index 000000000..cad029e4f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_restonia_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json new file mode 100644 index 000000000..f4e698f45 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_restonia_empowered_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_advanced_block.json new file mode 100644 index 000000000..10daf7682 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_advanced_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/energy_laser_relay_advanced_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_block.json new file mode 100644 index 000000000..0710cf73e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/energy_laser_relay_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_extreme_block.json new file mode 100644 index 000000000..5c9dc677c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/energy_laser_relay_extreme_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/energy_laser_relay_extreme_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/esd_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/item/esd_advanced_block.json new file mode 100644 index 000000000..7d9de5dd3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/esd_advanced_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/esd_advanced_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/esd_block.json b/src/generated/resources/assets/actuallyadditions/models/item/esd_block.json new file mode 100644 index 000000000..54be58f51 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/esd_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/esd_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/fluids_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/item/fluids_laser_relay_block.json new file mode 100644 index 000000000..1c2140814 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/fluids_laser_relay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/fluids_laser_relay_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/furnace_double_block.json b/src/generated/resources/assets/actuallyadditions/models/item/furnace_double_block.json deleted file mode 100644 index 37715c965..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/furnace_double_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/furnace_double_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/furnace_solar_block.json b/src/generated/resources/assets/actuallyadditions/models/item/furnace_solar_block.json deleted file mode 100644 index 32d3c1661..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/furnace_solar_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/furnace_solar_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/grinder_block.json b/src/generated/resources/assets/actuallyadditions/models/item/grinder_block.json deleted file mode 100644 index ea83027e4..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/grinder_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/grinder_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/grinder_double_block.json b/src/generated/resources/assets/actuallyadditions/models/item/grinder_double_block.json deleted file mode 100644 index b410619c1..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/grinder_double_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/grinder_double_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface_block.json b/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface_block.json new file mode 100644 index 000000000..b0acf5a57 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/hopping_item_interface_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/inputter_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/item/inputter_advanced_block.json deleted file mode 100644 index 64b0c7b6b..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/inputter_advanced_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/inputter_advanced_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/inputter_block.json b/src/generated/resources/assets/actuallyadditions/models/item/inputter_block.json deleted file mode 100644 index 83333640a..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/inputter_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/inputter_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_interface_block.json b/src/generated/resources/assets/actuallyadditions/models/item/item_interface_block.json new file mode 100644 index 000000000..300aae30e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_interface_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/item_interface_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/item/item_laser_relay_block.json new file mode 100644 index 000000000..5543c7e8f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_laser_relay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/item_laser_relay_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_block.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_block.json deleted file mode 100644 index cdd2a363b..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/item_viewer_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping_block.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping_block.json deleted file mode 100644 index be2e32457..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/item_viewer_hopping_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller_block.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller_block.json new file mode 100644 index 000000000..df5e4d845 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_controller_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_controller_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer_block.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer_block.json deleted file mode 100644 index f2cd507fc..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/lamp_powerer_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced_block.json deleted file mode 100644 index b6f061439..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_advanced_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_block.json deleted file mode 100644 index 14dd9ffb4..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme_block.json deleted file mode 100644 index e6d3a5579..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_extreme_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids_block.json deleted file mode 100644 index 7ec9328ce..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_fluids_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_block.json deleted file mode 100644 index 1cf9682b3..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_item_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_whitelist_block.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_whitelist_block.json deleted file mode 100644 index a7d1a938a..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_whitelist_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/laser_relay_item_whitelist_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_slab_block.json deleted file mode 100644 index 866dc1f5d..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_slab_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/pillar_quartz_slab_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_stair_block.json deleted file mode 100644 index b8c4e2020..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_stair_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/pillar_quartz_stair_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_wall_block.json deleted file mode 100644 index be227e605..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/pillar_quartz_wall_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/pillar_quartz_wall_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace_block.json b/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace_block.json new file mode 100644 index 000000000..dcb98df66 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/powered_furnace_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_slab_block.json deleted file mode 100644 index 744e3d235..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/quartz_slab_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/quartz_slab_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_stair_block.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_stair_block.json deleted file mode 100644 index 76b4d9ec2..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/quartz_stair_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/quartz_stair_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_wall_block.json deleted file mode 100644 index ddda4c9bf..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/quartz_wall_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/quartz_wall_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json b/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json new file mode 100644 index 000000000..c5f0cdba2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/solar_panel_block" +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index 6aebb7afb..3382bd330 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -82,6 +82,11 @@ public class ActuallyBlocks { public static final RegistryObject FLUID_COLLECTOR = BLOCKS.register("fluid_collector_block", () -> new FluidCollectorBlock(false)); public static final RegistryObject COFFEE_MACHINE = BLOCKS.register("coffee_machine_block", CoffeeMachineBlock::new); public static final RegistryObject PHANTOM_BOOSTER = BLOCKS.register("phantom_booster_block", PhantomBoosterBlock::new); + public static final RegistryObject RANGED_COLLECTOR = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); + public static final RegistryObject DIRECTIONAL_BREAKER = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); + public static final RegistryObject LEAF_GENERATOR = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); + public static final RegistryObject SMILEY_CLOUD = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); + public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); // CRYSTALS public static final RegistryObject CRYSTAL_QUARTS = BLOCKS.register("crystal_quarts_block", () -> new CrystalBlock(false)); @@ -91,12 +96,12 @@ public class ActuallyBlocks { public static final RegistryObject CRYSTAL_VOID = BLOCKS.register("crystal_void_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_EMERADIC = BLOCKS.register("crystal_emeradic_block", () -> new CrystalBlock(false)); - public static final RegistryObject CRYSTAL_EMPOWERED_QUARTS = BLOCKS.register("crystal_empowered_quarts_block", () -> new CrystalBlock(true)); - public static final RegistryObject CRYSTAL_EMPOWERED_RESTONIA = BLOCKS.register("crystal_empowered_restonia_block", () -> new CrystalBlock(true)); - public static final RegistryObject CRYSTAL_EMPOWERED_PALIS = BLOCKS.register("crystal_empowered_palis_block", () -> new CrystalBlock(true)); - public static final RegistryObject CRYSTAL_EMPOWERED_DIAMATINE = BLOCKS.register("crystal_empowered_diamatine_block", () -> new CrystalBlock(true)); - public static final RegistryObject CRYSTAL_EMPOWERED_VOID = BLOCKS.register("crystal_empowered_void_block", () -> new CrystalBlock(true)); - public static final RegistryObject CRYSTAL_EMPOWERED_EMERADIC = BLOCKS.register("crystal_empowered_emeradic_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_QUARTS = BLOCKS.register("crystal_quarts_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_RESTONIA = BLOCKS.register("crystal_restonia_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_PALIS = BLOCKS.register("crystal_palis_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_DIAMATINE = BLOCKS.register("crystal_diamatine_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_VOID = BLOCKS.register("crystal_void_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_EMERADIC = BLOCKS.register("crystal_emeradic_empowered_block", () -> new CrystalBlock(true)); public static final RegistryObject CRYSTAL_CLUSTER_RESTONIA = BLOCKS.register("crystal_cluster_restonia_block", () -> new CrystalClusterBlock(Crystals.REDSTONE)); public static final RegistryObject CRYSTAL_CLUSTER_PALIS = BLOCKS.register("crystal_cluster_palis_block", () -> new CrystalClusterBlock(Crystals.LAPIS)); @@ -112,11 +117,6 @@ public class ActuallyBlocks { public static final RegistryObject FLUIDS_LASER_RELAY = BLOCKS.register("fluids_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.FLUIDS)); public static final RegistryObject ITEM_LASER_RELAY = BLOCKS.register("item_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ITEM)); public static final RegistryObject ADVANCED_ITEM_LASER_RELAY = BLOCKS.register("advanced_item_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ITEM_WHITELIST)); - public static final RegistryObject RANGED_COLLECTOR = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); - public static final RegistryObject DIRECTIONAL_BREAKER = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); - public static final RegistryObject LEAF_GENERATOR = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); - public static final RegistryObject SMILEY_CLOUD = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); - public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); // BUILDING BLOCKS public static final RegistryObject GREEN_WALL = BLOCKS.register("green_wall_block", GenericBlock::new); @@ -165,7 +165,7 @@ public class ActuallyBlocks { // MISC BLOCKS public static final RegistryObject ENDERPEARL = BLOCKS.register("enderpearl_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject CHARCOAL = BLOCKS.register("charcoal_block", () -> new Block(Block.Properties.create(Material.ROCK))); - public static final RegistryObject ORE_BLACK_QUARTS = BLOCKS.register("ore_black_quarts_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject ORE_BLACK_QUARTS = BLOCKS.register("ore_black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject IRON_CASING = BLOCKS.register("iron_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new Block(Block.Properties.create(Material.ROCK))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java index 15882d75d..753bfc816 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java @@ -22,6 +22,8 @@ public class GeneratorItemModels extends ItemModelProvider { @Override protected void registerModels() { + simpleItem(ActuallyItems.BOOKLET); // will require complex I think + ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); // Toolsets diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_item_whitelist_block.png b/src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_item_whitelist_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/advanced_item_laser_relay_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/grinder_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/grinder_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/grinder_block_bottom.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_bottom.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/grinder_block_bottom.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_block_bottom.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/grinder_block_on.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_on.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/grinder_block_on.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_block_on.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/grinder_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_block_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/grinder_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_block_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/grinder_double_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crusher_double_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/grinder_double_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crusher_double_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_coal_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_coal_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamatine_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamond_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_diamond_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emeradic_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emerald_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_emerald_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_enori_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_iron_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_iron_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_palis_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_lapis_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_lapis_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_restonia_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_redstone_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_redstone_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_cluster_void_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamond_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamond_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamond_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamond_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emerald_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emerald_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emerald_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emerald_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_lapis_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_lapis_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_lapis_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_lapis_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_redstone_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_redstone_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_redstone_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_redstone_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_advanced_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_advanced_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_advanced_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_extreme_block.png b/src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_extreme_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/energy_laser_relay_extreme_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/inputter_advanced_block.png b/src/main/resources/assets/actuallyadditions/textures/block/esd_advanced_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/inputter_advanced_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/esd_advanced_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/inputter_block.png b/src/main/resources/assets/actuallyadditions/textures/block/esd_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/inputter_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/esd_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_fluids_block.png b/src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_fluids_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluids_laser_relay_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block_inside.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_inside.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block_inside.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_inside.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_viewer_hopping_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/hopping_item_interface_block_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/item_viewer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/item_interface_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/item_viewer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_interface_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/laser_relay_item_block.png b/src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/laser_relay_item_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/item_laser_relay_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_powerer_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_powerer_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_powerer_front_block.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_powerer_front_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/lamp_controller_front_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block_front.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_front.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block_front.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_front.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/furnace_double_block_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_block_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/furnace_double_on_block.png b/src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/furnace_double_on_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/powered_furnace_on_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/furnace_solar_block.png b/src/main/resources/assets/actuallyadditions/textures/block/solar_panel_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/furnace_solar_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/solar_panel_block.png