From cc235cfc01da8e365a7fccf1cbc2d352dc9660c5 Mon Sep 17 00:00:00 2001
From: Andre_601 <11576465+Andre601@users.noreply.github.com>
Date: Fri, 3 Dec 2021 04:52:28 +0100
Subject: [PATCH] Merge Development into master (#758)

* Update development from master (#662)

* Add contributing and expansion section

* Start using new Issue template system

* Create bug_report.yml

* Rename feature_request.md to feature_request_old.md

* Create feature_request.yml

* fix unique name

* Update feature_request_old.md

* Add Checkboxes

* Add checkboxes

* disable default issue body

* Delete bug_report_old.md

* Delete feature_request_old.md

* Rename bug_report_new.yml to bug_report.yml

* Check if deleting this fixed the PR...

* Use description in favour of about

* improve feature_request.md

* Update bug_report.yml

* Assign "Type: Issue (Unconfirmed)" label

* Use lists and not comma-separated string

* Update feature_request.yml

* Use id option for error and dump fields

* Add field for logs

* Remove deprecated issue_body type

* Update feature_request.yml

* Improve description of bug_report.yml

* Initial 1.17 Changes

* add render

* Revert build.gradle dependencies change

* Fixed duplicate files

* Initial test on adventure

* started moving to pure adventure

* finished kyori impl

* added 1.17 to nmsversion (what does this even do)

* removed dev for release

* added dev back

Co-authored-by: PiggyPiglet <PiggyPiglet@users.noreply.github.com>
Co-authored-by: darbyjack <admin@glaremasters.me>
Co-authored-by: PiggyPiglet <noreply@piggypiglet.me>

* Update dependencies of PlaceholderAPI

* Add missing trailing /

Co-authored-by: PiggyPiglet <PiggyPiglet@users.noreply.github.com>
Co-authored-by: darbyjack <admin@glaremasters.me>
Co-authored-by: PiggyPiglet <noreply@piggypiglet.me>
---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5df263f..172866c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,23 +18,23 @@ repositories {
     mavenCentral()
     mavenLocal()
 
-    maven({ url = "https://repo.codemc.org/repository/maven-public" })
+    maven({ url = "https://repo.codemc.org/repository/maven-public/" })
     maven({ url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" })
 }
 
 dependencies {
     implementation "org.bstats:bstats-bukkit:2.2.1"
 
-    implementation "net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT"
+    implementation "net.kyori:adventure-platform-bukkit:4.0.0"
 
     compileOnly "org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT"
-    compileOnly "org.jetbrains:annotations:19.0.0"
+    compileOnly "org.jetbrains:annotations:22.0.0"
 
-    testImplementation "org.openjdk.jmh:jmh-core:1.23"
-    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.23"
+    testImplementation "org.openjdk.jmh:jmh-core:1.32"
+    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.32"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }
 
 processResources {