7 Commits

Author	SHA1	Message	Date
GJ	2b7f21fee4	Fixed nossr50's crappy merge. :D	2012-04-04 11:17:56 -04:00
nossr50	6ad32e487f	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO ... Conflicts: src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java	2012-04-04 08:07:47 -07:00
nossr50	97fd3eaf64	Fixed mmoupdate not being useable from console	2012-04-04 08:05:41 -07:00
GJ	d9b4647cf5	Command updates	2012-04-04 11:04:09 -04:00
GJ	65e3384a96	Prep for mcLocale update.	2012-03-26 16:17:35 -04:00
nossr50	189ae6fcdb	Moved convertToMySQL() into MmoupdateCommand class	2012-03-22 15:32:31 -07:00
TheYeti	376048d5aa	Getting project ready for Maven	2012-01-09 11:00:13 -08:00