From b3b0d71af6becc05259b841de21b9171602d174e Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:56:08 -0800
Subject: [PATCH 1/6] Update modrinth-publish.yml

---
 .github/workflows/modrinth-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/modrinth-publish.yml b/.github/workflows/modrinth-publish.yml
index 8244fe239..9f8b505a8 100644
--- a/.github/workflows/modrinth-publish.yml
+++ b/.github/workflows/modrinth-publish.yml
@@ -21,8 +21,8 @@ jobs:
           cache: maven
 
       # This step will take the version tag from the release and replace it in `pom.xml` before building.
-      - name: Set version from release tag
-        run: mvn -B versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
+      #- name: Set version from release tag
+      #  run: mvn -B versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
 
       - name: Build and package with Maven
         run: mvn -B clean package --file pom.xml

From 4231bcfe35cc2dcb711f5b551ff0c6014870d45f Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 21 Dec 2024 18:58:08 -0800
Subject: [PATCH 2/6] Update build.yml

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dff7a8f18..47e1c74cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - develop
+      - master
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

From e811f90bd550e4ec5a09be09d46f59e0f8e2c2a5 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 21 Dec 2024 19:00:26 -0800
Subject: [PATCH 3/6] Update build.yml

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dff7a8f18..47e1c74cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - develop
+      - master
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

From 2dbb522eb708696cdcd37482adc22c809c204c0c Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 22 Dec 2024 08:48:50 -0800
Subject: [PATCH 4/6] Updated JavaDoc to avoid error.

---
 src/main/java/world/bentobox/bentobox/database/Database.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/database/Database.java b/src/main/java/world/bentobox/bentobox/database/Database.java
index eca983ac2..8b0c4aea3 100644
--- a/src/main/java/world/bentobox/bentobox/database/Database.java
+++ b/src/main/java/world/bentobox/bentobox/database/Database.java
@@ -167,8 +167,8 @@ public class Database<T> {
     }
 
     /**
-     * Load all objects async
-     * @return CompletableFuture<List<T>>
+     * Load all objects asynchronously.
+     * @return {@code CompletableFuture<List<T>>}
      */
     public @NonNull CompletableFuture<List<T>> loadObjectsASync() {
         return handler.loadObjectsASync();

From 60f0110547a850f6087c1e3746d3e406fdc2c0a1 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 22 Dec 2024 09:27:41 -0800
Subject: [PATCH 5/6] Remove the parallel test running

---
 pom.xml                                                         | 2 --
 .../bentobox/bentobox/panels/customizable/IslandHomesPanel.java | 1 -
 2 files changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 360d19dc0..faf1b955c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,8 +457,6 @@
                 <version>3.0.0-M5</version>
                 <!--suppress MavenModelInspection -->
                 <configuration>
-                    <parallel>classes</parallel>
-                    <threadCount>4</threadCount>
                     <argLine>
                         ${argLine}
                         --add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/src/main/java/world/bentobox/bentobox/panels/customizable/IslandHomesPanel.java b/src/main/java/world/bentobox/bentobox/panels/customizable/IslandHomesPanel.java
index c760a21d8..84e9898a3 100644
--- a/src/main/java/world/bentobox/bentobox/panels/customizable/IslandHomesPanel.java
+++ b/src/main/java/world/bentobox/bentobox/panels/customizable/IslandHomesPanel.java
@@ -60,7 +60,6 @@ public class IslandHomesPanel extends AbstractPanel
      *
      * @param command CompositeCommand
      * @param user User who opens panel
-     * @param islandMap map of island names and IslandInfo
      */
     private IslandHomesPanel(@NonNull CompositeCommand command, @NonNull User user)
     {

From 212166ebe806fbe4c4201b1ca3e68628e072b7c8 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 22 Dec 2024 09:28:18 -0800
Subject: [PATCH 6/6] Update surefire plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index faf1b955c..d932b91ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,7 +454,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.5.2</version>
                 <!--suppress MavenModelInspection -->
                 <configuration>
                     <argLine>