Merge branch 'master' into rewrite

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Roxanne Gibson
+Copyright (c) 2018 Roxanne Gibson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -23,6 +23,8 @@ A simple Discord Bot used by me personally, written for fun.
 
 ######Bug FIxes
 - Fixed bug where Custom Commands would ignore the blacklist.
+- Fixed issue where custom command outputs were always lowercase
+- Fixed some naughty swears that were placeholders for a more civilised response.
 - Removed Herobrine
 
 #### v1.2.0

cogs/customcommands.py

@@ -45,7 +45,7 @@ class CustomCommands():
 		"Adds a custom command to the list of custom commands."
 		self.servers = self.con.load_config()
 		command = command.lower()
-		output = output.lower()
+		output = output
 		zero = self.servers[ctx.message.server.id]["custom_commands"]["0"]
 		one = self.servers[ctx.message.server.id]["custom_commands"]["1"]
 

cogs/settings.py

@@ -167,10 +167,12 @@ class Settings():
 		em.set_author(name="{} settings for {}.".format(self.bot.user.name, ctx.message.server.name), icon_url=self.bot.user.avatar_url)
 
 		for settings in config:
-			if settings != "custom_commands":
+			if settings != "custom_commands" or settings != "warnings":
 				settingcontent = ""
 				for x in config[settings].items():
 					settingcontent += str(x).strip("()") + "\n"
+				if not settingcontent:
+					settingcontent = "."
 				em.add_field(name=settings, value=settingcontent, inline=False)
 			else:
 				em.add_field(name="custom_commands", value="For Custom Commands, use the custom list command.", inline=False)