From f5b7dd7f7fc58dec3aee274f058b5881d59ed6d6 Mon Sep 17 00:00:00 2001 From: grimmauld Date: Thu, 17 Jun 2021 21:43:29 +0200 Subject: [PATCH] No longer move obsidian by contraption (Stoopid datagen) --- src/generated/resources/.cache/cache | 2 +- .../data/create/advancements/aesthetics.json | 4 ++-- .../data/create/tags/blocks/non_movable.json | 19 ------------------- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 src/main/resources/data/create/tags/blocks/non_movable.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1cfaf3fff..7e3412acf 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1654,7 +1654,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json 6490fa0587db770cf7c794b47f3bcd2b691f4226 assets/create/sounds.json -0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json +5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json 83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index d723cbe38..59a86f429 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:cogwheel", - "create:large_cogwheel" + "create:large_cogwheel", + "create:cogwheel" ] } }, diff --git a/src/main/resources/data/create/tags/blocks/non_movable.json b/src/main/resources/data/create/tags/blocks/non_movable.json deleted file mode 100644 index 974dda4c5..000000000 --- a/src/main/resources/data/create/tags/blocks/non_movable.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:obsidian" - ], - "optional": [ - "immersiveengineering:connector_lv", - "immersiveengineering:connector_lv_relay", - "immersiveengineering:connector_mv", - "immersiveengineering:connector_mv_relay", - "immersiveengineering:connector_hv", - "immersiveengineering:connector_hv_relay", - "immersiveengineering:connector_bundled", - "immersiveengineering:connector_structural", - "immersiveengineering:connector_redstone", - "immersiveengineering:connector_probe", - "immersiveengineering:breaker_switch" - ] -} \ No newline at end of file