558 Commits

Author SHA1 Message Date
bobloy
664aa63833 much to do 2020-08-27 17:13:00 -04:00
bobloy
500915b947 Game data is different 2020-08-22 13:26:17 -04:00
bobloy
36d6e5c9bf Merge branch 'master' into conquest_develop 2020-08-22 13:26:01 -04:00
bobloy
ec6fa7331b
Merge pull request #124 from bobloy/launchlib_initial
Inital "launch" of launchlib
2020-08-21 14:22:35 -04:00
bobloy
5af7adfe57 Inital "launch" of launchlib and better alphabetization 2020-08-21 14:21:13 -04:00
bobloy
59c22dcc3a Inital "launch" of launchlib 2020-08-21 14:18:39 -04:00
bobloy
9ddb1696ac Handle user leaving during processing 2020-08-21 10:32:13 -04:00
bobloy
c62cde4159
Merge pull request #123 from bobloy/timerole_hours
Add support for hours
2020-08-21 10:26:25 -04:00
bobloy
317a9cb3a9 Add support for hours 2020-08-21 10:25:05 -04:00
bobloy
67e7c3bae8 Small refactoring 2020-08-21 09:54:11 -04:00
bobloy
dcf1c85ebc
Merge pull request #122 from bobloy/chatter-in-dm
Add dm chatting
2020-08-21 08:56:25 -04:00
bobloy
ba03fb5127 Add dm chatting 2020-08-21 08:54:23 -04:00
bobloy
7574117d9a WIP ConquestGame and per guild saving 2020-08-19 15:57:02 -04:00
bobloy
f0d33f0354 Better mask combination 2020-08-18 21:21:48 -04:00
bobloy
e2e5477661 Better number positioning, better mask combining and generation 2020-08-18 17:02:58 -04:00
bobloy
8abeca3d1e Merge branch 'master' into conquest_develop 2020-08-18 11:07:56 -04:00
bobloy
b7ad892b7f await eligibility 2020-08-18 10:54:42 -04:00
bobloy
438a1be410 Use message_eligible_as_command and no more user_allowed 2020-08-18 10:43:42 -04:00
bobloy
22ed50dd98
Merge pull request #121 from bobloy/3.4_compatibility_v2
More 3.4 compatibility, mentions and listeners
2020-08-18 10:32:49 -04:00
bobloy
340f1dbff4 Grammar 2020-08-18 10:32:34 -04:00
bobloy
f8fcb4c736 Max bot version unnecessary 2020-08-18 10:31:47 -04:00
bobloy
c953bad13e Min bot version bumps 2020-08-18 10:31:28 -04:00
bobloy
29f44e887f Forgot parenthesis 2020-08-18 10:26:13 -04:00
bobloy
d43a1ec80c Black formatting 2020-08-18 10:24:13 -04:00
bobloy
151eca1c76 More 3.4 compatibility, mentions and listeners 2020-08-18 10:01:10 -04:00
bobloy
aadd9a61a8 Merge branch 'master' into conquest_develop
# Conflicts:
#	conquest/info.json
2020-08-18 08:20:22 -04:00
bobloy
3d4a6578fd
Merge pull request #111 from bobloy/maybe_send_embeds
Use maybe_send_embed instead
Now's a good a time as any
2020-08-18 08:17:54 -04:00
bobloy
6a76d43c3d Merge branch 'master' into maybe_send_embeds 2020-08-18 08:17:21 -04:00
bobloy
7507141ec4
Merge pull request #112 from bobloy/3.4_compatibility
3.4 compatibility
2020-08-18 08:12:46 -04:00
bobloy
62b6209ae9 Merge branch 'master' into 3.4_compatibility 2020-08-18 08:11:45 -04:00
bobloy
c3c40c594e More region classification 2020-08-17 16:41:56 -04:00
bobloy
b46a5920f7 Merge branch 'master' into conquest_develop 2020-08-17 11:15:04 -04:00
bobloy
e570058014
Merge pull request #120 from bobloy/stealemoji_develop
Clear stolen emojis, and print stolen emojis
2020-08-17 09:37:05 -04:00
bobloy
5c0b0b6bff Clear stolen emojis, and print stolen emojis 2020-08-17 09:36:23 -04:00
bobloy
52fc284f5a WIP Classification 2020-08-17 08:17:49 -04:00
bobloy
ef925b1621 Map maker is almost working 2020-08-13 17:33:09 -04:00
bobloy
719e8903fd Merge branch 'master' into conquest_develop 2020-08-13 13:05:15 -04:00
bobloy
58ad3fc978 It's actually a maximum 2020-08-13 12:18:31 -04:00
bobloy
79b755556e Merge branch 'master' into 3.4_compatibility
# Conflicts:
#	ccrole/info.json
#	chatter/chat.py
#	reactrestrict/info.json
2020-08-13 12:13:03 -04:00
bobloy
53649137a2
Merge pull request #119 from bobloy/chatter_develop
Chatter Threshold: It's actually a maximum
2020-08-13 12:08:55 -04:00
bobloy
c302be7fb5
Merge pull request #117 from bobloy/bobloy-patch-1
Update README.md
2020-08-13 12:07:16 -04:00
bobloy
5c80beea44
Merge pull request #118 from bobloy/chatter_develop
Chatter Updates
2020-08-13 12:06:57 -04:00
bobloy
f9ae2d6f7e It's actually a maximum 2020-08-13 12:06:27 -04:00
bobloy
4fcc12a2d8 Allow specifying algorithm and model 2020-08-13 12:02:54 -04:00
bobloy
f55bc4d583
Update README.md
Add notes about `trainubuntu`
2020-08-13 09:57:50 -04:00
bobloy
07b90c30a0 Don't use os, more mapmaker 2020-08-13 09:48:16 -04:00
bobloy
a1b89c9f9d More map maper and notes on regioner 2020-08-12 17:37:38 -04:00
bobloy
f93986e65f Reorder methods 2020-08-12 15:28:36 -04:00
bobloy
cb03c17459
Merge pull request #116 from bobloy/nudity-develop
Nudity Detection Cog
2020-08-12 15:04:13 -04:00
bobloy
a787835915 Add Nudity to README.md 2020-08-12 15:00:03 -04:00