Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java		2016-02-22 19:02:54 +00:00
..
commands	Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'	2016-01-17 22:46:56 -05:00
mail	Use DBPool for everything	2016-02-19 00:17:38 -06:00
modules	Valentines final changes, Change Gift Giver achievement	2016-02-15 20:43:46 -06:00
notification	More refactors	2015-02-27 22:53:55 -05:00
profile	Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage	2015-12-13 16:40:46 +13:00
queue	Use DBPool for everything	2016-02-19 00:17:38 -06:00
server	Fix Valentines quick server menu button	2016-02-16 16:54:05 -06:00
tutorial	carl spinner in arcade/	2015-08-12 08:36:21 +02:00
Hub.java	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-02-22 19:02:54 +00:00
HubClient.java	fixed old staff being stuck invis.	2015-12-08 10:31:11 +11:00
HubManager.java	Fix constructor error, add ValentinesGiftManager to Arcade	2016-02-12 05:06:13 -06:00
HubRepository.java	Use DBPool for everything	2016-02-19 00:17:38 -06:00
HubType.java	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00