From 220cfc9058c0e7bc9cc38ca2cf46946845481cdb Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Sun, 16 Jan 2022 16:54:19 +0000 Subject: [PATCH 1/2] Update dough --- CHANGELOG.md | 1 + pom.xml | 2 +- .../slimefun4/integrations/IntegrationsManager.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a9f9cd5..fe5f7d909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ #### Changes * (API) `BiomeMapParser` is now `public` * (API) `BiomeMap.fromJson` now allows you to specify if you want the BiomeMap to be parsed leniently +* Updated dough, fixing some issues #### Fixes * Fixed #3390 diff --git a/pom.xml b/pom.xml index 62169a2f5..c7e66c864 100644 --- a/pom.xml +++ b/pom.xml @@ -350,7 +350,7 @@ io.github.baked-libs dough-api - 1.1.1 + 1.1.2 compile diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java index 501fe851b..467eac1ae 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java @@ -140,7 +140,7 @@ public class IntegrationsManager { private void onServerStart() { try { // Load Protection plugin integrations - protectionManager = new ProtectionManager(plugin.getServer()); + protectionManager = new ProtectionManager(plugin); } catch (Exception | LinkageError x) { Slimefun.logger().log(Level.WARNING, x, () -> "Failed to load Protection plugin integrations for Slimefun v" + Slimefun.getVersion()); } From ee019cda443447fe828e4cc653ed5062985cecf6 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Mon, 17 Jan 2022 11:46:03 +0000 Subject: [PATCH 2/2] Fixed changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe5f7d909..145b1f65e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,11 +43,11 @@ * Added Spore Blossom as a fuel type for the Bio-Generator * Added a new item setting for Freezers to allow them to use a 9:1 "vanilla" ratio instead of 1:1 (1:1 by default, like before) * (API) Added `PlayerProfile#hasUnlockedEverything()` to check if a player has unlocked all researches +* Added support for the plugin "HuskTowns" #### Changes * (API) `BiomeMapParser` is now `public` * (API) `BiomeMap.fromJson` now allows you to specify if you want the BiomeMap to be parsed leniently -* Updated dough, fixing some issues #### Fixes * Fixed #3390 @@ -57,6 +57,8 @@ * Fixed #3400 * Fixed rare issue where Slimefun would not load at all * Fixed #3429 +* Fixed "LogBlock" integration +* Fixed "Lands" integration ## Release Candidate 30 (31 Dec 2021) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30