Merge branch 'develop' into root

HyacinthBots · Nov 29, 2022 · c1b8c24 · c1b8c24
2 parents 1caa617 + 079c1bf
commit c1b8c24
Show file tree

Hide file tree

Showing 36 changed files with 161 additions and 500 deletions.
diff --git a/.github/img/cover-hq.png b/.github/img/cover-hq.png
diff --git a/.gitignore b/.gitignore
@@ -35,21 +35,10 @@ hs_err_pid*
 .idea/**/dictionaries
 .idea/**/shelf
 
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
+# Idea
+.idea/
+*.iml
+*.ipr
 
 # Gradle and Maven with auto-import
 # When using Gradle or Maven with auto-import, you should exclude module files,
@@ -110,3 +99,5 @@ build/
 
 # Env vars - don't commit this!
 .env
+
+.linkie-cache
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/file.template.settings.xml b/.idea/file.template.settings.xml
diff --git a/.idea/fileTemplates/KordEx Extension.kt b/.idea/fileTemplates/KordEx Extension.kt
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
diff --git a/.idea/markdown.xml b/.idea/markdown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules/Allium.main.iml b/.idea/modules/Allium.main.iml
diff --git a/.idea/modules/Allium.test.iml b/.idea/modules/Allium.test.iml
diff --git a/.idea/modules/SkyblockBot.test.iml b/.idea/modules/SkyblockBot.test.iml
diff --git a/.idea/modules/de.notjansel.sbbot.template.test.iml b/.idea/modules/de.notjansel.sbbot.template.test.iml
diff --git a/.idea/modules/template.test.iml b/.idea/modules/template.test.iml
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build.xml