Commit Graph

57 Commits

Author SHA1 Message Date
Savvy
997cd4ccad Merge remote-tracking branch 'refs/remotes/origin/master' 2017-10-14 17:10:07 -04:00
Savvy
8862785fd5 Recent Update (not descriptive) 2017-10-14 17:07:56 -04:00
Travis
4e2993cf54 Set theme jekyll-theme-cayman 2017-10-03 14:48:46 -04:00
Savvy
c68102bbc7 Merge branch 'master' of https://github.com/Savvy/Rixa 2017-10-03 09:35:57 -04:00
Savvy
089c1a2fb8 Commands no longer require mentioning of roles 2017-10-03 09:34:19 -04:00
Savvy
6f1ddc19a9 Commands no longer require mentioning of roles 2017-10-03 09:33:20 -04:00
Savvy
a21ca45a7c Commands no longer require mentioning of users 2017-10-03 09:12:10 -04:00
Savvy
def00258d4 Added Modules Command, Features command and made config sub commands more consistent (Issue #6) 2017-10-03 08:57:35 -04:00
Savvy
c6b613eae6 Fixed bug with permissions 2017-10-02 22:37:06 -04:00
Malcom Green
a32d1bcd8d Set theme jekyll-theme-slate 2017-10-02 18:47:01 -04:00
Savvy
d4f6a52d44 Added Color Command, added JDA Version to Info Command, added shutdown message to shutdown command, fixed permissions bug (again) 2017-10-02 17:21:48 -04:00
Savvy
001ddf5d30 Fixed more bugs, allowed for conversations with rixa to be toggled 2017-09-30 23:43:48 -04:00
Savvy
bf746fd5ae Switched to SQLBuilder, Fixed outstanding bugs 2017-09-30 17:45:02 -04:00
Savvy
c2b013b4f5 Bug fix update (fail) 2017-09-29 23:58:44 -04:00
Dalton
4ff2163b49 Fixes everything I broke 💯 2017-09-29 21:39:40 -04:00
Dalton
6b98e23a0f Fixes to my last commit 2017-09-29 21:18:14 -04:00
Savvy
f7debb212d Fixed bug, Optional bug remains 2017-09-28 21:18:32 -04:00
Savvy
7675fe3ec3 Added which should reply with server prefix 2017-09-28 20:50:24 -04:00
Savvy
46d1c70da6 Allowed multiple users to be added/removed to/from multiple roles, fixed outstanding bugs/errors, moved pandorabots api to module, made pandorabots api per server rather than global, added shutdown command which saves all data and safely ends JDA process 2017-09-28 20:45:38 -04:00
Dalton
634d96b426 More object oriented programming 2017-09-28 19:27:07 -04:00
Savvy
82a714791d Error fixes, Bug fixes 2017-09-26 18:01:41 -04:00
Savvy
e9514daf6f Added shutdown method (must create command), Added MySQL table creation statements 2017-09-26 17:10:17 -04:00
Malcom Green
7bdb704523 Merge pull request #2 from odinfather/master
Change Database Connections
2017-09-26 16:28:41 -04:00
Dalton
59ed204588 Add comment to set java path 2017-09-23 03:51:43 -04:00
Dalton
bd968d9bcb Basic rewrite of MySQL statements
- Migrated MySQL to use https://github.com/odinfather/Database Instead of custom
- Closed all SQL statements (Hopefully, will have to double-check)
2017-09-23 03:48:04 -04:00
Odin
be2b7967a9 Merge pull request #1 from Savvy/master
Merge pull request #1 from odinfather/master
2017-09-22 18:46:47 -04:00
Malcom Green
31f78ab476 Merge pull request #1 from odinfather/master
Clean up files
2017-09-22 18:16:03 -04:00
Odin
c244035d1d Initial README.md 2017-09-22 18:09:11 -04:00
Dalton
69a72f6434 Removed .gradle/ and settings.gradle 2017-09-22 17:39:15 -04:00
Dalton
d9553669b7 Cleaned up files 2017-09-22 17:33:38 -04:00
Savvy
5bf98018b3 Merge branch 'master' of https://github.com/Savvy/Rixa 2017-09-06 16:28:45 -07:00
Savvy
9b8b2f9a92 Added RaidMode 2017-09-06 16:02:07 -07:00
Savvy
37b012ffe1 Fixed tiny bug with permissions 2017-08-15 23:56:17 -04:00
Venal
65eb5ddcff Merge remote-tracking branch 'origin/master' 2017-08-15 00:01:48 -04:00
Savvy
4766581177 Added rank/leaderboard command (needs fixing). 2017-08-15 00:01:24 -04:00
Venal
b2332f3f68 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
2017-08-15 00:01:24 -04:00
Venal
6550510bfe Fixed duplicate restart message 2017-08-15 00:00:46 -04:00
Savvy
1af78d65bf Fixed outstanding errors. 2017-08-11 03:48:50 -04:00
Savvy
1df2460bfa Added levels, fixed a few bugs 2017-08-11 03:00:11 -04:00
Venal
72304bb14c Typo on operator (woops) 2017-07-28 13:06:46 -04:00
Venal
1ebe1bc2e2 Argument support for joining channels (untested) resultseta and preparedstatements closing 2017-07-28 13:03:29 -04:00
Savvy
f718d28239 Fixed Music Command List Argument 2017-07-28 00:59:33 -04:00
Savvy
a0b448627a Levels, Added External Invite Link Blocking 2017-07-23 21:34:57 -04:00
Savvy
d3f37ae2ac Added addRoles/removeRoles command, added UserData structure. 2017-07-14 19:52:32 -04:00
Savvy
151b367c88 Migrated from thunderbolt to org.json 2017-07-14 14:22:29 -04:00
Savvy
f8adff77c7 Added music leave command, fixed lombok problems, moved RixaManager -> RixaGuild. 2017-07-14 05:53:47 -04:00
Venal
3ab2627d54 More lombok 2017-07-11 23:31:40 -04:00
Venal
d86e8f2cdd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
#	src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java
2017-07-11 23:27:32 -04:00
Venal
28055867e1 Implemented Lombok 2017-07-11 23:04:56 -04:00
Savvy
860251c46f Implement search for youtube / music 2017-07-11 21:56:47 -04:00