main-17.0.0-SNAPSHOT-24
Merge remote-tracking branch 'upstream/master' # Conflicts: # pom.xml # src/main/java/me/ryanhamshire/GriefPrevention/Claim.java # src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java # src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java # src/main/resources/plugin.yml