79b755556e
Merge branch 'master' into 3.4_compatibility
...
# Conflicts:
# ccrole/info.json
# chatter/chat.py
# reactrestrict/info.json
5 years ago
53649137a2
Merge pull request #119 from bobloy/chatter_develop
...
Chatter Threshold: It's actually a maximum
5 years ago
c302be7fb5
Merge pull request #117 from bobloy/bobloy-patch-1
...
Update README.md
5 years ago
5c80beea44
Merge pull request #118 from bobloy/chatter_develop
...
Chatter Updates
5 years ago
f9ae2d6f7e
It's actually a maximum
5 years ago
4fcc12a2d8
Allow specifying algorithm and model
5 years ago
f55bc4d583
Update README.md
...
Add notes about `trainubuntu`
5 years ago
07b90c30a0
Don't use os, more mapmaker
5 years ago
a1b89c9f9d
More map maper and notes on regioner
5 years ago
f93986e65f
Reorder methods
5 years ago
cb03c17459
Merge pull request #116 from bobloy/nudity-develop
...
Nudity Detection Cog
5 years ago
a787835915
Add Nudity to README.md
5 years ago
361265b983
Functioning nudity detection
5 years ago
8b7ebc57c3
Merge branch 'master' into nudity-develop
5 years ago
11258d3e76
mapmapker back to conquest.py
5 years ago
0b4e0310f9
Merge branch 'master' into conquest_develop
5 years ago
e5947953aa
Merge branch 'master' into chatter_develop
5 years ago
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
5 years ago
5fff65c7d5
WIP mapmaker
5 years ago
8012a20ddb
Don't load current map if it doesn't exist
5 years ago
e8eb3f76e4
confirmation
5 years ago
29bb51c6cd
Update info.json ( #114 )
5 years ago
a98eb75c0f
Logger and Ubuntu trainer
5 years ago
3b156d8275
Split mapmaker
5 years ago
ae200eb911
This isn't dad
5 years ago
7161e8e28c
Merge branch 'master' into conquest_develop
5 years ago
6e9d31df03
ccrole isn't incomplete
5 years ago
03b42b04ef
Merge branch 'master' into conquest_develop
5 years ago
f944879896
Why tf were so many hidden?
5 years ago
42aab1e801
More map maker WIP
5 years ago
dc8d314713
Start of map maker, ambiguous file format (probably just jpg and png)
5 years ago
11a5a7505b
Fix invalid json
5 years ago
b9dbad8bd1
Conquest initial ( #113 )
...
* Initial files
* Functioning image coloring
* Add more commands, untested
* Add map list, move set to under conquest, and WIP saving map
* ALl masks, mostly working commands
* Unneeded original.jpg
* Rename to simple, WIP numbered
* Use numbers as mask, probably need to switch to png soon
* Save to config, test zoom levels
* Handle zoom properly, save it to json for each map as well
* Move maps to WIP folder
* WIP folder not in data folder
* Info and READMe updates
5 years ago
942b49e6fc
Black formatting
5 years ago
5dcbf562d3
No good reason for this to be lower
5 years ago
4f6232fb7d
Fix this send_help mistake
5 years ago
50e0eacf24
Merge branch 'master' into 3.4_compatibility
5 years ago
ae915b4fff
Ignore both venvs
5 years ago
7e1f59462c
Ignore both venvs
5 years ago
c7ea0e4d5e
Updated to delete data correctly
5 years ago
035b395eb5
Add `end_user_data_statement`to info.json
5 years ago
36dc74cfb1
Add `red_delete_data_for_user`
5 years ago
ea71aafb52
Updated dad to handle dark theme by sending the message ourselves
5 years ago
a08b72c83d
Merge branch 'master' into maybe_send_embeds
5 years ago
bda61e3ada
Handle permission errors
5 years ago
810670f5c0
Use maybe_send_embed instead
5 years ago
61866b2c22
Add TODO
5 years ago
3e4ddb24f0
Add calls to super().__init__ ( #110 )
5 years ago
71791a2f5a
Remove incorrect 3.4+ compatibility layer ( #103 )
5 years ago
31fec3add1
Better console progress. Delete data command ( #109 )
...
* Better console progress. Delete data command
* Reformat
5 years ago
bobloy