Merge branch 'beta' into fork/heatran-is-the-worst-hypixel-admin-ever

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt

.devauth/config.toml

@@ -0,0 +1,6 @@
+defaultEnabled = true
+defaultAccount = "main"
+
+[accounts.main]
+type = "microsoft"
+

.gitattributes

@@ -0,0 +1,14 @@
+* text=auto
+
+# Always Unix-style line endings
+*.sh    text eol=lf
+
+# Always Windows-style line endings
+*.bat   text eol=crlf
+*.cmd   text eol=crlf
+
+# Always binary
+*.jpg   -text
+*.ogg   -text
+*.png   -text
+*.xcf   -text

.github/workflows/generate-constants.yaml

@@ -4,6 +4,7 @@ name: RepoPattern
 
 env:
     data_repo: hannibal002/SkyHanni-REPO
+    repo_action: true
 
 on:
     push:

.gitignore

@@ -12,3 +12,6 @@ gradle.properties
 
 # other
 .DS_STORE
+
+.devauth/*
+!.devauth/config.toml

CONTRIBUTING.md

@@ -77,7 +77,7 @@ format like "- #821" to illustrate the dependency.
 - Do not use `e.printStackTrace()`, use `CopyErrorCommand.logError(e, "explanation for users")` instead.
 - Do not use `MinecraftForge.EVENT_BUS.post(event)`, use `event.postAndCatch()` instead.
 - Do not use `toRegex()` or `toPattern()`, use `RepoPattern` instead.
-    - See [RepoPattern.kt](https://github.com/walkerselby/SkyHanni/blob/beta/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPattern.kt)
+    - See [RepoPattern.kt](https://github.com/hannibal002/SkyHanni/blob/beta/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPattern.kt)
 for more information and usages.
     - The pattern variables are named in the scheme `variableNamePattern`
 - Please use Regex instead of String comparison when it is likely Hypixel will change the message in the future.

README.md

@@ -8,19 +8,19 @@
 
 [![discord badge](https://img.shields.io/discord/997079228510117908?label=discord&color=9089DA&logo=discord&style=for-the-badge)](https://discord.gg/skyhanni-997079228510117908)
 [![made with kotlin](https://img.shields.io/badge/Made%20With-Kotlin-orange?style=for-the-badge&logo=kotlin&logocolor=white)](https://kotlinlang.org/)
-[![downloads](https://img.shields.io/github/downloads/hannibal002/SkyHanni/total?label=downloads&color=208a19&logo=github&style=for-the-badge)](https://github.com/hannibal00212/SkyHanni/releases)
+[![downloads](https://img.shields.io/github/downloads/hannibal002/SkyHanni/total?label=downloads&color=208a19&logo=github&style=for-the-badge)](https://github.com/hannibal002/SkyHanni/releases)
 </div>
 
 SkyHanni is a Forge mod for Minecraft 1.8.9. It adds many features to Hypixel SkyBlock.
 The mod is filled with GUIs, extra chat messages, reminders, message hiders and entity highlighters.
 The majority of these features are centered in the Garden, Slayer, Bingo, Diana, and Rift.
 
-We have a [tutorial](https://github.com/hannibal002/SkyHanni/blob/beta/INSTALLING.md)
+We have a [tutorial](https://github.com/hannibal002/SkyHanni/blob/beta/docs/INSTALLING.md)
 for how to download and install the mod.
 
 Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 
-[Here](https://github.com/hannibal002/SkyHanni/blob/beta/FEATURES.md)  is a large list of all features.
+[Here](https://github.com/hannibal002/SkyHanni/blob/beta/docs/FEATURES.md)  is a large list of all features.
 
 For bug reports, feature requests, and other feedback, please visit
 our [Discord](https://discord.gg/skyhanni-997079228510117908).

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.17"
+version = "0.24.Beta.5"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
@@ -103,7 +103,7 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre5:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -114,7 +114,7 @@ dependencies {
     implementation(libs.hotswapagentforge)
 
 //    testImplementation(kotlin("test"))
-    testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
+    testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre5:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -146,7 +146,9 @@ loom {
     launchConfigs {
         "client" {
             property("mixin.debug", "true")
-            property("asmhelper.verbose", "true")
+            if (System.getenv("repo_action") != "true") {
+                property("devauth.configDir", rootProject.file(".devauth").absolutePath)
+            }
             arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
             arg("--tweakClass", "io.github.moulberry.moulconfig.tweaker.DevelopmentResourceTweaker")
             arg("--mods", devenvMod.resolve().joinToString(",") { it.relativeTo(file("run")).path })