Commit Graph
282 Commits
Author SHA1 Message Date
Dusty.P 946590a3a1 Merge pull request #59 from dustinpianalto/pls-merge-me
Pls merge me
2018-06-21 10:49:08 -08:00
Dusty.P 222760f6a0 Merge branch 'development' into pls-merge-me 2018-06-21 10:48:39 -08:00
nya~ 6f7e3b4bbc Fixed another thingy regarding borked paths. 2018-06-21 19:35:02 +01:00
nya~ ba27d7c390 Removed a ) 2018-06-21 19:27:32 +01:00
nya~ 0a9ab007e5 Fixed borked path for tags. 2018-06-21 19:26:58 +01:00
nya~ 66d994023e Removed junk from merge conflict issue. 2018-06-21 19:26:18 +01:00
nya~ 08f1903871 Unborked a thing. 2018-06-21 19:25:12 +01:00
nya~ 63d852f37b Fixed syntax error. 2018-06-21 19:22:04 +01:00
davfsa 776b8d009c Update bot_management.py 2018-06-21 20:19:16 +02:00
nya~ b189f2ca5e Oops 2018-06-21 19:17:29 +01:00
nya~ 1ddf767074 Logs and reports broken cogs on restart. 2018-06-21 19:17:05 +01:00
nya~ f4b0f03a23 Fixed path issue. 2018-06-21 19:10:34 +01:00
nya~ 671e08ca5a Update. (#2)
* Update sebi_machine_launcher.sh

* Update sebi_machine_launcher.sh

* Update requirements.txt

* removed numpy import

* Fixed a stupid typo.

* Fixed broken import someone didn't check.

* Updated bot_management.py

* Updated bot_management.py

* Update bot_management.py

* Update bot_management.py

* Update bot_management.py

* Added ban command

And changed the response because if you were talking without commas you would need to breathe heavily and and and and *huff*

* Update bot_management.py

* Aaa

wrong word lmao

* Update bot_management.py

* Update bot_management.py

* Update bot_management.py

* Update bot_management.py

* Update bot_management.py

* added new responses to agree

And added async2rw to the tutorials

* readded d.js-start

Because i am retarded and removed it

* Changed d.js-start back to d.js

Because im too dumb

* Update bot_management.py

* Update bot_management.py

* Fixed typos

* Update sebi_machine_launcher.sh

* Updated some files
2018-06-21 19:09:49 +01:00
davfsa fe143678fe Updated some files 2018-06-21 20:04:07 +02:00
davfsa 8f70fcc142 Update sebi_machine_launcher.sh 2018-06-21 19:56:08 +02:00
davfsa 6b8bda9223 Merge branch 'neko404notfound-development' into development 2018-06-21 19:50:13 +02:00
davfsa 0a4baee373 Merge branch 'development' of https://github.com/neko404notfound/Sebi-Machine into neko404notfound-development 2018-06-21 19:49:24 +02:00
nya~ e62845ade8 Git pulls after four consecutive crashes. 2018-06-21 18:35:17 +01:00
davfsa 1bd8873803 Fixed typos 2018-06-21 19:33:34 +02:00
davfsa 3fa91bbcce Update bot_management.py 2018-06-21 19:06:20 +02:00
davfsa 38b6ff65a4 Update bot_management.py 2018-06-21 18:58:49 +02:00
davfsa 057e1210b7 Merge pull request #58 from AggPro/patch-5
Changed d.js-start back to d.js
2018-06-21 16:03:11 +02:00
Agg 76b5d1df8f Changed d.js-start back to d.js
Because im too dumb
2018-06-21 15:42:44 +03:00
davfsa f2fd478dc8 Merge pull request #57 from AggPro/patch-4
readded d.js-start
2018-06-21 13:28:24 +02:00
Agg b7f90c990e readded d.js-start
Because i am retarded and removed it
2018-06-21 13:50:11 +03:00
davfsa edfebad791 Merge pull request #56 from AggPro/patch-3
added new responses to agree
2018-06-21 12:25:51 +02:00
Agg d5194bba3d added new responses to agree
And added async2rw to the tutorials
2018-06-21 12:32:31 +03:00
davfsa 2a9c202436 Update bot_management.py 2018-06-21 09:07:41 +00:00
neko404notfound 4f5a1b518a Renamed src package to sebimachine.
- Gave the package a descriptive name.
- Passed over with black once more.
- Created setup.py to install dependencies.
- Updated author to reflect repo ownership to Dusty.
- Changed `git` command to use the __url__ attribute.
- Changed music to use ogg vorbis instead of mp3, purely for
    performance.
- Tried to make sure nothing broke.
- Updated dockerfile. Pretty sure we don't need it though...
2018-06-21 10:06:03 +01:00
davfsa 7f14b015ce Update bot_management.py 2018-06-21 08:41:29 +00:00
davfsa 2eb5ac124c Update bot_management.py 2018-06-21 08:40:23 +00:00
davfsa 788da95c11 Update bot_management.py 2018-06-21 08:31:36 +00:00
neko404notfound 001d6aa0ac Removed execution permission. 2018-06-21 09:31:02 +01:00
neko404notfound 6b44995333 Readded dockerfile as heroku uses it apparently..? 2018-06-21 09:28:25 +01:00
neko404notfound 1a4af0c766 Updated .gitignore and removed docker stuff, since we are not using it. 2018-06-21 09:26:41 +01:00
neko404notfound 5a67f1c732 Fixed license in package.json 2018-06-21 09:25:29 +01:00
neko404notfound ff3b43c2e6 Removed package-lock, gitignored. 2018-06-21 09:24:41 +01:00
neko404notfound dd3fd2ea68 Added .gitattributes 2018-06-21 09:23:31 +01:00
neko404notfound 8d579f5bb3 Changed CRLF to LF, passed over code with black to normalise formatting. 2018-06-21 09:21:54 +01:00
nya~ f6c4a5a570 Update (#1)
* Update sebi_machine_launcher.sh

* Update sebi_machine_launcher.sh

* Update requirements.txt

* removed numpy import

* Fixed a stupid typo.

* Fixed broken import someone didn't check.

* Updated bot_management.py

* Updated bot_management.py

* Update bot_management.py

* Update bot_management.py

* Update bot_management.py

* Added ban command

And changed the response because if you were talking without commas you would need to breathe heavily and and and and *huff*

* Update bot_management.py

* Aaa

wrong word lmao

* Update bot_management.py
2018-06-21 09:20:10 +01:00
davfsa 40a182cc43 Update bot_management.py 2018-06-21 08:18:16 +00:00
davfsa 113737f2fd Merge pull request #54 from AggPro/patch-2
Aaa
2018-06-20 20:28:09 +02:00
Agg 9267acf8fb Aaa
wrong word lmao
2018-06-20 21:27:51 +03:00
davfsa 871a5f73be Update bot_management.py 2018-06-20 20:20:06 +02:00
davfsa 327a5e74d2 Merge pull request #53 from AggPro/patch-1
Added ban command
2018-06-20 20:19:09 +02:00
Agg 02c3f1e685 Added ban command
And changed the response because if you were talking without commas you would need to breathe heavily and and and and *huff*
2018-06-20 21:17:31 +03:00
davfsa 7321413c90 Update bot_management.py 2018-06-20 20:03:28 +02:00
davfsa c6efae9635 Update bot_management.py 2018-06-20 20:01:45 +02:00
davfsa 239261eeaf Update bot_management.py 2018-06-20 19:55:50 +02:00
davfsa 423edf1a3a Merge remote-tracking branch 'origin/development' into development 2018-06-20 19:49:43 +02:00