diff --git a/build.gradle b/build.gradle index 68680453..c9b24137 100644 --- a/build.gradle +++ b/build.gradle @@ -130,8 +130,6 @@ dependencies { runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}")) runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}")) /// - - runtimeOnly(fg.deobf("com.possible-triangle:debug_entities:0.0.0-dev")) } jar { diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 13358150..9d376847 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -// 1.20.1 2024-11-02T14:26:23.3307796 Oreganized Block Tags -======= -// 1.20.1 2024-11-10T10:42:18.5216234 Oreganized Block Tags ->>>>>>> b08426a (various fixes:) -======= -// 1.20.1 2024-11-10T11:07:39.5031561 Oreganized Block Tags ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) +// 1.20.1 2024-11-10T11:12:35.6939457 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -29,15 +21,7 @@ bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/s 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json 8794e7f7fcf41783b7738503b68f535efa58d511 data/minecraft/tags/blocks/mineable/pickaxe.json -<<<<<<< HEAD -<<<<<<< HEAD -0dcc07da48ab9049518b04b94ad46c15613ab136 data/minecraft/tags/blocks/mineable/shovel.json -======= -6ee6c3bd76764a25936bd20bc0e77f3da017b866 data/minecraft/tags/blocks/mineable/shovel.json ->>>>>>> b08426a (various fixes:) -======= -9b9fb7a97193a97f86b1bda58bae9d9cd41f33af data/minecraft/tags/blocks/mineable/shovel.json ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) +47b09d43f5f7275eb529a8dc98eba27574975f1c data/minecraft/tags/blocks/mineable/shovel.json bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/blocks/slabs.json @@ -45,21 +29,10 @@ e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/blocks/slabs.json e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/blocks/stairs.json 0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/blocks/trapdoors.json a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json -<<<<<<< HEAD -143a34cb0f03223147aa614479cc4fcf4c38ca14 data/oreganized/tags/blocks/blows_lead_cloud.json -<<<<<<< HEAD -f9d5b4f4bb62c6c270431c1f92e4eb95efbb173f data/oreganized/tags/blocks/crystal_glass.json -6fc54c4c542bc17e26f48437be5ed4c75d47c275 data/oreganized/tags/blocks/crystal_glass_panes.json -======= -42af1c0623a9edeb4076b053e189a11724465750 data/oreganized/tags/blocks/crystal_glass.json -d5117b38a1a3a793e26bcfc9ede33c2d3177862a data/oreganized/tags/blocks/crystal_glass_panes.json ->>>>>>> b08426a (various fixes:) -======= 0cd969093058a9540cd19a93abf28ceee4182438 data/oreganized/tags/blocks/blows_lead_cloud.json 143a34cb0f03223147aa614479cc4fcf4c38ca14 data/oreganized/tags/blocks/creates_lead_cloud.json -6a2769a1846f24bfec8630387d280c03375deede data/oreganized/tags/blocks/crystal_glass.json -60c0fe5e4786e9696c355fcc4cfb9b129a8623c9 data/oreganized/tags/blocks/crystal_glass_panes.json ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) +6cbe8739635b6f95437bdf4c96c91950a0bc11c6 data/oreganized/tags/blocks/crystal_glass.json +dfc2c986c7bb7f9a413d466eede6a410da694a17 data/oreganized/tags/blocks/crystal_glass_panes.json 6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json diff --git a/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 b/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 index 5a25808b..f10c6004 100644 --- a/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 +++ b/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -// 1.20.1 2024-11-02T14:26:23.3322849 Oreganized Item Tags -======= -// 1.20.1 2024-11-10T10:42:18.5216234 Oreganized Item Tags ->>>>>>> b08426a (various fixes:) -======= -// 1.20.1 2024-11-10T11:07:39.5051563 Oreganized Item Tags ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) +// 1.20.1 2024-11-10T11:12:35.6964535 Oreganized Item Tags 3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/farmersdelight/tags/items/tools/knives.json d8d286ea76e30a635512bc93d68815770003ff41 data/forge/tags/items/buckets/molten_lead.json 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json @@ -52,18 +44,8 @@ bd1440ab62499b2be9d2d4050f2d30cbb306b34f data/minecraft/tags/items/trimmable_arm 9c01ba5c2837c6d506fea127ca2a1b2ba24e2fe0 data/minecraft/tags/items/trim_materials.json a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json 6c25715524e8df396dd757255895117ff2451b25 data/nethersdelight/tags/items/tools/machetes.json -<<<<<<< HEAD -<<<<<<< HEAD -f9d5b4f4bb62c6c270431c1f92e4eb95efbb173f data/oreganized/tags/items/crystal_glass.json -6fc54c4c542bc17e26f48437be5ed4c75d47c275 data/oreganized/tags/items/crystal_glass_panes.json -======= -42af1c0623a9edeb4076b053e189a11724465750 data/oreganized/tags/items/crystal_glass.json -d5117b38a1a3a793e26bcfc9ede33c2d3177862a data/oreganized/tags/items/crystal_glass_panes.json ->>>>>>> b08426a (various fixes:) -======= -6a2769a1846f24bfec8630387d280c03375deede data/oreganized/tags/items/crystal_glass.json -60c0fe5e4786e9696c355fcc4cfb9b129a8623c9 data/oreganized/tags/items/crystal_glass_panes.json ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) +6cbe8739635b6f95437bdf4c96c91950a0bc11c6 data/oreganized/tags/items/crystal_glass.json +dfc2c986c7bb7f9a413d466eede6a410da694a17 data/oreganized/tags/items/crystal_glass_panes.json bf2ad799074f5c44acee490bdf3d3ae81d56997b data/oreganized/tags/items/gargoyle_snack.json 4d89056c908550931c1f2008f9817f5d3ff7aa68 data/oreganized/tags/items/has_kinetic_damage.json 376b7c9ff449a4b98cb7b1f65b47d658c4e39428 data/oreganized/tags/items/lighter_than_lead.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json index 34eaa1f9..b613b891 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -1,167 +1,132 @@ { "values": [ -<<<<<<< HEAD - "oreganized:waxed_red_concrete_powder", - "oreganized:waxed_purple_concrete_powder", - "oreganized:waxed_light_blue_concrete_powder", - "oreganized:waxed_pink_concrete_powder", - "oreganized:waxed_maroon_concrete_powder", - "oreganized:waxed_lime_concrete_powder", - "oreganized:waxed_rose_concrete_powder", - "oreganized:waxed_mint_concrete_powder", - "oreganized:waxed_beige_concrete_powder", - "oreganized:waxed_gray_concrete_powder", - "oreganized:waxed_olive_concrete_powder", - "oreganized:waxed_navy_concrete_powder", - "oreganized:waxed_amber_concrete_powder", - "oreganized:waxed_verdant_concrete_powder", - "oreganized:waxed_blue_concrete_powder", - "oreganized:waxed_yellow_concrete_powder", - "oreganized:waxed_aqua_concrete_powder", - "oreganized:waxed_ginger_concrete_powder", - "oreganized:waxed_brown_concrete_powder", - "oreganized:waxed_cyan_concrete_powder", - "oreganized:waxed_green_concrete_powder", - "oreganized:waxed_light_gray_concrete_powder", - "oreganized:waxed_coral_concrete_powder", - "oreganized:waxed_tan_concrete_powder", - "oreganized:waxed_indigo_concrete_powder", - "oreganized:waxed_white_concrete_powder", - "oreganized:waxed_teal_concrete_powder", - "oreganized:waxed_forest_concrete_powder", - "oreganized:waxed_orange_concrete_powder", - "oreganized:waxed_magenta_concrete_powder", - "oreganized:waxed_black_concrete_powder", - "oreganized:waxed_slate_concrete_powder" -======= { - "id": "oreganized:waxed_mint_concrete_powder", + "id": "oreganized:waxed_olive_concrete_powder", "required": false }, { - "id": "oreganized:waxed_tan_concrete_powder", + "id": "oreganized:waxed_yellow_concrete_powder", "required": false }, { - "id": "oreganized:waxed_teal_concrete_powder", + "id": "oreganized:waxed_white_concrete_powder", "required": false }, { - "id": "oreganized:waxed_orange_concrete_powder", + "id": "oreganized:waxed_red_concrete_powder", "required": false }, { - "id": "oreganized:waxed_black_concrete_powder", + "id": "oreganized:waxed_navy_concrete_powder", "required": false }, { - "id": "oreganized:waxed_gray_concrete_powder", + "id": "oreganized:waxed_purple_concrete_powder", "required": false }, { - "id": "oreganized:waxed_aqua_concrete_powder", + "id": "oreganized:waxed_coral_concrete_powder", "required": false }, { - "id": "oreganized:waxed_olive_concrete_powder", + "id": "oreganized:waxed_blue_concrete_powder", "required": false }, { - "id": "oreganized:waxed_forest_concrete_powder", + "id": "oreganized:waxed_aqua_concrete_powder", "required": false }, { - "id": "oreganized:waxed_ginger_concrete_powder", + "id": "oreganized:waxed_tan_concrete_powder", "required": false }, { - "id": "oreganized:waxed_light_blue_concrete_powder", + "id": "oreganized:waxed_indigo_concrete_powder", "required": false }, { - "id": "oreganized:waxed_navy_concrete_powder", + "id": "oreganized:waxed_beige_concrete_powder", "required": false }, { - "id": "oreganized:waxed_light_gray_concrete_powder", + "id": "oreganized:waxed_lime_concrete_powder", "required": false }, { - "id": "oreganized:waxed_magenta_concrete_powder", + "id": "oreganized:waxed_gray_concrete_powder", "required": false }, { - "id": "oreganized:waxed_yellow_concrete_powder", + "id": "oreganized:waxed_light_gray_concrete_powder", "required": false }, { - "id": "oreganized:waxed_slate_concrete_powder", + "id": "oreganized:waxed_black_concrete_powder", "required": false }, { - "id": "oreganized:waxed_green_concrete_powder", + "id": "oreganized:waxed_teal_concrete_powder", "required": false }, { - "id": "oreganized:waxed_blue_concrete_powder", + "id": "oreganized:waxed_magenta_concrete_powder", "required": false }, { - "id": "oreganized:waxed_lime_concrete_powder", + "id": "oreganized:waxed_slate_concrete_powder", "required": false }, { - "id": "oreganized:waxed_white_concrete_powder", + "id": "oreganized:waxed_verdant_concrete_powder", "required": false }, { - "id": "oreganized:waxed_maroon_concrete_powder", + "id": "oreganized:waxed_forest_concrete_powder", "required": false }, { - "id": "oreganized:waxed_red_concrete_powder", + "id": "oreganized:waxed_ginger_concrete_powder", "required": false }, { - "id": "oreganized:waxed_verdant_concrete_powder", + "id": "oreganized:waxed_light_blue_concrete_powder", "required": false }, { - "id": "oreganized:waxed_amber_concrete_powder", + "id": "oreganized:waxed_cyan_concrete_powder", "required": false }, { - "id": "oreganized:waxed_pink_concrete_powder", + "id": "oreganized:waxed_maroon_concrete_powder", "required": false }, { - "id": "oreganized:waxed_purple_concrete_powder", + "id": "oreganized:waxed_orange_concrete_powder", "required": false }, { - "id": "oreganized:waxed_beige_concrete_powder", + "id": "oreganized:waxed_green_concrete_powder", "required": false }, { - "id": "oreganized:waxed_cyan_concrete_powder", + "id": "oreganized:waxed_pink_concrete_powder", "required": false }, { - "id": "oreganized:waxed_rose_concrete_powder", + "id": "oreganized:waxed_amber_concrete_powder", "required": false }, { - "id": "oreganized:waxed_coral_concrete_powder", + "id": "oreganized:waxed_rose_concrete_powder", "required": false }, { - "id": "oreganized:waxed_indigo_concrete_powder", + "id": "oreganized:waxed_brown_concrete_powder", "required": false }, { - "id": "oreganized:waxed_brown_concrete_powder", + "id": "oreganized:waxed_mint_concrete_powder", "required": false } ->>>>>>> b08426a (various fixes:) ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/crystal_glass.json b/src/generated/resources/data/oreganized/tags/blocks/crystal_glass.json index f8fb0531..f53b31c6 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/crystal_glass.json +++ b/src/generated/resources/data/oreganized/tags/blocks/crystal_glass.json @@ -1,175 +1,132 @@ { "values": [ -<<<<<<< HEAD -<<<<<<< HEAD { - "id": "oreganized:red_crystal_glass", + "id": "oreganized:olive_crystal_glass", "required": false }, { - "id": "oreganized:purple_crystal_glass", + "id": "oreganized:yellow_crystal_glass", "required": false }, { - "id": "oreganized:light_blue_crystal_glass", + "id": "oreganized:white_crystal_glass", "required": false }, { - "id": "oreganized:pink_crystal_glass", + "id": "oreganized:red_crystal_glass", "required": false }, { - "id": "oreganized:maroon_crystal_glass", + "id": "oreganized:navy_crystal_glass", "required": false }, { - "id": "oreganized:lime_crystal_glass", + "id": "oreganized:purple_crystal_glass", "required": false }, { - "id": "oreganized:rose_crystal_glass", + "id": "oreganized:coral_crystal_glass", "required": false }, { - "id": "oreganized:mint_crystal_glass", + "id": "oreganized:blue_crystal_glass", "required": false }, { - "id": "oreganized:beige_crystal_glass", + "id": "oreganized:aqua_crystal_glass", "required": false }, { - "id": "oreganized:gray_crystal_glass", + "id": "oreganized:tan_crystal_glass", "required": false }, { - "id": "oreganized:olive_crystal_glass", + "id": "oreganized:indigo_crystal_glass", "required": false }, { - "id": "oreganized:navy_crystal_glass", + "id": "oreganized:beige_crystal_glass", "required": false }, { - "id": "oreganized:amber_crystal_glass", + "id": "oreganized:lime_crystal_glass", "required": false }, { - "id": "oreganized:verdant_crystal_glass", + "id": "oreganized:gray_crystal_glass", "required": false }, { - "id": "oreganized:blue_crystal_glass", + "id": "oreganized:light_gray_crystal_glass", "required": false }, { - "id": "oreganized:yellow_crystal_glass", + "id": "oreganized:black_crystal_glass", "required": false }, { - "id": "oreganized:aqua_crystal_glass", + "id": "oreganized:teal_crystal_glass", "required": false }, { - "id": "oreganized:ginger_crystal_glass", + "id": "oreganized:magenta_crystal_glass", "required": false }, { - "id": "oreganized:brown_crystal_glass", + "id": "oreganized:slate_crystal_glass", "required": false }, { - "id": "oreganized:cyan_crystal_glass", + "id": "oreganized:verdant_crystal_glass", "required": false }, { - "id": "oreganized:green_crystal_glass", + "id": "oreganized:forest_crystal_glass", "required": false }, { - "id": "oreganized:light_gray_crystal_glass", + "id": "oreganized:ginger_crystal_glass", "required": false }, { - "id": "oreganized:coral_crystal_glass", + "id": "oreganized:light_blue_crystal_glass", "required": false }, { - "id": "oreganized:tan_crystal_glass", + "id": "oreganized:cyan_crystal_glass", "required": false }, { - "id": "oreganized:indigo_crystal_glass", + "id": "oreganized:maroon_crystal_glass", "required": false }, { - "id": "oreganized:white_crystal_glass", + "id": "oreganized:orange_crystal_glass", "required": false }, { - "id": "oreganized:teal_crystal_glass", + "id": "oreganized:green_crystal_glass", "required": false }, { - "id": "oreganized:forest_crystal_glass", + "id": "oreganized:pink_crystal_glass", "required": false }, { - "id": "oreganized:orange_crystal_glass", + "id": "oreganized:amber_crystal_glass", "required": false }, { - "id": "oreganized:magenta_crystal_glass", + "id": "oreganized:rose_crystal_glass", "required": false }, { - "id": "oreganized:black_crystal_glass", + "id": "oreganized:brown_crystal_glass", "required": false }, { - "id": "oreganized:slate_crystal_glass", + "id": "oreganized:mint_crystal_glass", "required": false } -======= - "oreganized:beige_crystal_glass", -======= ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) - "oreganized:mint_crystal_glass", - "oreganized:tan_crystal_glass", - "oreganized:teal_crystal_glass", - "oreganized:orange_crystal_glass", - "oreganized:black_crystal_glass", - "oreganized:gray_crystal_glass", - "oreganized:aqua_crystal_glass", - "oreganized:olive_crystal_glass", - "oreganized:forest_crystal_glass", - "oreganized:ginger_crystal_glass", - "oreganized:light_blue_crystal_glass", - "oreganized:navy_crystal_glass", - "oreganized:light_gray_crystal_glass", - "oreganized:magenta_crystal_glass", - "oreganized:yellow_crystal_glass", - "oreganized:slate_crystal_glass", - "oreganized:green_crystal_glass", - "oreganized:blue_crystal_glass", - "oreganized:lime_crystal_glass", - "oreganized:white_crystal_glass", - "oreganized:maroon_crystal_glass", - "oreganized:red_crystal_glass", - "oreganized:verdant_crystal_glass", - "oreganized:amber_crystal_glass", - "oreganized:pink_crystal_glass", -<<<<<<< HEAD - "oreganized:coral_crystal_glass" ->>>>>>> b08426a (various fixes:) -======= - "oreganized:purple_crystal_glass", - "oreganized:beige_crystal_glass", - "oreganized:cyan_crystal_glass", - "oreganized:rose_crystal_glass", - "oreganized:coral_crystal_glass", - "oreganized:indigo_crystal_glass", - "oreganized:brown_crystal_glass" ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/crystal_glass_panes.json b/src/generated/resources/data/oreganized/tags/blocks/crystal_glass_panes.json index aaafa721..20d43acb 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/crystal_glass_panes.json +++ b/src/generated/resources/data/oreganized/tags/blocks/crystal_glass_panes.json @@ -1,175 +1,132 @@ { "values": [ -<<<<<<< HEAD -<<<<<<< HEAD { - "id": "oreganized:red_crystal_glass_pane", + "id": "oreganized:olive_crystal_glass_pane", "required": false }, { - "id": "oreganized:purple_crystal_glass_pane", + "id": "oreganized:yellow_crystal_glass_pane", "required": false }, { - "id": "oreganized:light_blue_crystal_glass_pane", + "id": "oreganized:white_crystal_glass_pane", "required": false }, { - "id": "oreganized:pink_crystal_glass_pane", + "id": "oreganized:red_crystal_glass_pane", "required": false }, { - "id": "oreganized:maroon_crystal_glass_pane", + "id": "oreganized:navy_crystal_glass_pane", "required": false }, { - "id": "oreganized:lime_crystal_glass_pane", + "id": "oreganized:purple_crystal_glass_pane", "required": false }, { - "id": "oreganized:rose_crystal_glass_pane", + "id": "oreganized:coral_crystal_glass_pane", "required": false }, { - "id": "oreganized:mint_crystal_glass_pane", + "id": "oreganized:blue_crystal_glass_pane", "required": false }, { - "id": "oreganized:beige_crystal_glass_pane", + "id": "oreganized:aqua_crystal_glass_pane", "required": false }, { - "id": "oreganized:gray_crystal_glass_pane", + "id": "oreganized:tan_crystal_glass_pane", "required": false }, { - "id": "oreganized:olive_crystal_glass_pane", + "id": "oreganized:indigo_crystal_glass_pane", "required": false }, { - "id": "oreganized:navy_crystal_glass_pane", + "id": "oreganized:beige_crystal_glass_pane", "required": false }, { - "id": "oreganized:amber_crystal_glass_pane", + "id": "oreganized:lime_crystal_glass_pane", "required": false }, { - "id": "oreganized:verdant_crystal_glass_pane", + "id": "oreganized:gray_crystal_glass_pane", "required": false }, { - "id": "oreganized:blue_crystal_glass_pane", + "id": "oreganized:light_gray_crystal_glass_pane", "required": false }, { - "id": "oreganized:yellow_crystal_glass_pane", + "id": "oreganized:black_crystal_glass_pane", "required": false }, { - "id": "oreganized:aqua_crystal_glass_pane", + "id": "oreganized:teal_crystal_glass_pane", "required": false }, { - "id": "oreganized:ginger_crystal_glass_pane", + "id": "oreganized:magenta_crystal_glass_pane", "required": false }, { - "id": "oreganized:brown_crystal_glass_pane", + "id": "oreganized:slate_crystal_glass_pane", "required": false }, { - "id": "oreganized:cyan_crystal_glass_pane", + "id": "oreganized:verdant_crystal_glass_pane", "required": false }, { - "id": "oreganized:green_crystal_glass_pane", + "id": "oreganized:forest_crystal_glass_pane", "required": false }, { - "id": "oreganized:light_gray_crystal_glass_pane", + "id": "oreganized:ginger_crystal_glass_pane", "required": false }, { - "id": "oreganized:coral_crystal_glass_pane", + "id": "oreganized:light_blue_crystal_glass_pane", "required": false }, { - "id": "oreganized:tan_crystal_glass_pane", + "id": "oreganized:cyan_crystal_glass_pane", "required": false }, { - "id": "oreganized:indigo_crystal_glass_pane", + "id": "oreganized:maroon_crystal_glass_pane", "required": false }, { - "id": "oreganized:white_crystal_glass_pane", + "id": "oreganized:orange_crystal_glass_pane", "required": false }, { - "id": "oreganized:teal_crystal_glass_pane", + "id": "oreganized:green_crystal_glass_pane", "required": false }, { - "id": "oreganized:forest_crystal_glass_pane", + "id": "oreganized:pink_crystal_glass_pane", "required": false }, { - "id": "oreganized:orange_crystal_glass_pane", + "id": "oreganized:amber_crystal_glass_pane", "required": false }, { - "id": "oreganized:magenta_crystal_glass_pane", + "id": "oreganized:rose_crystal_glass_pane", "required": false }, { - "id": "oreganized:black_crystal_glass_pane", + "id": "oreganized:brown_crystal_glass_pane", "required": false }, { - "id": "oreganized:slate_crystal_glass_pane", + "id": "oreganized:mint_crystal_glass_pane", "required": false } -======= - "oreganized:beige_crystal_glass_pane", -======= ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) - "oreganized:mint_crystal_glass_pane", - "oreganized:tan_crystal_glass_pane", - "oreganized:teal_crystal_glass_pane", - "oreganized:orange_crystal_glass_pane", - "oreganized:black_crystal_glass_pane", - "oreganized:gray_crystal_glass_pane", - "oreganized:aqua_crystal_glass_pane", - "oreganized:olive_crystal_glass_pane", - "oreganized:forest_crystal_glass_pane", - "oreganized:ginger_crystal_glass_pane", - "oreganized:light_blue_crystal_glass_pane", - "oreganized:navy_crystal_glass_pane", - "oreganized:light_gray_crystal_glass_pane", - "oreganized:magenta_crystal_glass_pane", - "oreganized:yellow_crystal_glass_pane", - "oreganized:slate_crystal_glass_pane", - "oreganized:green_crystal_glass_pane", - "oreganized:blue_crystal_glass_pane", - "oreganized:lime_crystal_glass_pane", - "oreganized:white_crystal_glass_pane", - "oreganized:maroon_crystal_glass_pane", - "oreganized:red_crystal_glass_pane", - "oreganized:verdant_crystal_glass_pane", - "oreganized:amber_crystal_glass_pane", - "oreganized:pink_crystal_glass_pane", -<<<<<<< HEAD - "oreganized:coral_crystal_glass_pane" ->>>>>>> b08426a (various fixes:) -======= - "oreganized:purple_crystal_glass_pane", - "oreganized:beige_crystal_glass_pane", - "oreganized:cyan_crystal_glass_pane", - "oreganized:rose_crystal_glass_pane", - "oreganized:coral_crystal_glass_pane", - "oreganized:indigo_crystal_glass_pane", - "oreganized:brown_crystal_glass_pane" ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/items/crystal_glass.json b/src/generated/resources/data/oreganized/tags/items/crystal_glass.json index f8fb0531..f53b31c6 100644 --- a/src/generated/resources/data/oreganized/tags/items/crystal_glass.json +++ b/src/generated/resources/data/oreganized/tags/items/crystal_glass.json @@ -1,175 +1,132 @@ { "values": [ -<<<<<<< HEAD -<<<<<<< HEAD { - "id": "oreganized:red_crystal_glass", + "id": "oreganized:olive_crystal_glass", "required": false }, { - "id": "oreganized:purple_crystal_glass", + "id": "oreganized:yellow_crystal_glass", "required": false }, { - "id": "oreganized:light_blue_crystal_glass", + "id": "oreganized:white_crystal_glass", "required": false }, { - "id": "oreganized:pink_crystal_glass", + "id": "oreganized:red_crystal_glass", "required": false }, { - "id": "oreganized:maroon_crystal_glass", + "id": "oreganized:navy_crystal_glass", "required": false }, { - "id": "oreganized:lime_crystal_glass", + "id": "oreganized:purple_crystal_glass", "required": false }, { - "id": "oreganized:rose_crystal_glass", + "id": "oreganized:coral_crystal_glass", "required": false }, { - "id": "oreganized:mint_crystal_glass", + "id": "oreganized:blue_crystal_glass", "required": false }, { - "id": "oreganized:beige_crystal_glass", + "id": "oreganized:aqua_crystal_glass", "required": false }, { - "id": "oreganized:gray_crystal_glass", + "id": "oreganized:tan_crystal_glass", "required": false }, { - "id": "oreganized:olive_crystal_glass", + "id": "oreganized:indigo_crystal_glass", "required": false }, { - "id": "oreganized:navy_crystal_glass", + "id": "oreganized:beige_crystal_glass", "required": false }, { - "id": "oreganized:amber_crystal_glass", + "id": "oreganized:lime_crystal_glass", "required": false }, { - "id": "oreganized:verdant_crystal_glass", + "id": "oreganized:gray_crystal_glass", "required": false }, { - "id": "oreganized:blue_crystal_glass", + "id": "oreganized:light_gray_crystal_glass", "required": false }, { - "id": "oreganized:yellow_crystal_glass", + "id": "oreganized:black_crystal_glass", "required": false }, { - "id": "oreganized:aqua_crystal_glass", + "id": "oreganized:teal_crystal_glass", "required": false }, { - "id": "oreganized:ginger_crystal_glass", + "id": "oreganized:magenta_crystal_glass", "required": false }, { - "id": "oreganized:brown_crystal_glass", + "id": "oreganized:slate_crystal_glass", "required": false }, { - "id": "oreganized:cyan_crystal_glass", + "id": "oreganized:verdant_crystal_glass", "required": false }, { - "id": "oreganized:green_crystal_glass", + "id": "oreganized:forest_crystal_glass", "required": false }, { - "id": "oreganized:light_gray_crystal_glass", + "id": "oreganized:ginger_crystal_glass", "required": false }, { - "id": "oreganized:coral_crystal_glass", + "id": "oreganized:light_blue_crystal_glass", "required": false }, { - "id": "oreganized:tan_crystal_glass", + "id": "oreganized:cyan_crystal_glass", "required": false }, { - "id": "oreganized:indigo_crystal_glass", + "id": "oreganized:maroon_crystal_glass", "required": false }, { - "id": "oreganized:white_crystal_glass", + "id": "oreganized:orange_crystal_glass", "required": false }, { - "id": "oreganized:teal_crystal_glass", + "id": "oreganized:green_crystal_glass", "required": false }, { - "id": "oreganized:forest_crystal_glass", + "id": "oreganized:pink_crystal_glass", "required": false }, { - "id": "oreganized:orange_crystal_glass", + "id": "oreganized:amber_crystal_glass", "required": false }, { - "id": "oreganized:magenta_crystal_glass", + "id": "oreganized:rose_crystal_glass", "required": false }, { - "id": "oreganized:black_crystal_glass", + "id": "oreganized:brown_crystal_glass", "required": false }, { - "id": "oreganized:slate_crystal_glass", + "id": "oreganized:mint_crystal_glass", "required": false } -======= - "oreganized:beige_crystal_glass", -======= ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) - "oreganized:mint_crystal_glass", - "oreganized:tan_crystal_glass", - "oreganized:teal_crystal_glass", - "oreganized:orange_crystal_glass", - "oreganized:black_crystal_glass", - "oreganized:gray_crystal_glass", - "oreganized:aqua_crystal_glass", - "oreganized:olive_crystal_glass", - "oreganized:forest_crystal_glass", - "oreganized:ginger_crystal_glass", - "oreganized:light_blue_crystal_glass", - "oreganized:navy_crystal_glass", - "oreganized:light_gray_crystal_glass", - "oreganized:magenta_crystal_glass", - "oreganized:yellow_crystal_glass", - "oreganized:slate_crystal_glass", - "oreganized:green_crystal_glass", - "oreganized:blue_crystal_glass", - "oreganized:lime_crystal_glass", - "oreganized:white_crystal_glass", - "oreganized:maroon_crystal_glass", - "oreganized:red_crystal_glass", - "oreganized:verdant_crystal_glass", - "oreganized:amber_crystal_glass", - "oreganized:pink_crystal_glass", -<<<<<<< HEAD - "oreganized:coral_crystal_glass" ->>>>>>> b08426a (various fixes:) -======= - "oreganized:purple_crystal_glass", - "oreganized:beige_crystal_glass", - "oreganized:cyan_crystal_glass", - "oreganized:rose_crystal_glass", - "oreganized:coral_crystal_glass", - "oreganized:indigo_crystal_glass", - "oreganized:brown_crystal_glass" ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/items/crystal_glass_panes.json b/src/generated/resources/data/oreganized/tags/items/crystal_glass_panes.json index aaafa721..20d43acb 100644 --- a/src/generated/resources/data/oreganized/tags/items/crystal_glass_panes.json +++ b/src/generated/resources/data/oreganized/tags/items/crystal_glass_panes.json @@ -1,175 +1,132 @@ { "values": [ -<<<<<<< HEAD -<<<<<<< HEAD { - "id": "oreganized:red_crystal_glass_pane", + "id": "oreganized:olive_crystal_glass_pane", "required": false }, { - "id": "oreganized:purple_crystal_glass_pane", + "id": "oreganized:yellow_crystal_glass_pane", "required": false }, { - "id": "oreganized:light_blue_crystal_glass_pane", + "id": "oreganized:white_crystal_glass_pane", "required": false }, { - "id": "oreganized:pink_crystal_glass_pane", + "id": "oreganized:red_crystal_glass_pane", "required": false }, { - "id": "oreganized:maroon_crystal_glass_pane", + "id": "oreganized:navy_crystal_glass_pane", "required": false }, { - "id": "oreganized:lime_crystal_glass_pane", + "id": "oreganized:purple_crystal_glass_pane", "required": false }, { - "id": "oreganized:rose_crystal_glass_pane", + "id": "oreganized:coral_crystal_glass_pane", "required": false }, { - "id": "oreganized:mint_crystal_glass_pane", + "id": "oreganized:blue_crystal_glass_pane", "required": false }, { - "id": "oreganized:beige_crystal_glass_pane", + "id": "oreganized:aqua_crystal_glass_pane", "required": false }, { - "id": "oreganized:gray_crystal_glass_pane", + "id": "oreganized:tan_crystal_glass_pane", "required": false }, { - "id": "oreganized:olive_crystal_glass_pane", + "id": "oreganized:indigo_crystal_glass_pane", "required": false }, { - "id": "oreganized:navy_crystal_glass_pane", + "id": "oreganized:beige_crystal_glass_pane", "required": false }, { - "id": "oreganized:amber_crystal_glass_pane", + "id": "oreganized:lime_crystal_glass_pane", "required": false }, { - "id": "oreganized:verdant_crystal_glass_pane", + "id": "oreganized:gray_crystal_glass_pane", "required": false }, { - "id": "oreganized:blue_crystal_glass_pane", + "id": "oreganized:light_gray_crystal_glass_pane", "required": false }, { - "id": "oreganized:yellow_crystal_glass_pane", + "id": "oreganized:black_crystal_glass_pane", "required": false }, { - "id": "oreganized:aqua_crystal_glass_pane", + "id": "oreganized:teal_crystal_glass_pane", "required": false }, { - "id": "oreganized:ginger_crystal_glass_pane", + "id": "oreganized:magenta_crystal_glass_pane", "required": false }, { - "id": "oreganized:brown_crystal_glass_pane", + "id": "oreganized:slate_crystal_glass_pane", "required": false }, { - "id": "oreganized:cyan_crystal_glass_pane", + "id": "oreganized:verdant_crystal_glass_pane", "required": false }, { - "id": "oreganized:green_crystal_glass_pane", + "id": "oreganized:forest_crystal_glass_pane", "required": false }, { - "id": "oreganized:light_gray_crystal_glass_pane", + "id": "oreganized:ginger_crystal_glass_pane", "required": false }, { - "id": "oreganized:coral_crystal_glass_pane", + "id": "oreganized:light_blue_crystal_glass_pane", "required": false }, { - "id": "oreganized:tan_crystal_glass_pane", + "id": "oreganized:cyan_crystal_glass_pane", "required": false }, { - "id": "oreganized:indigo_crystal_glass_pane", + "id": "oreganized:maroon_crystal_glass_pane", "required": false }, { - "id": "oreganized:white_crystal_glass_pane", + "id": "oreganized:orange_crystal_glass_pane", "required": false }, { - "id": "oreganized:teal_crystal_glass_pane", + "id": "oreganized:green_crystal_glass_pane", "required": false }, { - "id": "oreganized:forest_crystal_glass_pane", + "id": "oreganized:pink_crystal_glass_pane", "required": false }, { - "id": "oreganized:orange_crystal_glass_pane", + "id": "oreganized:amber_crystal_glass_pane", "required": false }, { - "id": "oreganized:magenta_crystal_glass_pane", + "id": "oreganized:rose_crystal_glass_pane", "required": false }, { - "id": "oreganized:black_crystal_glass_pane", + "id": "oreganized:brown_crystal_glass_pane", "required": false }, { - "id": "oreganized:slate_crystal_glass_pane", + "id": "oreganized:mint_crystal_glass_pane", "required": false } -======= - "oreganized:beige_crystal_glass_pane", -======= ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) - "oreganized:mint_crystal_glass_pane", - "oreganized:tan_crystal_glass_pane", - "oreganized:teal_crystal_glass_pane", - "oreganized:orange_crystal_glass_pane", - "oreganized:black_crystal_glass_pane", - "oreganized:gray_crystal_glass_pane", - "oreganized:aqua_crystal_glass_pane", - "oreganized:olive_crystal_glass_pane", - "oreganized:forest_crystal_glass_pane", - "oreganized:ginger_crystal_glass_pane", - "oreganized:light_blue_crystal_glass_pane", - "oreganized:navy_crystal_glass_pane", - "oreganized:light_gray_crystal_glass_pane", - "oreganized:magenta_crystal_glass_pane", - "oreganized:yellow_crystal_glass_pane", - "oreganized:slate_crystal_glass_pane", - "oreganized:green_crystal_glass_pane", - "oreganized:blue_crystal_glass_pane", - "oreganized:lime_crystal_glass_pane", - "oreganized:white_crystal_glass_pane", - "oreganized:maroon_crystal_glass_pane", - "oreganized:red_crystal_glass_pane", - "oreganized:verdant_crystal_glass_pane", - "oreganized:amber_crystal_glass_pane", - "oreganized:pink_crystal_glass_pane", -<<<<<<< HEAD - "oreganized:coral_crystal_glass_pane" ->>>>>>> b08426a (various fixes:) -======= - "oreganized:purple_crystal_glass_pane", - "oreganized:beige_crystal_glass_pane", - "oreganized:cyan_crystal_glass_pane", - "oreganized:rose_crystal_glass_pane", - "oreganized:coral_crystal_glass_pane", - "oreganized:indigo_crystal_glass_pane", - "oreganized:brown_crystal_glass_pane" ->>>>>>> 744aca0 (make ore cloud mechanic use block tag (closes #68)) ] } \ No newline at end of file