Commit Graph
68 Commits
Author SHA1 Message Date
Dusty.P 946590a3a1 Merge pull request #59 from dustinpianalto/pls-merge-me
Pls merge me
2018-06-21 10:49:08 -08:00
Dusty.P 222760f6a0 Merge branch 'development' into pls-merge-me 2018-06-21 10:48:39 -08:00
Dusty.P db0391d8af Merge pull request #51 from neko404notfound/patch-1
Fixed a stupid typo.
2018-06-20 09:40:18 -08:00
Dustin Pianalto 39838d3e79 removed numpy import 2018-06-20 09:39:22 -08:00
Dustin Pianalto 6c80b5832b pep8 2018-06-18 10:31:32 -08:00
Dustin Pianalto 3d508968d4 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	src/cogs/bot_management.py
2018-06-18 10:30:37 -08:00
Dustin Pianalto d906d375f7 pep8 2018-06-18 10:30:07 -08:00
Dustin Pianalto 97524ce9bd Remove on_message 2018-06-16 00:12:46 -08:00
Dustin Pianalto c43efe5801 Ignore self 2018-06-16 00:06:13 -08:00
Dustin Pianalto f73d0b89d2 Added emojis for Paginator 2018-06-15 01:42:43 -08:00
Dustin Pianalto 3657977f45 Added Paginator and Book 2018-06-15 01:40:53 -08:00
Dustin Pianalto 69db0a402a Fixed typo 2018-06-15 00:54:46 -08:00
Dustin Pianalto 65ba76e42a Changed RuntimeError to Warning 2018-06-15 00:52:17 -08:00
Dustin Pianalto db9e81ff67 Updated Error Handler 2018-06-15 00:43:58 -08:00
Dustin Pianalto 65d99cdd85 Updated Error Handler 2018-06-15 00:24:39 -08:00
Dustin Pianalto c054e1ea30 Fixed order of checks 2018-06-15 00:02:44 -08:00
Dustin Pianalto 1317b7eaf3 Added cooldowns to claim and unclaim 2018-06-14 10:50:41 -08:00
Dustin Pianalto 885c6f9309 Added command to list bots that are claimed by user 2018-06-14 10:50:27 -08:00
Dustin Pianalto 9dd3a349ca changed order of checks 2018-06-14 10:34:16 -08:00
Dustin Pianalto 79486a0af7 Set claim limit to 10 2018-06-14 10:31:21 -08:00
Dustin Pianalto 449c3bfe18 Add restart command and processing 2018-06-14 10:25:26 -08:00
Dustin Pianalto 3a76598766 Add wrapper script for easy restarts. 2018-06-14 10:18:40 -08:00
Dustin Pianalto 169f4d4379 Added bot_management to auto load list 2018-06-14 10:16:30 -08:00
Dustin Pianalto 81c26742da Merge remote-tracking branch 'origin/development' into development 2018-06-14 10:16:04 -08:00
Dustin Pianalto 5980d6c0ed Added Bot claiming/unclaiming 2018-06-14 10:15:42 -08:00
Dustin Pianalto 78939e9482 Add Error Color 2018-06-14 09:41:43 -08:00
Dusty.P debe981c91 Merge pull request #47 from YashKandalkar/development
Fixed indentation in start command
2018-06-14 00:01:30 -08:00
Dusty.P 573dad92c4 Merge branch 'development' into development 2018-06-14 00:01:10 -08:00
Dusty.P 7cf1129624 Merge pull request #46 from AggPro/patch-2
fixed typo in readme
2018-06-13 23:54:49 -08:00
Dusty.P b8d4cf292f Merge pull request #45 from AggPro/patch-1
DMing help command
2018-06-13 23:54:01 -08:00
Dusty.P a30f2cc4ae Fix key error 2018-06-12 00:11:34 -08:00
Dusty.P 58bbd83f3f Merge remote-tracking branch 'origin/development' into development 2018-06-12 00:05:06 -08:00
Dusty.P f8b0771520 Create DB connection 2018-06-12 00:04:51 -08:00
Dustin Pianalto 049130e77d fixed extension name 2018-06-11 13:50:46 -08:00
Dustin Pianalto 22c6dd2a7d renamed BasicCommands to basic_commands 2018-06-07 09:23:39 -08:00
Dustin Pianalto b2f2888b81 Merge remote-tracking branch 'origin/development' into development 2018-06-07 09:20:20 -08:00
Dustin Pianalto 0ae9b50a76 Changed load message 2018-06-07 09:20:04 -08:00
Dusty.P bc2f573b15 Merge pull request #43 from YashKandalkar/development
Changed channel names to channel IDs in start command
2018-06-07 09:13:08 -08:00
Dusty.P a4fa30f001 Merge pull request #38 from davfsa/patch-1
Fixed __main__.py
2018-05-30 09:35:13 -08:00
Dusty.P 9b873616d2 Merge pull request #29 from cheeze2000/development
fixed more stuff
2018-05-26 19:04:22 -08:00
Dusty.P fe7fa60a21 Merge pull request #24 from cheeze2000/development
changed encoding of cogs to utf-8
2018-05-24 22:08:14 -08:00
Dusty.P 4a70fefab5 Merge pull request #23 from cheeze2000/development
added moderation and fixed sar
2018-05-24 22:05:20 -08:00
Dusty.P d16087139f fixed .gitignore 2018-05-24 21:31:44 -08:00
Dusty.P 4048748080 deleted ignored files from repo so they are no longer tracked 2018-05-24 21:28:08 -08:00
Dusty.P d57129b33b Fixed gitignore 2018-05-24 21:20:57 -08:00
Dusty.P 90f33f892d Merge pull request #21 from cheeze2000/development
moved some files and fixed package.json
2018-05-24 00:06:45 -08:00
Dustin Pianalto b8c9e6e286 fixed dm alert to ignore self 2018-05-23 16:15:12 -08:00
Dustin Pianalto b474899392 fixed dm alert to ignore self take 4? Or is it 5? 2018-05-23 16:13:03 -08:00
Dustin Pianalto 25534a9075 fixed dm alert to ignore self 2018-05-23 16:11:40 -08:00
Dustin Pianalto 8ddc06eb6c fixed dm alert to ignore self 2018-05-23 16:08:54 -08:00
Dustin Pianalto af11f0f2af fixed dm alert to ignore self 2018-05-23 16:06:51 -08:00
Dustin Pianalto 7b219d5c3f update gitignore 2018-05-23 16:03:45 -08:00
Dustin Pianalto 8e419790ae Updated ownerlist 2018-05-23 15:59:05 -08:00
Dustin Pianalto 25384be8e2 Merge remote-tracking branch 'origin/development' into development 2018-05-23 15:57:41 -08:00
Dustin Pianalto a67a08e858 added alert for dm use 2018-05-23 15:57:22 -08:00
Dustin Pianalto a3c7f25109 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	src/cogs/git.py
2018-05-23 14:13:59 -08:00
Dustin Pianalto ae6eee1a8d Added myself as contributor 2018-05-23 14:10:53 -08:00
Dusty.P bb933b4f7b Changed Display name 2018-05-23 12:16:42 -08:00
Dusty.P 21d60a8f3e Changed development prefix 2018-05-23 12:14:33 -08:00
Dustin Pianalto b4040956f1 Moved avatar.png 2018-05-22 13:58:45 -08:00
Dusty.P ad0044f601 Merge pull request #13 from Annihilator708/add-license-1
Create LICENSE
2018-05-22 13:52:39 -08:00
Dusty.P 582beb2a42 Update git.py 2018-05-22 00:06:21 -08:00
Dusty.P 996096ad2d Create LICENSE 2018-05-20 17:27:43 -08:00
Dustin Pianalto 9b2c279b2e Added embed color 2018-05-20 12:12:46 -08:00
Dustin Pianalto e37e0e3a72 Modified git to use correct utils 2018-05-20 12:03:30 -08:00
Dustin Pianalto 319943e1c4 Uploaded utils 2018-05-20 12:02:46 -08:00
Dustin Pianalto a7cf9bd7f0 Added git to auto loader 2018-05-20 11:51:25 -08:00
Dustin Pianalto f40dc937d4 Uploaded git cog 2018-05-20 11:48:05 -08:00