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
..
src/nautilus/game/arcade	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
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00
pom.xml	Use Maven for Compilation	2016-01-20 11:20:58 +11:00