From 60b2374520f353592aca58ef355cd177145ef8f1 Mon Sep 17 00:00:00 2001 From: jani270 <69345714+jani270@users.noreply.github.com> Date: Thu, 8 Sep 2022 11:43:51 +0200 Subject: Merge pull request #3 * Added gradle and mac stuff to gitignore * Added new badge and fixed kotlin (java) badge * Fixed inconsistency in project (HyPixel x Hypixel) --- .gitignore | 8 ++++++++ CHANGELOG.md | 2 +- FEATURES.md | 2 +- README.md | 6 +++--- src/main/java/at/hannibal2/skyhanni/config/features/Chat.java | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 606e5b149..735978e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,11 @@ .vscode/ run/ build/ + +# gradle +build +gradle.properties +.gradle + +#other +.DS_STORE diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aa337b6a..bc96db169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,7 +78,7 @@ - Summoning souls display is rendering better close to corners - Ashfang gravity orbs are now rendering better close to corners - Showing the name of ashfang gravity orbs as a nametag above the orb -- Bazaar how knows books and essences (Thanks again, HyPixel) +- Bazaar how knows books and essences (Thanks again, Hypixel) ### Bug Fixes - Fixed damage Indicator damage over time display order swapping sometimes diff --git a/FEATURES.md b/FEATURES.md index 64336c651..8e1e1983e 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -6,7 +6,7 @@ - /shmarkplayer (marking a player with yellow color) ## Chat Filter -- Hiding annoying messages in the Hub of Hypixel (MVP player joins, other player loot boxes, prototype message, radiating generosity, HyPixel tournaments) +- Hiding annoying messages in the Hub of Hypixel (MVP player joins, other player loot boxes, prototype message, radiating generosity, Hypixel tournaments) - Hiding Empty messages. - Warping messages (Sending requests and switching servers) - Welcome Message when entering SkyBlock. diff --git a/README.md b/README.md index e7d603db9..b1ce01353 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

- SkyHanni: mod for hypixel skyblock + SkyHanni: Mod for hypixel skyblock

[![discord badge](https://img.shields.io/discord/997079228510117908?label=discord&color=9089DA&logo=discord&style=for-the-badge)](https://discord.gg/8DXVN4BJz3) -[![made with java](https://img.shields.io/badge/Made%20With-Java-orange?style=for-the-badge&logo=java&logocolor=white)](https://www.java.com/) - +[![made with java](https://img.shields.io/badge/Made%20With-Kotlin-orange?style=for-the-badge&logo=kotlin&logocolor=white)](https://www.java.com/) +[![downloads](https://img.shields.io/github/downloads/hannibal00212/SkyHanni/total?label=downloads&color=208a19&logo=github&style=for-the-badge)](https://github.com/hannibal00212/SkyHanni/releases)
SkyHanni is a Minecraft modification that adds new features to Hypixel Skyblock. It is in beta, so expect bugs. diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java index f674680bc..ec6d7482f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java @@ -11,7 +11,7 @@ public class Chat { public boolean filterTypes = false; @Expose - @ConfigOption(name = "HyPixel Hub", desc = "Block messages outside SkyBlock in the HyPixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and HyPixel tournaments.") + @ConfigOption(name = "Hypixel Hub", desc = "Block messages outside SkyBlock in the Hypixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and Hypixel tournaments.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) public boolean hypixelHub = false; -- cgit