Skip to content
This repository was archived by the owner on Mar 14, 2021. It is now read-only.

Team 20 #16

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ece1140
Merge pull request #1 from discord-python/master
skrungly Mar 23, 2018
54fbeb0
First draft
isik-kaplan Mar 23, 2018
105b415
Adding snakes.txt
isik-kaplan Mar 23, 2018
fd9db0d
Cleaned up a bit, added bot test
invalid-email-address Mar 23, 2018
63ccb69
Added pictures
isik-kaplan Mar 23, 2018
3763038
Embeds and redirects :D
invalid-email-address Mar 23, 2018
47e03d6
Fixed url encoder
isik-kaplan Mar 23, 2018
9b4a683
I don't fucking know
invalid-email-address Mar 23, 2018
73ab47b
I don't fucking know
invalid-email-address Mar 23, 2018
2cbbf34
Fixed up wikipedia's bullshit
invalid-email-address Mar 23, 2018
0ddc2a4
fixed little stuff
isik-kaplan Mar 24, 2018
e766154
Various small edits
Mar 24, 2018
8d89ccf
Various small edits
Mar 24, 2018
002dcfa
fixed more little stuff
Mar 24, 2018
163d4d7
Merge pull request #2 from discord-python/master
skrungly Mar 24, 2018
916a7ac
Added autocomplete kwarg(ish)
Mar 24, 2018
9338eeb
Merge branch 'master' of https://github.com/kingdom5500/code-jam-1
Mar 24, 2018
a626e56
kwarg parsing ^^
Mar 25, 2018
aa43444
fucking hell, had accidentally pushed bot token :I
Mar 25, 2018
532995e
Revert "kwarg parsing ^^"
Mar 25, 2018
992de22
Revert "fucking hell, had accidentally pushed bot token :I"
Mar 25, 2018
305c3fe
Revert "kwarg parsing ^^"
Mar 25, 2018
d419d1c
Well I'm stupid :D
Mar 25, 2018
108e84d
snakes.txt + snakes2.py
isik-kaplan Mar 25, 2018
971d098
Merge branch 'master' of https://github.com/kingdom5500/code-jam-1
isik-kaplan Mar 25, 2018
2c6af66
Added snake_card command (kinda)
Mar 25, 2018
80e01f6
These files are useful
Mar 25, 2018
8bb749d
Finally used .env
Mar 25, 2018
fc5dddb
Arg edits, made by someone
Mar 25, 2018
3330e52
added snkaes.py *duuh*
isik-kaplan Mar 25, 2018
1b5e682
Oops.
Mar 25, 2018
2344edc
Oops.
Mar 25, 2018
94bfad1
Revert "Finally used .env"
Mar 25, 2018
a93cc3b
Revert "These files are useful"
Mar 25, 2018
9f77c25
Touched up some stuff
Mar 25, 2018
626b8b6
Accidentally pushed old token fucking hell
Mar 25, 2018
d31e269
Finishing touches for now. Will still need fine-tuning though
Mar 25, 2018
78ad193
Added my own version. Someone, don't hurt me :(
Mar 25, 2018
e395e6b
Added a comment for clarification :D
Mar 25, 2018
93d1d8e
Improved special cases
Mar 25, 2018
b9ee9c0
Improved special cases
Mar 25, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ name = "pypi"
[packages]
"72eb2aa" = {file = "https://github.com/Rapptz/discord.py/archive/rewrite.zip"}
aiodns = "*"
aiohttp = "<2.3.0,>=2.0.0"
aiohttp = "==2.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

websockets = ">=4.0,<5.0"
google-api-python-client = "*"
pillow = "*"

[dev-packages]
"flake8" = "*"
Expand Down
191 changes: 154 additions & 37 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added bot/cards/backs/card_back1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bot/cards/backs/card_back2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bot/cards/card_bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bot/cards/card_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bot/cards/card_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bot/cards/expressway.ttf
Binary file not shown.
Loading