Merge branch 'master' into fight-fixes

# Conflicts: # fight/__init__.py # fight/fight.py # fight/info.json
reformat
2018-10-09 10:03:21 -04:00 · 2018-10-09 10:02:48 -04:00 · 2018-10-09 10:02:22 -04:00 · 2018-10-09 09:57:13 -04:00 · 2018-10-09 09:49:29 -04:00 · 2018-10-09 09:31:49 -04:00
3 changed files with 1244 additions and 0 deletions
--- a/fight/init.py
+++ b/fight/init.py
@ -0,0 +1,6 @@
+from .fight import Fight
+
+
+def setup(bot):
+    n = Fight(bot)
+    bot.add_cog(n)
--- a/fight/fight.py
+++ b/fight/fight.py
--- a/fight/info.json
+++ b/fight/info.json
@ -0,0 +1,25 @@
+{
+  "author": [
+    "Bobloy"
+  ],
+  "bot_version": [
+    3,
+    0,
+    0
+  ],
+  "description": "[Incomplete] Cog to organize tournaments within Discord",
+  "hidden": true,
+  "install_msg": "Thank you for installing Fight. Run with [p]fight or [p]fightset",
+  "requirements": [],
+  "short": "[Incomplete] Cog to organize tournaments",
+  "tags": [
+    "game",
+    "fun",
+    "fight",
+    "tournament",
+    "tourney",
+    "elimination",
+    "bracket",
+    "bobloy"
+  ]
+}
Author	SHA1	Message	Date
bobloy	b0f7ef5142	Merge branch 'master' into fight-fixes # Conflicts: # fight/__init__.py # fight/fight.py # fight/info.json	2018-10-09 10:03:21 -04:00
bobloy	82c144353f	reformat	2018-10-09 10:02:48 -04:00
bobloy	eda036a1b0	black format	2018-10-09 10:02:22 -04:00
bobloy	18f5a3afc5	No comment needed	2018-10-09 09:57:13 -04:00
bobloy	51a3e172c4	Quick fix	2018-10-09 09:49:29 -04:00
bobloy	a671e81af8	Merge branch 'master' into fight-fixes # Conflicts: # fight/fight.py # fight/info.json	2018-10-09 09:31:49 -04:00
Bobloy	0f7381fbe1	naming convention	2018-04-23 10:38:49 -04:00
Bobloy	7ee8f6ff73	refactoring	2018-04-23 10:17:17 -04:00
Bobloy	8280f6fba8	coding style updates	2018-04-23 10:07:59 -04:00