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
bobloy
7161e8e28c
Merge branch 'master' into conquest_develop
2020-08-12 09:44:17 -04:00
bobloy
6e9d31df03
ccrole isn't incomplete
2020-08-12 09:44:01 -04:00
bobloy
03b42b04ef
Merge branch 'master' into conquest_develop
2020-08-12 09:42:34 -04:00
bobloy
f944879896
Why tf were so many hidden?
2020-08-12 09:41:41 -04:00
bobloy
42aab1e801
More map maker WIP
2020-08-12 09:38:35 -04:00
bobloy
dc8d314713
Start of map maker, ambiguous file format (probably just jpg and png)
2020-08-11 17:23:42 -04:00
bobloy
11a5a7505b
Fix invalid json
2020-08-10 17:48:28 -04:00
bobloy
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
2020-08-10 17:03:25 -04:00
bobloy
942b49e6fc
Black formatting
2020-08-06 21:06:03 -04:00
bobloy
5dcbf562d3
No good reason for this to be lower
2020-08-06 16:16:31 -04:00
bobloy
4f6232fb7d
Fix this send_help mistake
2020-08-06 13:39:51 -04:00
bobloy
50e0eacf24
Merge branch 'master' into 3.4_compatibility
2020-08-06 13:32:01 -04:00
bobloy
ae915b4fff
Ignore both venvs
2020-08-06 13:27:55 -04:00
bobloy
7e1f59462c
Ignore both venvs
2020-08-06 13:27:16 -04:00
bobloy
c7ea0e4d5e
Updated to delete data correctly
2020-08-06 13:24:08 -04:00
bobloy
035b395eb5
Add end_user_data_statementto info.json
2020-08-06 13:23:53 -04:00
bobloy
36dc74cfb1
Add red_delete_data_for_user
2020-08-06 11:34:05 -04:00
bobloy
ea71aafb52
Updated dad to handle dark theme by sending the message ourselves
2020-08-03 17:17:11 -04:00
