Merge branch 'development' of https://github.com/craftaro/EpicEnchants into development

README.md

@@ -1,6 +1,6 @@
 <!--suppress HtmlDeprecatedAttribute -->
 <div align="center">
-<img src="https://craftaro.com/images/products/388/icons/iq6vOej7riPuvV0SI9hd1n83S91HBrGYsq7GPeCa.png" width="128px">
+<img src="docs/Logo.png" width="128px">
 
 # EpicEnchants
 **Unlock the potential of your weapons, tools and armor by making your own custom enchants**
@@ -8,15 +8,14 @@
 
 
 [![Discord][Discord shield]][Discord invite]
-[![Patreon][Patreon shield]][Patreon page]
 <br>
-[![Latest version][Latest version shield]][Marketplace page]
+[![Latest version][Latest version shield]][Plugin page]
 [![bStats Servers][bStats shield]][bStats page]
 </div>
 
 
 ## Download (Marketplace)
-You can visit [our marketplace][Marketplace page] to download EpicEnchants as well as take a
+You can visit [our marketplace][Plugin page] to download EpicEnchants as well as take a
 look at many other fantastic plugins which are sure to catch your eye.
 
 ## Documentation
@@ -34,13 +33,12 @@ For suggestions about features you think should be added to the plugin to increa
 create a thread over on [our Discord server][Discord invite].
 
 
-[Marketplace page]: https://craftaro.com/marketplace/product/67
-[Plugin wiki]: https://wiki.craftaro.com/index.php/Epic_Enchants
-[Patreon page]: https://www.patreon.com/join/songoda
-[Discord invite]: https://discord.gg/craftaro
-[bStats page]: https://bstats.org/plugin/bukkit/EpicEnchants/5287
+[Plugin page]: https://songoda.com/product/4
+[Plugin wiki]: https://songoda.notion.site/EpicEnchants-f807af85703b434984502bf0dbaf7949
+[Discord invite]: https://discord.gg/7TXM8xr2Ng
 
-[Patreon shield]: https://img.shields.io/badge/-Support_us_on_Patreon-F96854.svg?logo=patreon&style=flat&logoColor=white
-[Discord shield]: https://img.shields.io/discord/293212540723396608?color=5865F2&label=Discord&logo=discord&logoColor=5865F2
-[bStats shield]: https://img.shields.io/bstats/servers/5287?label=Servers
+[Discord shield]: https://img.shields.io/discord/1214289374506917889?color=5865F2&label=Discord&logo=discord&logoColor=5865F2
 [Latest version shield]: https://img.shields.io/badge/dynamic/xml?style=flat&color=blue&logo=github&logoColor=white&label=Latest&url=https%3A%2F%2Fraw.githubusercontent.com%2Fcraftaro%2FEpicEnchants%2Fmaster%2Fpom.xml&query=%2F*%5Blocal-name()%3D'project'%5D%2F*%5Blocal-name()%3D'version'%5D
+
+[bStats page]: https://bstats.org/plugin/bukkit/EpicEnchants/5287
+[bStats shield]: https://img.shields.io/bstats/servers/5287?label=Servers

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.craftaro</groupId>
     <artifactId>EpicEnchants</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>EpicEnchants</name>
     <description>Unlock the potential of your weapons, tools and armor by making your own custom enchants.</description>
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -73,10 +73,10 @@
                                     <excludeDefaults>false</excludeDefaults>
                                     <includes>
                                         <include>**/nms/v*/**</include>
+                                        <include>**/third_party/net/kyori/**</include>
                                     </includes>
                                     <excludes>
                                         <exclude>**/third_party/org/apache/**</exclude>
-                                        <exclude>**/third_party/net/kyori/**</exclude>
                                         <exclude>**/third_party/com/zaxxer/**</exclude>
                                         <exclude>**/third_party/org/jooq/**</exclude>
                                         <exclude>**/third_party/org/mariadb/**</exclude>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.craftaro</groupId>
             <artifactId>CraftaroCore</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>