diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-05-24 19:49:47 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-05-24 19:49:47 +0200 |
| commit | d862d086ca22e83b35aab0ecb1c10cd8dfb57d64 (patch) | |
| tree | 51d13fa9d874d251a631bfa35f902e15f242d342 | |
| parent | 6e4a3b7284d9f5b7f40d604a6713f3259641ed9e (diff) | |
| download | skyhanni-d862d086ca22e83b35aab0ecb1c10cd8dfb57d64.tar.gz skyhanni-d862d086ca22e83b35aab0ecb1c10cd8dfb57d64.tar.bz2 skyhanni-d862d086ca22e83b35aab0ecb1c10cd8dfb57d64.zip | |
moved flare display around to fix merge conflicts
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | docs/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 423182c63..7a8827a1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ plugins { } group = "at.hannibal2.skyhanni" -version = "0.25" +version = "0.26.Beta.1" val gitHash by lazy { val baos = ByteArrayOutputStream() diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 511d56d15..6589d2e3a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,7 @@ # SkyHanni - Change Log +## Version 0.26 (In Beta) + ## Version 0.25 ### New Features diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 3af43afb0..3b9c8e361 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -693,6 +693,7 @@ class SkyHanniMod { loadModule(HideMobNames()) loadModule(HideDamageSplash()) loadModule(FerocityDisplay()) + loadModule(FlareDisplay) loadModule(InGameDateDisplay()) loadModule(ThunderSparksHighlight()) loadModule(BlazeSlayerDaggerHelper()) @@ -944,7 +945,6 @@ class SkyHanniMod { loadModule(ColdOverlay()) loadModule(QuiverDisplay()) loadModule(QuiverWarning()) - loadModule(FlareDisplay) init() |