Commit Graph

35 Commits

Author SHA1 Message Date
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
Savvy
25cd9f2b4c Added/Changed many things, need to switch from thunderbolt to irg.json, need sql cleanup 2017-07-11 17:27:18 -04:00
Malcom Green
e5c86f1a7f Added Music, Permissions, MuteCommand, Configuration Command and more! 2017-06-09 18:09:40 -04:00
Malcom Green
6bbc3f80a3 Added SQL support, switched to JSON for configuration and language files (wip). 2017-06-04 19:00:58 -04:00
Malcom Green
752db67c6b Added database, polls wrapper, & more. 2017-05-29 18:31:22 -04:00
Malcom Green
3e41476f37 Added new commands, event listeners. 2017-05-24 09:16:39 -04:00
Malcom Green
59057e16ef Edited gitignore 2017-05-23 13:24:22 -04:00
Malcom Green
e0a5379ecf Initial Commit 2017-05-23 13:19:15 -04:00