545 Commits

Author SHA1 Message Date
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
bobloy
361265b983 Functioning nudity detection 2020-08-12 14:57:36 -04:00
bobloy
8b7ebc57c3 Merge branch 'master' into nudity-develop 2020-08-12 13:17:05 -04:00
bobloy
11258d3e76 mapmapker back to conquest.py 2020-08-12 13:16:47 -04:00
bobloy
0b4e0310f9 Merge branch 'master' into conquest_develop 2020-08-12 11:18:39 -04:00
bobloy
e5947953aa Merge branch 'master' into chatter_develop 2020-08-12 11:18:21 -04:00
bobloy
c02244ceb5
More Conquest Updates (#115)
* Start of map maker, ambiguous file format (probably just jpg and png)

* More map maker WIP

* This isn't dad

* Split mapmaker

* Don't load current map if it doesn't exist

* WIP mapmaker
2020-08-12 11:00:41 -04:00
bobloy
5fff65c7d5 WIP mapmaker 2020-08-12 10:59:52 -04:00
bobloy
8012a20ddb Don't load current map if it doesn't exist 2020-08-12 10:58:51 -04:00
bobloy
e8eb3f76e4 confirmation 2020-08-12 10:57:47 -04:00
zephyrkul
29bb51c6cd
Update info.json (#114) 2020-08-12 10:50:28 -04:00
bobloy
a98eb75c0f Logger and Ubuntu trainer 2020-08-12 10:40:03 -04:00
bobloy
3b156d8275 Split mapmaker 2020-08-12 10:03:07 -04:00
bobloy
ae200eb911 This isn't dad 2020-08-12 09:46:07 -04:00