Commit Graph

3722 Commits

Author SHA1 Message Date
samvaio
7ce07b5542 Additions and Kwoth's Magic from Magical Girl Mirai 2016-10-24 12:32:30 +05:30
samvaio
e3aef58b1f Add Kwoth's Magic 2016-10-24 12:27:44 +05:30
Kwoth
d34a429c1c Remind fixed 2016-10-24 07:58:18 +02:00
Kwoth
273f5a29a2 Merge branch '1.0' of https://github.com/Kwoth/NadekoBot into 1.0 2016-10-24 07:57:36 +02:00
Kwoth
51496fa517 Fixed chinese in ~trans 2016-10-24 07:57:26 +02:00
Master Kwoth
9dfc21f8b3 Merge pull request #718 from samdivaio/patch-1
Added Kwoth's Magic 
2016-10-24 06:37:44 +02:00
Master Kwoth
c7b5294ae7 Merge pull request #719 from samdivaio/patch-2
Added Additional Information and Magic 
2016-10-24 06:37:26 +02:00
samvaio
3c0829e40a Additions and Kwoth's Magic from Magical Girl Mirai
Okay sorry for spamming pull requestm this will be the last one, off to bed
Sam
2016-10-24 05:48:49 +05:30
samvaio
cac89bf54e Added few changes 2016-10-24 05:41:04 +05:30
samvaio
1e6ef2a7b4 Update Linux Guide.md 2016-10-24 05:39:27 +05:30
samvaio
e05aca0e83 More Magic 2016-10-24 05:32:11 +05:30
samvaio
2ad34ccd0d Add Kwoth's Magic 2016-10-24 05:09:26 +05:30
Master Kwoth
d7edb3de9d Merge pull request #716 from samdivaio/1.0
Little improvement, thanks to @fearnlj01#3535
2016-10-23 20:49:36 +02:00
samvaio
5c1525c956 Little more changes 2016-10-23 23:18:30 +05:30
samvaio
3ffa801bbd More changes 2016-10-23 22:16:48 +05:30
samvaio
bf4d4c7008 Little improvement, thanks to @fearnlj01#3535 2016-10-23 21:50:17 +05:30
samvaio
38d0690846 Little improvement, thanks to @fearnlj01#3535 2016-10-23 21:48:53 +05:30
Kwoth
bb7ef8c53b Merge branch '1.0' of https://github.com/Kwoth/NadekoBot into 1.0 2016-10-23 09:12:14 +02:00
Kwoth
120be816a9 v+t fixed 2016-10-23 09:12:06 +02:00
Master Kwoth
674be6c3d5 Merge pull request #713 from Nitix/lib-exec
make .so files executable
2016-10-23 08:29:24 +02:00
Nitix
a4e4e50419 make lib executable 2016-10-22 22:18:44 +02:00
Kwoth
54f37219b8 Added libopus.so and libsodium.so files for linux music 2016-10-22 21:51:39 +02:00
Kwoth
c88fb170ae Builds should work everywhere now 2016-10-22 21:30:53 +02:00
Kwoth
f1fd1d1159 updated d.net 2016-10-22 20:39:26 +02:00
Kwoth
e86c16424f CI should build now 2016-10-22 20:37:08 +02:00
Kwoth
a2b6839027 cleanup, done fixing 2016-10-22 20:20:32 +02:00
Kwoth
91599e0a57 Nuget config in discord.net back 2016-10-22 19:23:11 +02:00
Kwoth
c5d641c5da Build WILL work now 2016-10-22 19:02:58 +02:00
Kwoth
25b221dea5 updated nuget conf 2016-10-22 18:55:22 +02:00
Kwoth
be23b063bc Build fixed? 2016-10-22 18:03:33 +02:00
Kwoth
7b0d96b575 Maybe nugetconf in discord.net broke builds? 2016-10-22 17:58:08 +02:00
Kwoth
ed5f93dd63 reverted copy delete, credentials, kek 2016-10-22 17:43:42 +02:00
Kwoth
569c6b29f2 What if i remove the copy 2016-10-22 17:41:13 +02:00
Kwoth
8ce584d576 credentials.json added 2016-10-22 17:36:55 +02:00
Kwoth
489b584f10 If mappings were breaking the build, ill kms 2016-10-22 17:33:12 +02:00
Kwoth
df630c43ef Please just fix yourself 2016-10-22 17:24:40 +02:00
Kwoth
4db44afa0c no? maybe now? 2016-10-22 17:02:15 +02:00
Kwoth
767fc1d35c fixed CI? fixed everything? 🎉??? 2016-10-22 16:55:38 +02:00
Kwoth
e9b1ea754b merge 2016-10-22 13:11:14 +02:00
Kwoth
5063efd7e7 ~xkcd 2016-10-22 13:08:52 +02:00
Master Kwoth
bc85bebfc7 Merge pull request #712 from fearnlj01/1.0-fearnlj01
docs migrate guide simplified
2016-10-22 12:28:12 +02:00
Jordan Fearnley
04f772a70e Even slighter slighter simplification 2016-10-22 11:02:08 +01:00
Jordan Fearnley
4b7244dda2 Even slighter simplification 2016-10-22 10:59:23 +01:00
Jordan Fearnley
8b71252da7 Slight simplification of the Upgrading Guide, I can't bring myself to provide less detail ¯\_(ツ)_/¯ 2016-10-22 10:57:31 +01:00
Master Kwoth
c10cdb6cb5 Merge pull request #711 from fearnlj01/1.0-fearnlj01
Guide Update
2016-10-22 11:39:57 +02:00
Jordan Fearnley
db6367da63 Small detail added 2016-10-22 09:32:52 +01:00
Jordan Fearnley
9eded736f8 I swear I've commited this three times already
It would've been quicker to just end it all at this rate
2016-10-22 09:27:55 +01:00
Jordan Fearnley
e48faf8e04 Why would you do this to me vim
Why would you insert a newline at the end of the file 👀
2016-10-22 09:26:37 +01:00
Jordan Fearnley
5918105de2 Not Updating CommandStrings.resx
fuck you vim, forcing a new line at the end of file the one time I actually try to fix a conflict making my PR potentially look messy *grumble*
2016-10-22 09:23:42 +01:00
Jordan Fearnley
7c78ee1b4e I don't know if I fixed the merge conflict or not 👀 2016-10-22 09:17:36 +01:00