Merge branch 'refs/heads/main' into fork/ItsEmpa/kt/minion

# Conflicts: # src/main/java/me/partlysanestudios/partlysaneskies/features/economy/minioncalculator/MinionData.java # src/main/java/me/partlysanestudios/partlysaneskies/features/economy/minioncalculator/ProfitMinionCalculator.java # src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt # src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/mainmenu/MainMenuOptionMenu.kt # src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/mainmenu/PSSMainMenu.kt # src/main/kotlin/me/partlysanestudios/partlysaneskies/utils/StringUtils.kt
PartlySaneStudios · Aug 13, 2024 · fe05afd · fe05afd
2 parents 425bcbb + 380fb2b
commit fe05afd
Show file tree

Hide file tree

Showing 160 changed files with 6,272 additions and 5,949 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -72,10 +72,16 @@ toolkitGitHubPublishing {
     repository.set("partly-sane-skies")
 }
 
+tasks {
+    fatJar {
+        relocate("com.jagrosh.discordipc", "me.partlysanestudios.partlysaneskies.deps.discordipc")
+    }
+}
+
 bloom {
     val dogfood: String by project
     val releaseChannel: String by project
 
     replacement("@DOGFOOD@", dogfood)
     replacement("@RELEASE_CHANNEL@", releaseChannel)
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ mod.name=Partly Sane Skies
 mod.id=partlysaneskies
 mod.description=Developed by Partly Sane Studios. Discord: https://discord.gg/v4PU3WeH7z
 
-mod.version=beta-v0.6.2-prerelease-5
+mod.version=beta-v0.6.2-prerelease-8
 #    -----------------------CHANGE TO FALSE BEFORE RELEASING
 dogfood=false
 # Release Channel:

diff --git a/src/main/java/me/partlysanestudios/partlysaneskies/features/chat/ChatAlertsManager.java b/src/main/java/me/partlysanestudios/partlysaneskies/features/chat/ChatAlertsManager.java