Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/at/lorenz/mod/LorenzMod.java
#	src/main/java/at/lorenz/mod/config/Features.java
#	src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
#	src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
#	src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java
index 21bf4529f..778c9d6c0 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java
@@ -80,7 +80,7 @@ public class Commands {
         ClientCommandHandler.instance.registerCommand(settingsCommand2);
         //        ClientCommandHandler.instance.registerCommand(mapCommand);
         //        ClientCommandHandler.instance.registerCommand(devCommand);
-//        ClientCommandHandler.instance.registerCommand(new CrystalWaypoints.WaypointCommand());
+        //        ClientCommandHandler.instance.registerCommand(new CrystalWaypoints.WaypointCommand());
     }
     //    private static void sendSBHMessage(ICommandSender sender, String message) {
     //        sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + message));
diff --git a/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java
index d69a29766..9bfdd2842 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java
@@ -40,12 +40,12 @@ public class Utils {
         return input.toLowerCase().replace(" ", "").replace(replace, "");
     }
 
-//    public static boolean isPlayerHoldingRedstone(EntityPlayerSP player) {
-//        if (!LorenzMod.config.main.requireRedstone) return true;
-//        ArrayList<Item> redstoneItems = new ArrayList<>(Arrays.asList(Items.redstone, Items.repeater, Items.comparator, Item.getByNameOrId("minecraft:redstone_torch")));
-//        if (player.getHeldItem() != null) return redstoneItems.contains(player.getHeldItem().getItem());
-//        return false;
-//    }
+    //    public static boolean isPlayerHoldingRedstone(EntityPlayerSP player) {
+    //        if (!LorenzMod.config.main.requireRedstone) return true;
+    //        ArrayList<Item> redstoneItems = new ArrayList<>(Arrays.asList(Items.redstone, Items.repeater, Items.comparator, Item.getByNameOrId("minecraft:redstone_torch")));
+    //        if (player.getHeldItem() != null) return redstoneItems.contains(player.getHeldItem().getItem());
+    //        return false;
+    //    }
 
     public static boolean inRangeInclusive(int value, int min, int max) {
         return value <= max && value >= min;