From 78dcaa432873d59232381481364831a2e77c43bc Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 14:42:44 +0200 Subject: [PATCH 01/29] fixes #2470 --- .../tags/block_placer_ignored_materials.json | 95 ++++++++++++++++++- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index a41e8050e..19e797783 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -14,12 +14,97 @@ "id" : "#minecraft:doors", "required" : false }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", { "id" : "minecraft:bamboo", "required" : false - } - ] + }, + { + "id" : "minecraft:rails", + "required" : false + }, + { + "id" : "minecraft:small_flowers", + "required" : false + }, + { + "id" : "minecraft:coral_blocks", + "required" : false + }, + { + "id" : "minecraft:coral_plants", + "required" : false + }, + { + "id" : "minecraft:small_flowers", + "required" : false + }, + { + "id" : "minecraft:buttons", + "required" : false + }, + { + "id" : "minecraft:banners", + "required" : false + }, + { + "id" : "minecraft:signs", + "required" : false + }, + { + "id" : "minecraft:standing_signs", + "required" : false + }, + { + "id" : "minecraft:wall_signs", + "required" : false + }, + { + "id" : "minecraft:wooden_pressure_plates", + "required" : false + }, + { + "id" : "minecraft:nether_sprouts", + "required" : false + }, + { + "id" : "minecraft:crimson_roots", + "required" : false + }, + { + "id" : "minecraft:twisting_vines", + "required" : false + }, + { + "id" : "warped_roots", + "required" : false + }, + { + "id" : "weeping_vines", + "required" : false + }, + { + "id" : "polished_blackstone_pressure_plate", + "required" : false + }, + { + "id" : "warped_roots", + "required" : false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From b70949a3861b12dd196494578e426480e8980a0f Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 14:59:44 +0200 Subject: [PATCH 02/29] fixed fingerscrossed --- .../tags/block_placer_ignored_materials.json | 171 +++++++----------- 1 file changed, 63 insertions(+), 108 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 19e797783..053691770 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,110 +1,65 @@ { - "values" : [ - "#slimefun:sensitive_materials", - "#slimefun:mushrooms", - { - "id" : "#minecraft:tall_flowers", - "required" : false - }, - { - "id" : "#minecraft:beds", - "required" : false - }, - { - "id" : "#minecraft:doors", - "required" : false - }, - { - "id" : "minecraft:bamboo", - "required" : false - }, - { - "id" : "minecraft:rails", - "required" : false - }, - { - "id" : "minecraft:small_flowers", - "required" : false - }, - { - "id" : "minecraft:coral_blocks", - "required" : false - }, - { - "id" : "minecraft:coral_plants", - "required" : false - }, - { - "id" : "minecraft:small_flowers", - "required" : false - }, - { - "id" : "minecraft:buttons", - "required" : false - }, - { - "id" : "minecraft:banners", - "required" : false - }, - { - "id" : "minecraft:signs", - "required" : false - }, - { - "id" : "minecraft:standing_signs", - "required" : false - }, - { - "id" : "minecraft:wall_signs", - "required" : false - }, - { - "id" : "minecraft:wooden_pressure_plates", - "required" : false - }, - { - "id" : "minecraft:nether_sprouts", - "required" : false - }, - { - "id" : "minecraft:crimson_roots", - "required" : false - }, - { - "id" : "minecraft:twisting_vines", - "required" : false - }, - { - "id" : "warped_roots", - "required" : false - }, - { - "id" : "weeping_vines", - "required" : false - }, - { - "id" : "polished_blackstone_pressure_plate", - "required" : false - }, - { - "id" : "warped_roots", - "required" : false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "values": [ + "#slimefun:sensitive_materials", + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "#minecraft:nether_sprouts", + "required": false + }, + { + "id": "#minecraft:crimson_roots", + "required": false + }, + { + "id": "#minecraft:twisting_vines", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + { + "id": "#weeping_vines", + "required": false + }, + { + "id": "#polished_blackstone_pressure_plate", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From 0b27ea6ed5d9396762e6803ff13ccb3db107a72a Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:03:02 +0200 Subject: [PATCH 03/29] ? --- .../tags/block_placer_ignored_materials.json | 123 +++++++++--------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 053691770..1aa98ff10 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,65 +1,64 @@ { "values": [ - "#slimefun:sensitive_materials", - "#slimefun:mushrooms", - "#minecraft:tall_flowers", - "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", - { - "id": "#minecraft:nether_sprouts", - "required": false - }, - { - "id": "#minecraft:crimson_roots", - "required": false - }, - { - "id": "#minecraft:twisting_vines", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - { - "id": "#weeping_vines", - "required": false - }, - { - "id": "#polished_blackstone_pressure_plate", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "#minecraft:nether_sprouts", + "required": false + }, + { + "id": "#minecraft:crimson_roots", + "required": false + }, + { + "id": "#minecraft:twisting_vines", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + { + "id": "#weeping_vines", + "required": false + }, + { + "id": "#polished_blackstone_pressure_plate", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From 27583fc3f0fab081bd78a4ebe4fc4092f9b25a19 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:05:06 +0200 Subject: [PATCH 04/29] 1 eternity later --- .../tags/block_placer_ignored_materials.json | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 1aa98ff10..69ea2f946 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,64 +1,64 @@ { "values": [ - "#slimefun:mushrooms", - "#minecraft:tall_flowers", - "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", - { - "id": "#minecraft:nether_sprouts", - "required": false - }, - { - "id": "#minecraft:crimson_roots", - "required": false - }, - { - "id": "#minecraft:twisting_vines", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - { - "id": "#weeping_vines", - "required": false - }, - { - "id": "#polished_blackstone_pressure_plate", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "#minecraft:nether_sprouts", + "required": false + }, + { + "id": "#minecraft:crimson_roots", + "required": false + }, + { + "id": "#minecraft:twisting_vines", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + { + "id": "#weeping_vines", + "required": false + }, + { + "id": "#polished_blackstone_pressure_plate", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From ee3e358f314a2bd8f498bf623ab894fb57182d23 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:07:50 +0200 Subject: [PATCH 05/29] :pansad: --- .../tags/block_placer_ignored_materials.json | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 69ea2f946..e0fd24cc9 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,64 +1,64 @@ { - "values": [ - "#slimefun:mushrooms", - "#minecraft:tall_flowers", - "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", - { - "id": "#minecraft:nether_sprouts", - "required": false - }, - { - "id": "#minecraft:crimson_roots", - "required": false - }, - { - "id": "#minecraft:twisting_vines", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - { - "id": "#weeping_vines", - "required": false - }, - { - "id": "#polished_blackstone_pressure_plate", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "values": [ + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "#minecraft:nether_sprouts", + "required": false + }, + { + "id": "#minecraft:crimson_roots", + "required": false + }, + { + "id": "#minecraft:twisting_vines", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + { + "id": "#weeping_vines", + "required": false + }, + { + "id": "#polished_blackstone_pressure_plate", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From 3b43dd7ebc44ef8f04e15f3c7dc306fef3356094 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:08:42 +0200 Subject: [PATCH 06/29] good now? --- .../tags/block_placer_ignored_materials.json | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index e0fd24cc9..1c580f53b 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,64 +1,64 @@ { - "values": [ - "#slimefun:mushrooms", - "#minecraft:tall_flowers", - "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", - { - "id": "#minecraft:nether_sprouts", - "required": false - }, - { - "id": "#minecraft:crimson_roots", - "required": false - }, - { - "id": "#minecraft:twisting_vines", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - { - "id": "#weeping_vines", - "required": false - }, - { - "id": "#polished_blackstone_pressure_plate", - "required": false - }, - { - "id": "#warped_roots", - "required": false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "values": [ + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "#minecraft:nether_sprouts", + "required": false + }, + { + "id": "#minecraft:crimson_roots", + "required": false + }, + { + "id": "#minecraft:twisting_vines", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + { + "id": "#weeping_vines", + "required": false + }, + { + "id": "#polished_blackstone_pressure_plate", + "required": false + }, + { + "id": "#warped_roots", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From 16bf13b2afb0d5034db0447d87e3b6d725d69226 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:12:03 +0200 Subject: [PATCH 07/29] stop bullying --- .../tags/block_placer_ignored_materials.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 1c580f53b..7c3098fb3 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -17,31 +17,27 @@ "#minecraft:wall_signs", "#minecraft:wooden_pressure_plates", { - "id": "#minecraft:nether_sprouts", + "id": "minecraft:nether_sprouts", "required": false }, { - "id": "#minecraft:crimson_roots", + "id": "minecraft:crimson_roots", "required": false }, { - "id": "#minecraft:twisting_vines", + "id": "minecraft:twisting_vines", "required": false }, { - "id": "#warped_roots", + "id": "minecraft:warped_roots", "required": false }, { - "id": "#weeping_vines", + "id": "minecraft:weeping_vines", "required": false }, { - "id": "#polished_blackstone_pressure_plate", - "required": false - }, - { - "id": "#warped_roots", + "id": "minecraft:polished_blackstone_pressure_plate", "required": false }, "minecraft:sugar_cane", From 29541cdfe2d068992a55054ce32c21c09f9dd4b1 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:41:21 +0200 Subject: [PATCH 08/29] Someone else can go format this if its not good --- .../tags/block_placer_ignored_materials.json | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 7c3098fb3..722dad247 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,60 +1,60 @@ { - "values": [ - "#slimefun:mushrooms", - "#minecraft:tall_flowers", - "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", - { - "id": "minecraft:nether_sprouts", - "required": false - }, - { - "id": "minecraft:crimson_roots", - "required": false - }, - { - "id": "minecraft:twisting_vines", - "required": false - }, - { - "id": "minecraft:warped_roots", - "required": false - }, - { - "id": "minecraft:weeping_vines", - "required": false - }, - { - "id": "minecraft:polished_blackstone_pressure_plate", - "required": false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" - ] + "values": [ + "#slimefun:mushrooms", + "#minecraft:tall_flowers", + "#minecraft:beds", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:buttons", + "#minecraft:banners", + "#minecraft:signs", + "#minecraft:standing_signs", + "#minecraft:wall_signs", + "#minecraft:wooden_pressure_plates", + { + "id": "minecraft:nether_sprouts", + "required": false + }, + { + "id": "minecraft:crimson_roots", + "required": false + }, + { + "id": "minecraft:twisting_vines", + "required": false + }, + { + "id": "minecraft:warped_roots", + "required": false + }, + { + "id": "minecraft:weeping_vines", + "required": false + }, + { + "id": "minecraft:polished_blackstone_pressure_plate", + "required": false + }, + "minecraft:sugar_cane", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern" + ] } From 6611eaf444a464f84fc9b356e62dd31d11526c54 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:43:06 +0200 Subject: [PATCH 09/29] idk whats wrong with "values" --- src/main/resources/tags/block_placer_ignored_materials.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 722dad247..e9d5b18ca 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,5 +1,6 @@ { "values": [ + "#slimefun:sensitive_materials", "#slimefun:mushrooms", "#minecraft:tall_flowers", "#minecraft:beds", From 7dbbb87af58adc30375a3eb2061a77b7b0135031 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:43:28 +0200 Subject: [PATCH 10/29] ? --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index e9d5b18ca..dae04518c 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,5 +1,5 @@ { - "values": [ + "values": [ "#slimefun:sensitive_materials", "#slimefun:mushrooms", "#minecraft:tall_flowers", From 349c57aef430f55ca158ae0141f316d2e6d71fdb Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:44:32 +0200 Subject: [PATCH 11/29] a --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index dae04518c..90d6b66ab 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,5 +1,5 @@ { - "values": [ + "values" : [ "#slimefun:sensitive_materials", "#slimefun:mushrooms", "#minecraft:tall_flowers", From 372c6b41b1a22916f127f0c5256e397601dcf085 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:45:23 +0200 Subject: [PATCH 12/29] a --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 90d6b66ab..b90b81517 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,5 +1,5 @@ { - "values" : [ + "values" : [ "#slimefun:sensitive_materials", "#slimefun:mushrooms", "#minecraft:tall_flowers", From c00ded786a4dc6493f47b7b7411ebcadff8c43d1 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:46:01 +0200 Subject: [PATCH 13/29] fix? --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index b90b81517..a3f5bb9ea 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,5 +1,5 @@ { - "values" : [ + "values" : [ "#slimefun:sensitive_materials", "#slimefun:mushrooms", "#minecraft:tall_flowers", From 49c7d3ad239eda7dcc1d270a646a31b769127a5a Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Thu, 15 Oct 2020 15:49:00 +0200 Subject: [PATCH 14/29] 14* prs --- .../tags/block_placer_ignored_materials.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index a3f5bb9ea..ef5b31ac2 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -18,28 +18,28 @@ "#minecraft:wall_signs", "#minecraft:wooden_pressure_plates", { - "id": "minecraft:nether_sprouts", + "id" : "minecraft:nether_sprouts", + "required" : false + }, + { + "id" : "minecraft:crimson_roots", "required": false }, { - "id": "minecraft:crimson_roots", - "required": false + "id" : "minecraft:twisting_vines", + "required" : false }, { - "id": "minecraft:twisting_vines", - "required": false + "id" : "minecraft:warped_roots", + "required" : false }, { - "id": "minecraft:warped_roots", - "required": false + "id" : "minecraft:weeping_vines", + "required" : false }, { - "id": "minecraft:weeping_vines", - "required": false - }, - { - "id": "minecraft:polished_blackstone_pressure_plate", - "required": false + "id" : "minecraft:polished_blackstone_pressure_plate", + "required" : false }, "minecraft:sugar_cane", "minecraft:lily_pad", From 9f3e2bba7cce6d428b96a064541479bbae1454c0 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 17 Oct 2020 13:22:22 +0200 Subject: [PATCH 15/29] [CI skip] Removed a troublesome config setting --- .../slimefun4/implementation/SlimefunPlugin.java | 5 +---- src/main/resources/config.yml | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java index 25308eac1..2d14d4f21 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java @@ -487,6 +487,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { new AncientAltarListener(this, (AncientAltar) SlimefunItems.ANCIENT_ALTAR.getItem(), (AncientPedestal) SlimefunItems.ANCIENT_PEDESTAL.getItem()); grapplingHookListener.register(this, (GrapplingHook) SlimefunItems.GRAPPLING_HOOK.getItem()); bowListener.register(this); + backpackListener.register(this); // Toggleable Listeners for performance reasons if (config.getBoolean("items.talismans")) { @@ -497,10 +498,6 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { new SoulboundListener(this); } - if (config.getBoolean("items.backpacks")) { - backpackListener.register(this); - } - // Handle Slimefun Guide being given on Join new SlimefunGuideListener(this, config.getBoolean("guide.receive-on-first-join")); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index bad81f55d..c9090a91c 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -40,7 +40,6 @@ networks: items: talismans: true - backpacks: true soulbound: true metrics: From 087af60ab871f61685df73a26deb9fc7213b9cee Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 17 Oct 2020 13:17:35 +0000 Subject: [PATCH 16/29] Update dependency com.konghq:unirest-java to v3.11.02 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06d6812a0..ac20b52c4 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,7 @@ com.konghq unirest-java - 3.11.01 + 3.11.02 compile From f9d4be9cbbbcce6efe423ede7815b9238239bc96 Mon Sep 17 00:00:00 2001 From: Nameless Date: Sun, 18 Oct 2020 02:44:33 +0000 Subject: [PATCH 17/29] Translate messages_zh-CN.yml via GitLocalize --- src/main/resources/languages/messages_zh-CN.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/resources/languages/messages_zh-CN.yml b/src/main/resources/languages/messages_zh-CN.yml index b0b631128..34134c21d 100644 --- a/src/main/resources/languages/messages_zh-CN.yml +++ b/src/main/resources/languages/messages_zh-CN.yml @@ -20,6 +20,10 @@ commands: player-never-joined: "&4找不到叫这个名字的玩家!" backpack-does-not-exist: "&4你指定的背包不存在!" restored-backpack-given: "&a你的背包已被恢复并且已经放入了你的物品栏!" + charge: + description: 为你手持的物品充电 + charge-success: 充电完成! + not-rechargeable: 这个物品不能充电! guide: search: message: "&b你想要搜索什么?" @@ -127,6 +131,7 @@ messages: knight: "&a&o你的护身符给予了你 5 秒的生命恢复" whirlwind: "&a&o你的护身符反弹了所有的弹射物" wizard: "&a&o你的护身符使一个附魔的等级提高了, 同时其他附魔等级将会下降" + caveman: "&a&o你的护身符给予了你急迫效果" soulbound-rune: fail: "&c一次只能灵魂绑定一个物品." success: "&a物品绑定成功! 在你死亡后此物品将不会掉落." @@ -223,6 +228,7 @@ machines: finished: "&e你的工业矿机采矿已完成! 总共开采了 %ores% 个矿石!" anvil: not-working: "&4你不能在铁砧里使用 Slimefun 的物品" + mcmmo-salvaging: "&4你不能分解 Slimefun 物品!" backpack: already-open: "&c抱歉, 这个背包已在别处打开了!" no-stack: "&c你不能同时手持两个背包" @@ -331,5 +337,9 @@ brewing_stand: not-working: "&4你不能在酿造台中使用 Slimefun 物品!" villagers: no-trading: "&4你不能用 Slimefun 的物品和村民交易!" +cartography_table: + not-working: "&4你不能在制图台中使用 Slimefun 物品!" +cauldron: + no-discoloring: "&4你不能用炼药锅清洗 Slimefun 物品上的颜色" miner: no-ores: "&e抱歉, 周围找不到矿石了!" From 1257ca5ebba85f4a7bf98e0c7273fcd3c5cdcf35 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 18 Oct 2020 02:44:34 +0000 Subject: [PATCH 18/29] Translate messages_zh-CN.yml via GitLocalize From de1e846382f06428d0db811c3e6df26155a71110 Mon Sep 17 00:00:00 2001 From: Nameless Date: Sun, 18 Oct 2020 02:44:36 +0000 Subject: [PATCH 19/29] Translate researches_zh-CN.yml via GitLocalize --- src/main/resources/languages/researches_zh-CN.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/languages/researches_zh-CN.yml b/src/main/resources/languages/researches_zh-CN.yml index b0db0509e..3b2187c3a 100644 --- a/src/main/resources/languages/researches_zh-CN.yml +++ b/src/main/resources/languages/researches_zh-CN.yml @@ -243,3 +243,6 @@ slimefun: climbing_pick: 古块丽影 shulker_shell: 人造潜影贝 villager_rune: 防奸商神器 + caveman_talisman: 穴居人护身符 + even_higher_tier_capacitors: 三级电容器 + energy_connectors: 有线连接 From e054fe66828b72a2d363255332ed1a3e254d0cca Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 18 Oct 2020 13:17:18 +0200 Subject: [PATCH 20/29] Fixes #2448 --- CHANGELOG.md | 1 + .../thebusybiscuit/slimefun4/implementation/SlimefunItems.java | 2 +- .../io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3f22799e..2e90d9fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ * Removed 1.13 support #### Fixes +* Fixed #2448 ## Release Candidate 17 (17 Oct 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java index 0f995f7a3..5f68e896d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java @@ -394,7 +394,7 @@ public final class SlimefunItems { public static final SlimefunItemStack PLASTIC_SHEET = new SlimefunItemStack("PLASTIC_SHEET", Material.PAPER, "&fPlastic Sheet"); public static final SlimefunItemStack MAGNET = new SlimefunItemStack("MAGNET", HeadTexture.MAGNET, "&cMagnet"); - public static final SlimefunItemStack NECROTIC_SKULL = new SlimefunItemStack("NECROTIC_SKULL", Material.WITHER_SKELETON_SKULL, "&cNecrotic Skull"); + public static final SlimefunItemStack NECROTIC_SKULL = new SlimefunItemStack("NECROTIC_SKULL", HeadTexture.NECROTIC_SKULL, "&cNecrotic Skull"); public static final SlimefunItemStack ESSENCE_OF_AFTERLIFE = new SlimefunItemStack("ESSENCE_OF_AFTERLIFE", Material.GUNPOWDER, "&4Essence of Afterlife"); public static final SlimefunItemStack STRANGE_NETHER_GOO = new SlimefunItemStack("STRANGE_NETHER_GOO", Material.PURPLE_DYE, "&5Strange Nether Goo", "", "&fA strange bio matter that", "&fcan be acquired from", "&fbartering with Piglins"); public static final SlimefunItemStack ELECTRO_MAGNET = new SlimefunItemStack("ELECTRO_MAGNET", HeadTexture.MAGNET, "&cElectromagnet"); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java index ea095a5d7..ee8a849d0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/HeadTexture.java @@ -108,7 +108,8 @@ public enum HeadTexture { CARGO_ARROW_RIGHT("c2f910c47da042e4aa28af6cc81cf48ac6caf37dab35f88db993accb9dfe516"), ADD_NEW_LANGUAGE("3edd20be93520949e6ce789dc4f43efaeb28c717ee6bfcbbe02780142f716"), IRON_GOLEM("89091d79ea0f59ef7ef94d7bba6e5f17f2f7d4572c44f90f76c4819a714"), - PIGLIN_HEAD("2882af1294a74023e6919a31d1a027310f2e142afb4667d230d155e7f21dbb41"); + PIGLIN_HEAD("2882af1294a74023e6919a31d1a027310f2e142afb4667d230d155e7f21dbb41"), + NECROTIC_SKULL("7953b6c68448e7e6b6bf8fb273d7203acd8e1be19e81481ead51f45de59a8"); public static final HeadTexture[] valuesCache = values(); From 3d364ee331de23cffacbb88177e0b6ffb0289d09 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 13:48:38 +0200 Subject: [PATCH 21/29] did requested changes --- .../slimefun4/utils/tags/SlimefunTag.java | 27 +++++++----- .../tags/block_placer_ignored_materials.json | 41 +++---------------- src/main/resources/tags/pressure_plates.json | 12 ++++++ .../resources/tags/sensitive_materials.json | 32 ++++++++++++--- 4 files changed, 60 insertions(+), 52 deletions(-) create mode 100644 src/main/resources/tags/pressure_plates.json diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java index 74dc60adf..558f78e9c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java @@ -35,9 +35,9 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.tools.SmeltersPic * extensions of the default Minecraft tags. * The actual tag files are located in the {@literal /src/main/resources/tags} directory * and follow Minecraft's tags.json format. - * + * * @author TheBusyBiscuit - * + * * @see TagParser * */ @@ -193,7 +193,12 @@ public enum SlimefunTag implements Tag { /** * All materials (ores) which trigger the Talisman of the Caveman. */ - CAVEMAN_TALISMAN_TRIGGERS; + CAVEMAN_TALISMAN_TRIGGERS, + + /** + * All the types of pressure plates. + */ + PRESSURE_PLATES; private static final Map nameLookup = new HashMap<>(); public static final SlimefunTag[] valuesCache = values(); @@ -219,7 +224,7 @@ public enum SlimefunTag implements Tag { /** * This method reloads this {@link SlimefunTag} from our resources directory. - * + * * @throws TagMisconfigurationException * This is thrown whenever a {@link SlimefunTag} could not be parsed properly */ @@ -236,11 +241,11 @@ public enum SlimefunTag implements Tag { /** * This method reloads every single {@link SlimefunTag} from the resources directory. * It is equivalent to running {@link #reload()} on every single {@link SlimefunTag} manually. - * + * * Do keep in mind though that any misconfigured {@link SlimefunTag} will abort the entire * method and throw a {@link TagMisconfigurationException}. So one faulty {@link SlimefunTag} * will stop the reloading process. - * + * * @throws TagMisconfigurationException * This is thrown if one of the {@link SlimefunTag SlimefunTags} could not be parsed correctly */ @@ -293,9 +298,9 @@ public enum SlimefunTag implements Tag { /** * This returns a {@link Set} of {@link Tag Tags} which are children of this {@link SlimefunTag}, * these can be other {@link SlimefunTag SlimefunTags} or regular {@link Tag Tags}. - * + * * The returned {@link Set} is immutable - * + * * @return An immutable {@link Set} of all sub tags. */ @Nonnull @@ -305,7 +310,7 @@ public enum SlimefunTag implements Tag { /** * This method returns an Array representation for this {@link SlimefunTag}. - * + * * @return A {@link Material} array for this {@link Tag} */ @Nonnull @@ -315,7 +320,7 @@ public enum SlimefunTag implements Tag { /** * This returns a {@link Stream} of {@link Material Materials} for this {@link SlimefunTag}. - * + * * @return A {@link Stream} of {@link Material Materials} */ @Nonnull @@ -331,7 +336,7 @@ public enum SlimefunTag implements Tag { * * @param value * The value which you would like to look up. - * + * * @return The {@link SlimefunTag} or null if it does not exist. */ @Nullable diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index ef5b31ac2..9bd0c14da 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,22 +1,10 @@ { "values" : [ "#slimefun:sensitive_materials", - "#slimefun:mushrooms", - "#minecraft:tall_flowers", + "#slimefun:pressure_plates", "#minecraft:beds", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:buttons", - "#minecraft:banners", - "#minecraft:signs", - "#minecraft:standing_signs", - "#minecraft:wall_signs", - "#minecraft:wooden_pressure_plates", + "minecraft:cake", + { "id" : "minecraft:nether_sprouts", "required" : false @@ -36,26 +24,7 @@ { "id" : "minecraft:weeping_vines", "required" : false - }, - { - "id" : "minecraft:polished_blackstone_pressure_plate", - "required" : false - }, - "minecraft:sugar_cane", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern" + } + ] } diff --git a/src/main/resources/tags/pressure_plates.json b/src/main/resources/tags/pressure_plates.json new file mode 100644 index 000000000..b8bdb7667 --- /dev/null +++ b/src/main/resources/tags/pressure_plates.json @@ -0,0 +1,12 @@ +{ + "values" : [ + "#minecraft:wooden_pressure_plates", + "minecraft:stone_pressure_plate", + "minecraft:light_weighted_pressure_plate", + "minecraft:heavy_weighted_pressure_plate", + { + "id" : "minecraft:polished_blackstone_pressure_plate", + "required" : false + } + ] +} diff --git a/src/main/resources/tags/sensitive_materials.json b/src/main/resources/tags/sensitive_materials.json index bd782e1e6..019721a14 100644 --- a/src/main/resources/tags/sensitive_materials.json +++ b/src/main/resources/tags/sensitive_materials.json @@ -1,11 +1,33 @@ { "values" : [ "#minecraft:saplings", - "#minecraft:wooden_pressure_plates", "#slimefun:torches", - "minecraft:stone_pressure_plate", - "minecraft:light_weighted_pressure_plate", - "minecraft:heavy_weighted_pressure_plate", - "minecraft:cake" + "#minecraft:buttons", + "#minecraft:signs", + "#slimefun:mushrooms", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:banners", + "minecraft:sugar_cane", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp" ] } From 734b853eb7e2995e0a02f50a5280591e85a65e44 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 18 Oct 2020 13:53:15 +0200 Subject: [PATCH 22/29] [CI skip] Reduced technical debt --- .../guide/ChestSlimefunGuide.java | 32 ++++------ .../slimefun4/utils/NumberUtils.java | 62 +++++++++++++++++-- .../Slimefun/Objects/Category.java | 21 +++++++ 3 files changed, 92 insertions(+), 23 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java index cbab11d87..e024b4c38 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java @@ -9,6 +9,7 @@ import java.util.Optional; import java.util.logging.Level; import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -64,14 +65,14 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; public class ChestSlimefunGuide implements SlimefunGuideImplementation { private static final int CATEGORY_SIZE = 36; + private static final Sound sound = Sound.ITEM_BOOK_PAGE_TURN; - private final ItemStack item; private final int[] recipeSlots = { 3, 4, 5, 12, 13, 14, 21, 22, 23 }; - private final Sound sound = Sound.ITEM_BOOK_PAGE_TURN; + private final ItemStack item; private final boolean showVanillaRecipes; - public ChestSlimefunGuide(boolean vanillaRecipes) { - showVanillaRecipes = vanillaRecipes; + public ChestSlimefunGuide(boolean showVanillaRecipes) { + this.showVanillaRecipes = showVanillaRecipes; item = new SlimefunGuideItem(this, "&aSlimefun Guide &7(Chest GUI)"); } @@ -125,7 +126,6 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { } ChestMenu menu = create(p); - List categories = getVisibleCategories(p, profile); int index = 9; @@ -334,26 +334,14 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { int index = 9; // Find items and add them for (SlimefunItem slimefunItem : SlimefunPlugin.getRegistry().getEnabledSlimefunItems()) { - String itemName = ChatColor.stripColor(slimefunItem.getItemName()).toLowerCase(Locale.ROOT); - if (index == 44) { break; } - if (!itemName.isEmpty() && (itemName.equals(searchTerm) || itemName.contains(searchTerm))) { + if (isSearchFilterApplicable(slimefunItem, searchTerm)) { ItemStack itemstack = new CustomItem(slimefunItem.getItem(), meta -> { - List lore = null; Category category = slimefunItem.getCategory(); - - if (category != null) { - ItemStack categoryItem = category.getItem(p); - - if (categoryItem != null && categoryItem.hasItemMeta() && categoryItem.getItemMeta().hasDisplayName()) { - lore = Arrays.asList("", ChatColor.DARK_GRAY + "\u21E8 " + ChatColor.WHITE + categoryItem.getItemMeta().getDisplayName()); - } - } - - meta.setLore(lore); + meta.setLore(Arrays.asList("", ChatColor.DARK_GRAY + "\u21E8 " + ChatColor.WHITE + category.getDisplayName(p))); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_POTION_EFFECTS); }); @@ -379,6 +367,12 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { menu.open(p); } + @ParametersAreNonnullByDefault + private boolean isSearchFilterApplicable(SlimefunItem slimefunItem, String searchTerm) { + String itemName = ChatColor.stripColor(slimefunItem.getItemName()).toLowerCase(Locale.ROOT); + return !itemName.isEmpty() && (itemName.equals(searchTerm) || itemName.contains(searchTerm)); + } + @Override public void displayItem(PlayerProfile profile, ItemStack item, int index, boolean addToHistory) { Player p = profile.getPlayer(); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java index a84293946..8dd69f881 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java @@ -12,16 +12,51 @@ import javax.annotation.Nullable; import org.apache.commons.lang.Validate; import org.bukkit.ChatColor; +/** + * This class contains various utilities related to numbers and number formatting. + * + * @author TheBusyBiscuit + * @author Walshy + * + */ public final class NumberUtils { + /** + * This is our {@link DecimalFormat} for decimal values. + */ private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); + /** + * We do not want any instance of this to be created. + */ private NumberUtils() {} - public static String formatBigNumber(int i) { - return NumberFormat.getNumberInstance(Locale.US).format(i); + /** + * This method formats a given {@link Integer} to be displayed nicely with + * decimal digit grouping. + * {@code 1000000} for example will return {@code "1,000,000"} as a {@link String}. + * It uses the american (US) {@link Locale} for this transformation. + * + * @param number + * Your {@link Integer} + * + * @return The formatted String + */ + @Nonnull + public static String formatBigNumber(int number) { + return NumberFormat.getNumberInstance(Locale.US).format(number); } + /** + * This method transforms a String representation of a {@link LocalDateTime} + * from GitHub's API back into a {@link LocalDateTime} object + * + * @param date + * The formatted String version of a date from GitHub + * + * @return The {@link LocalDateTime} for the given input + */ + @Nonnull public static LocalDateTime parseGitHubDate(@Nonnull String date) { Validate.notNull(date, "Provided date was null"); return LocalDateTime.parse(date.substring(0, date.length() - 1)); @@ -37,6 +72,7 @@ public final class NumberUtils { * * @return A representative {@link ChatColor} */ + @Nonnull public static ChatColor getColorFromPercentage(float percentage) { if (percentage < 16.0F) { return ChatColor.DARK_RED; @@ -53,13 +89,28 @@ public final class NumberUtils { } } + /** + * This returns the elapsed time since the given {@link LocalDateTime}. + * The output will be nicely formatted based on the elapsed hours or days since the + * given {@link LocalDateTime}. + * + * If a {@link LocalDateTime} from yesterday was passed it will return {@code "1d"}. + * One hour later it will read {@code "1d 1h"}. For values smaller than an hour {@code "< 1h"} + * will be returned instead. + * + * @param date + * The {@link LocalDateTime}. + * + * @return The elapsed time as a {@link String} + */ + @Nonnull public static String getElapsedTime(@Nonnull LocalDateTime date) { Validate.notNull(date, "Provided date was null"); long hours = Duration.between(date, LocalDateTime.now()).toHours(); if (hours == 0) { return "< 1h"; - } else if ((hours / 24) == 0) { + } else if (hours / 24 == 0) { return (hours % 24) + "h"; } else if (hours % 24 == 0) { return (hours / 24) + "d"; @@ -68,10 +119,12 @@ public final class NumberUtils { } } + @Nonnull public static String getTimeLeft(int seconds) { String timeleft = ""; int minutes = (int) (seconds / 60L); + if (minutes > 0) { timeleft += minutes + "m "; } @@ -80,7 +133,7 @@ public final class NumberUtils { return timeleft + seconds + "s"; } - public static int getInt(String str, int defaultValue) { + public static int getInt(@Nonnull String str, int defaultValue) { if (PatternUtils.NUMERIC.matcher(str).matches()) { return Integer.parseInt(str); } @@ -88,6 +141,7 @@ public final class NumberUtils { return defaultValue; } + @Nonnull public static String getAsMillis(long nanoseconds) { if (nanoseconds == 0) { return "0ms"; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/Category.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/Category.java index c69a682ec..8c788e94f 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/Category.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/Category.java @@ -134,6 +134,7 @@ public class Category implements Keyed { * * @param p * The Player to create this {@link ItemStack} for + * * @return A localized display item for this {@link Category} */ @Nonnull @@ -166,6 +167,26 @@ public class Category implements Keyed { return ChatColor.stripColor(item.getItemMeta().getDisplayName()); } + /** + * This returns the localized display name of this {@link Category} for the given {@link Player}. + * The method will fall back to {@link #getUnlocalizedName()} if no translation was found. + * + * @param p + * The {@link Player} who to translate the name for + * + * @return The localized name of this {@link Category} + */ + @Nonnull + public String getDisplayName(@Nonnull Player p) { + String localized = SlimefunPlugin.getLocalization().getCategoryName(p, getKey()); + + if (localized != null) { + return localized; + } else { + return getUnlocalizedName(); + } + } + /** * Returns all instances of {@link SlimefunItem} bound to this {@link Category}. * From dc025c7b28a213a0b7f7f50b94fe1cfde5587731 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 14:31:54 +0200 Subject: [PATCH 23/29] fix --- .../slimefun4/utils/tags/SlimefunTag.java | 12 +++---- .../tags/block_placer_ignored_materials.json | 31 ++++++++++++++++--- .../resources/tags/sensitive_materials.json | 29 ++--------------- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java index 558f78e9c..aba7a1189 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java @@ -121,6 +121,11 @@ public enum SlimefunTag implements Tag { */ CONCRETE_POWDERS, + /** + * All the types of pressure plates. + */ + PRESSURE_PLATES, + /** * Materials which are sensitive to break. * Things like Saplings or Pressure plates which break as well when you break @@ -193,12 +198,7 @@ public enum SlimefunTag implements Tag { /** * All materials (ores) which trigger the Talisman of the Caveman. */ - CAVEMAN_TALISMAN_TRIGGERS, - - /** - * All the types of pressure plates. - */ - PRESSURE_PLATES; + CAVEMAN_TALISMAN_TRIGGERS; private static final Map nameLookup = new HashMap<>(); public static final SlimefunTag[] valuesCache = values(); diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 9bd0c14da..8601e2471 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,10 +1,34 @@ { "values" : [ "#slimefun:sensitive_materials", - "#slimefun:pressure_plates", "#minecraft:beds", - "minecraft:cake", - + "#minecraft:buttons", + "#minecraft:signs", + "#slimefun:mushrooms", + "#minecraft:doors", + "minecraft:bamboo", + "#minecraft:rails", + "#minecraft:small_flowers", + "#minecraft:coral_blocks", + "#minecraft:coral_plants", + "#minecraft:small_flowers", + "#minecraft:banners", + "minecraft:sugar_cane", + "minecraft:ladder", + "minecraft:snow", + "minecraft:lever", + "minecraft:repeater", + "minecraft:tripwire_hook", + "minecraft:tall_grass", + "minecraft:large_fern", + "minecraft:lily_pad", + "minecraft:dead_bush", + "minecraft:fern", + "minecraft:grass", + "minecraft:seagrass", + "minecraft:tall_seagrass", + "minecraft:cactus", + "minecraft:kelp", { "id" : "minecraft:nether_sprouts", "required" : false @@ -25,6 +49,5 @@ "id" : "minecraft:weeping_vines", "required" : false } - ] } diff --git a/src/main/resources/tags/sensitive_materials.json b/src/main/resources/tags/sensitive_materials.json index 019721a14..455173a3b 100644 --- a/src/main/resources/tags/sensitive_materials.json +++ b/src/main/resources/tags/sensitive_materials.json @@ -2,32 +2,7 @@ "values" : [ "#minecraft:saplings", "#slimefun:torches", - "#minecraft:buttons", - "#minecraft:signs", - "#slimefun:mushrooms", - "#minecraft:doors", - "minecraft:bamboo", - "#minecraft:rails", - "#minecraft:small_flowers", - "#minecraft:coral_blocks", - "#minecraft:coral_plants", - "#minecraft:small_flowers", - "#minecraft:banners", - "minecraft:sugar_cane", - "minecraft:ladder", - "minecraft:snow", - "minecraft:lever", - "minecraft:repeater", - "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern", - "minecraft:lily_pad", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:grass", - "minecraft:seagrass", - "minecraft:tall_seagrass", - "minecraft:cactus", - "minecraft:kelp" + "minecraft:cake", + "#slimefun:pressure_plates" ] } From e3df3ab012a353c21a996e5d40e4f6c3c7af8a2d Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 15:47:47 +0200 Subject: [PATCH 24/29] added tall_flowers.json and requested changes --- .../slimefun4/utils/tags/SlimefunTag.java | 5 +++++ .../resources/tags/block_placer_ignored_materials.json | 6 ++---- src/main/resources/tags/sensitive_materials.json | 4 ++-- src/main/resources/tags/tall_flowers.json | 10 ++++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/tags/tall_flowers.json diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java index aba7a1189..289314298 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java @@ -126,6 +126,11 @@ public enum SlimefunTag implements Tag { */ PRESSURE_PLATES, + /** + * All tall flowers because minecraft doesn't have a tag for this + */ + TALL_FLOWERS, + /** * Materials which are sensitive to break. * Things like Saplings or Pressure plates which break as well when you break diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 8601e2471..dba4fd923 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,17 +1,17 @@ { "values" : [ "#slimefun:sensitive_materials", + "#slimefun:tall_flowers", + "#slimefun:mushrooms", "#minecraft:beds", "#minecraft:buttons", "#minecraft:signs", - "#slimefun:mushrooms", "#minecraft:doors", "minecraft:bamboo", "#minecraft:rails", "#minecraft:small_flowers", "#minecraft:coral_blocks", "#minecraft:coral_plants", - "#minecraft:small_flowers", "#minecraft:banners", "minecraft:sugar_cane", "minecraft:ladder", @@ -19,8 +19,6 @@ "minecraft:lever", "minecraft:repeater", "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern", "minecraft:lily_pad", "minecraft:dead_bush", "minecraft:fern", diff --git a/src/main/resources/tags/sensitive_materials.json b/src/main/resources/tags/sensitive_materials.json index 455173a3b..daae5c94f 100644 --- a/src/main/resources/tags/sensitive_materials.json +++ b/src/main/resources/tags/sensitive_materials.json @@ -2,7 +2,7 @@ "values" : [ "#minecraft:saplings", "#slimefun:torches", - "minecraft:cake", - "#slimefun:pressure_plates" + "#slimefun:pressure_plates", + "minecraft:cake" ] } diff --git a/src/main/resources/tags/tall_flowers.json b/src/main/resources/tags/tall_flowers.json new file mode 100644 index 000000000..c725cbaac --- /dev/null +++ b/src/main/resources/tags/tall_flowers.json @@ -0,0 +1,10 @@ +{ + "values" : [ + "#minecraft:lilac", + "#minecraft:rose_bush", + "#minecraft:peony", + "minecraft:tall_grass", + "minecraft:large_fern", + "sunflower" + ] +} From b4cd8e0d0cc5299972157cfbe5bb8757f0a613ff Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 16:01:32 +0200 Subject: [PATCH 25/29] added Unit Test --- src/main/resources/tags/tall_flowers.json | 2 +- .../slimefun4/testing/tests/tags/TestSlimefunTags.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/tags/tall_flowers.json b/src/main/resources/tags/tall_flowers.json index c725cbaac..85552928a 100644 --- a/src/main/resources/tags/tall_flowers.json +++ b/src/main/resources/tags/tall_flowers.json @@ -5,6 +5,6 @@ "#minecraft:peony", "minecraft:tall_grass", "minecraft:large_fern", - "sunflower" + "minecraft:sunflower" ] } diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java index 7c2a6f51f..65a850c1c 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java @@ -8,6 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.Tag; +import org.bukkit.entity.Slime; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -63,6 +64,7 @@ class TestSlimefunTags { // Inclusion through a Slimefun Tag Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.TORCH)); + Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.OAK_PRESSURE_PLATE)); } @Test From 0a4f666094f8c1811a086f9c6fe28ab4eeade41d Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 16:06:19 +0200 Subject: [PATCH 26/29] me dumb --- src/main/resources/tags/tall_flowers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/tags/tall_flowers.json b/src/main/resources/tags/tall_flowers.json index 85552928a..61958b5de 100644 --- a/src/main/resources/tags/tall_flowers.json +++ b/src/main/resources/tags/tall_flowers.json @@ -1,8 +1,8 @@ { "values" : [ - "#minecraft:lilac", - "#minecraft:rose_bush", - "#minecraft:peony", + "minecraft:lilac", + "minecraft:rose_bush", + "minecraft:peony", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:sunflower" From 48f45bef02f8453a2483fe8af636bea673e11416 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 17:39:54 +0200 Subject: [PATCH 27/29] Whoops --- .../slimefun4/testing/tests/tags/TestSlimefunTags.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java index 65a850c1c..e6a16d73c 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java @@ -8,7 +8,6 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.bukkit.Material; import org.bukkit.Tag; -import org.bukkit.entity.Slime; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -62,7 +61,7 @@ class TestSlimefunTags { // Inclusion through a Minecraft Tag Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.OAK_SAPLING)); - // Inclusion through a Slimefun Tag + // Inclusion through a Slimefun Tags Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.TORCH)); Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.OAK_PRESSURE_PLATE)); } From 766a245a162673a356dcebc406391ea2cb5c61d7 Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 18:42:12 +0200 Subject: [PATCH 28/29] whoops --- .../slimefun4/testing/tests/tags/TestSlimefunTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java index e6a16d73c..139c5c998 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tags/TestSlimefunTags.java @@ -61,7 +61,7 @@ class TestSlimefunTags { // Inclusion through a Minecraft Tag Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.OAK_SAPLING)); - // Inclusion through a Slimefun Tags + // Inclusion through a Slimefun Tag Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.TORCH)); Assertions.assertTrue(SlimefunTag.SENSITIVE_MATERIALS.isTagged(Material.OAK_PRESSURE_PLATE)); } From 95636818f5e9eb2d5f18950206f1fba710c78acb Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 18 Oct 2020 19:21:46 +0200 Subject: [PATCH 29/29] [CI skip] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e90d9fc9..79e744e69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ #### Fixes * Fixed #2448 +* Fixed #2470 ## Release Candidate 17 (17 Oct 2020)