Merge branch 'master' into develop

Auxilor · Jan 26, 2024 · 7defdcc · 7defdcc
2 parents b6b4d7e + 35496c6
commit 7defdcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -15,6 +15,8 @@ loadbefore:
   - EconomyShopGUI-Premium
   - CMI
   - DeluxeCombat
+  - SCore
+  - ExecutableItems
 softdepend:
   - Terra
   - ProtocolLib
@@ -47,7 +49,6 @@ softdepend:
   - CrashClaim
   - DecentHolograms
   - MythicMobs
-  - ExecutableItems
   - RPGHorses
   - zShop
   - DeluxeSellwands

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version = 6.68.5
+version = 6.68.6
 kotlin.incremental.useClasspathSnapshot=false