Merge branch 'development' into development

2 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index dea6859..976f1eb 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -45,6 +45,7 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[spiritbearalerts][").append(ToggleCommand.spiritBearAlerts).append("]\n");
 			debug.append("[aotd][").append(ToggleCommand.aotdToggled).append("]\n");
 			debug.append("[lividdagger][").append(ToggleCommand.lividDaggerToggled).append("]\n");
+			debug.append("[flowerweapons][").append(ToggleCommand.flowerWeaponsToggled).append("]\n");
 			debug.append("[sceptremessages][").append(ToggleCommand.sceptreMessages).append("]\n");
 			debug.append("[petcolors][").append(ToggleCommand.petColoursToggled).append("]\n");
 			debug.append("[dungeontimer][").append(ToggleCommand.dungeonTimerToggled).append("]\n");
@@ -69,6 +70,7 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[creeperpuzzle][").append(ToggleCommand.creeperToggled).append("]\n");
 			debug.append("[waterpuzzle][").append(ToggleCommand.waterToggled).append("]\n");
 			debug.append("[tictactoepuzzle][").append(ToggleCommand.ticTacToeToggled).append("]\n");
+			debug.append("[watchermessage][").append(ToggleCommand.watcherReadyToggled).append("]\n");
 			debug.append("[startswithterminal][").append(ToggleCommand.startsWithToggled).append("]\n");
 			debug.append("[selectallterminal][").append(ToggleCommand.selectAllToggled).append("]\n");
 			debug.append("[clickinorderterminal][").append(ToggleCommand.clickInOrderToggled).append("]\n");
@@ -79,7 +81,6 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("[superpairs][").append(ToggleCommand.superpairsToggled).append("]\n");
 			debug.append("[hidetooltipsinaddons][").append(ToggleCommand.hideTooltipsInExperimentAddonsToggled).append("]\n");
 			debug.append("[pickblock][").append(ToggleCommand.swapToPickBlockToggled).append("]\n");
-			debug.append("[watchermessage][").append(ToggleCommand.watcherReadyToggled).append("]\n");
 			debug.append("# Locations\n");
 			debug.append("[coords][").append(MoveCommand.coordsXY[0]).append(", ").append(MoveCommand.coordsXY[1]).append("]\n");
 			debug.append("[display][").append(MoveCommand.displayXY[0]).append(", ").append(MoveCommand.displayXY[1]).append("]\n");
@@ -98,7 +99,8 @@ public class DankerGuiCommand extends CommandBase {
 				debug.append("<None>\n");
 			} else {
 				for (ResourcePackRepository.Entry resource : Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries()) {
-					debug.append("< ").append(StringUtils.stripControlCodes(resource.getResourcePackName())).append(" >\n");				}
+					debug.append("< ").append(StringUtils.stripControlCodes(resource.getResourcePackName())).append(" >\n");
+				}
 			}
 			debug.append("```");
 			StringSelection clipboard = new StringSelection(debug.toString());
diff --git a/src/main/java/me/Danker/handlers/TextRenderer.java b/src/main/java/me/Danker/handlers/TextRenderer.java
index cbf196b..769d164 100644
--- a/src/main/java/me/Danker/handlers/TextRenderer.java
+++ b/src/main/java/me/Danker/handlers/TextRenderer.java
@@ -3,6 +3,7 @@ package me.Danker.handlers;
 import me.Danker.commands.ToggleCommand;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.StringUtils;
 import org.lwjgl.opengl.GL11;
 
@@ -26,5 +27,6 @@ public class TextRenderer extends Gui {
 			}
 		}
 		GL11.glScaled(scaleReset, scaleReset, scaleReset);
+		GlStateManager.color(1, 1, 1, 1);
 	}
 }