TadahTech 22e22ff508 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/party/Party.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java		2016-06-12 00:42:22 -05: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	Merge remote-tracking branch 'remotes/origin/master' into feature/gems	2016-06-09 00:29:27 -05: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	Files changed that need to be edited later on with the new Party System.	2016-06-04 22:56:30 -05:00
server	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-12 00:42:22 -05:00
tutorial	Add support for 1.9 resource packs, Text Tutorials	2016-03-11 11:50:08 -06:00
Hub.java	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-12 00:42:22 -05:00
HubClient.java	fixed old staff being stuck invis.	2015-12-08 10:31:11 +11:00
HubManager.java	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-12 00:42:22 -05: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