From 04b207525111ec285a05af3e755a3006eafcf387 Mon Sep 17 00:00:00 2001
From: Nick DeGruccio <nick.degruccio@gmail.com>
Date: Sun, 20 Dec 2020 22:12:00 -0800
Subject: [PATCH] 6.0.9

---
 build.gradle        | 4 ++--
 changelogs/6.0.9.md | 7 +++++++
 pixelmon            | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/6.0.9.md

diff --git a/build.gradle b/build.gradle
index b0def263..00500a11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ plugins {
 }
 
 group = 'me.nickimpact.gts'
-version = "6.0.9-SNAPSHOT"
+version = "6.0.9"
 
 apply plugin: 'maven-publish'
 apply plugin: 'maven-publish-auth'
@@ -80,7 +80,7 @@ subprojects {
         options.encoding = 'UTF-8'
     }
 
-    version = "6.0.9-SNAPSHOT${project.ext.run}"
+    version = "6.0.9${project.ext.run}"
     group = 'me.nickimpact.gts'
 
     repositories {
diff --git a/changelogs/6.0.9.md b/changelogs/6.0.9.md
new file mode 100644
index 00000000..5aaea36f
--- /dev/null
+++ b/changelogs/6.0.9.md
@@ -0,0 +1,7 @@
+# Before Upgrading to GTS 6 from GTS 5.x.x
+
+[Please read the GTS 6.0.0 release notes for information regarding upgrading!](https://ore.spongepowered.org/NickImpact/GTS/versions/6.0.0)
+
+# Fixes
+* Fixed an issue allowing for the possibility of duplicating items on BIN listings
+* Change discord placeholder replacement strategy due to matching techniques conflicting with some configurations
\ No newline at end of file
diff --git a/pixelmon b/pixelmon
index 21a0ecb5..be5c33f3 160000
--- a/pixelmon
+++ b/pixelmon
@@ -1 +1 @@
-Subproject commit 21a0ecb58bf19c8b2b2f52bf3c69fe344a3d7468
+Subproject commit be5c33f351fd270694cb8c0786303255dfb717cf