From c75f8c9d6fc2b537eaf08c5209d390fe05054b44 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)
---
 src/main/java/at/hannibal2/skyhanni/config/features/Chat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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