882 Commits

Author SHA1 Message Date
bobloy
2315bd9fc3 The rest converted??? 2021-08-19 17:29:41 -04:00
bobloy
e02c7ba14b beginning of set map 2021-08-09 10:02:08 -04:00
bobloy
836911ee89 Merge branch 'master' into conquest_develop 2021-07-23 17:08:40 -04:00
bobloy
1e87eacf83 Add edited timestamp 2021-07-23 16:13:07 -04:00
bobloy
3e25c8a13f Saving and loading 2021-07-23 16:02:26 -04:00
bobloy
d987018664 More zoom WIP 2021-07-23 09:27:32 -04:00
bobloy
25e90c350f More progress on switched to ConquestGame class 2021-07-22 17:25:13 -04:00
bobloy
2d0c9e31b3 WIP self.current_map 2021-07-16 11:32:47 -04:00
bobloy
80db00890d Merge branch 'master' into conquest_develop
# Conflicts:
#	conquest/conquest.py
#	conquest/mapmaker.py
2021-07-16 09:28:44 -04:00
bobloy
61fa006e33 QoL fixes 2021-07-16 09:26:06 -04:00
bobloy
4183607372 Add option for skipping bots 2021-07-15 16:05:39 -04:00
bobloy
2421c4e9bf Add sm and md to requirements 2021-07-15 15:09:41 -04:00
bobloy
b2e843e781 Invalid timestring instead of error 2021-07-15 14:57:33 -04:00
bobloy
1e535c2f3e
Merge pull request #193 from XargsUK/master
additional exit conditions to recyclingplant
2021-07-08 08:34:31 -04:00
bobloy
fd80819618 Merge branch 'master' into XargsUK_master 2021-07-08 08:33:53 -04:00
bobloy
a5ff888f4c black reformat 2021-07-08 08:33:29 -04:00
bobloy
3eb499bf0e black reformat 2021-07-08 08:30:21 -04:00
bobloy
698dafade4 Add chatter initialization 2021-07-08 08:29:18 -04:00
Brad Duncan
15ecf72c64 Update recyclingplant.py 2021-07-08 07:37:45 +01:00
Brad Duncan
1d514f80c6 adding no response exit condition
Previously, if no response was provided by the user, the function would continuously loop.

I've modified the timeout to 20 seconds. When there's no response, +! to timeoutcount variable. When there's been 3 timeouts, break.
2021-07-08 07:37:37 +01:00
bobloy
b752bfd153 Stop looking at DMs 2021-07-06 13:50:15 -04:00
bobloy
47269ba8f4 fix has_table, move age and minutes to trainset 2021-07-06 12:01:27 -04:00
bobloy
e0a361b952 remove en_core_web_sm as dependency 2021-07-06 10:52:25 -04:00
bobloy
2a18760a83
Merge pull request #191 from bobloy/chatter_fox
Use Bobloy's chatterbot for Chatter
2021-07-06 10:10:09 -04:00
bobloy
b26afdf2db Merge branch 'master' into chatter_fox
# Conflicts:
#	chatter/requirements.txt
2021-07-06 10:09:41 -04:00
bobloy
86cc1fa35a Don't specify pyaml 2021-07-05 14:14:40 -04:00
bobloy
6f0c88b1ac change default models, fix requirements 2021-07-01 17:19:29 -04:00
bobloy
c165313031 no reply errors in cache 2021-07-01 15:25:38 -04:00
bobloy
9c63c12656 Don't need requirements file 2021-06-30 17:29:31 -04:00
bobloy
a55ae8a511 Use Bobloy's chatterbot fork 2021-06-30 17:29:00 -04:00
bobloy
bc12aa866e Fix formatting 2021-05-25 10:13:36 -04:00
bobloy
dbafd6ffd7
Merge pull request #183 from aleclol/master
Fix error on `[p]lovecalculator` command
2021-05-24 10:40:19 -04:00
aleclol
52ca2f6a45
Update lovecalculator.py 2021-05-18 15:27:55 -04:00
bobloy
2937b6ac92 List of dicts 2021-05-03 13:58:35 -04:00
bobloy
dbf84c8b81
Merge pull request #180 from phenom4n4n/patch-1
[LoveCalculator] Patch AttributeError
2021-04-16 14:58:18 -04:00
PhenoM4n4n
2f21de6a97 lovecalc attributeerror 2021-04-15 17:39:49 -07:00
bobloy
ed6cc433c8 Remove pycountry 2021-04-15 11:38:36 -04:00
bobloy
e1a30359d8
Merge pull request #148 from BogdanWDK/master
Language Support Added
2021-04-15 11:15:13 -04:00
bobloy
506a79c6d6 Removing debugging print 2021-04-15 11:14:00 -04:00
bobloy
1ddcd98078 Implement languages 2021-04-15 11:12:47 -04:00
bobloy
7bd004c78e Merge branch 'master' into BogdanWDK_master 2021-04-15 10:50:45 -04:00
bobloy
184833421a
Merge pull request #178 from Kreusada/patch-1
[SCP] Remove double setup
2021-04-15 09:09:22 -04:00
Kreusada
f04ff6886b
[SCP] Remove double setup 2021-04-15 13:59:19 +01:00
bobloy
28edcc1fdd deliminate on space not newline 2021-04-14 09:44:28 -04:00
bobloy
10ed1f9b9f pagify lots of stolen emojis 2021-04-14 09:40:34 -04:00
bobloy
93b403b35f Better progress logging 2021-04-05 09:25:23 -04:00
bobloy
5f30bc1234 Add multiple channel training 2021-03-26 13:53:00 -04:00
bobloy
9f22dfb790 Swap learning to global config 2021-03-25 17:24:16 -04:00
bobloy
ea126db0c5
Merge pull request #175 from bobloy/chatter_develop
Chatter Upgrade
2021-03-25 11:13:45 -04:00
bobloy
e1297a4dca Return success value 2021-03-25 11:12:05 -04:00