Sarah 4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java		2015-12-16 18:16:08 +01:00
..
.externalToolBuilders	Removed dead project ServerStatus	2014-05-28 11:18:30 -07:00
.settings	Removed dead project ServerStatus	2014-05-28 11:18:30 -07:00
src/mineplex/queuer	Add leftover Clans commit to introduce GearManager.	2015-05-05 15:34:32 -04:00
.classpath	Revert "Encapsulate remote process related code into new project ServerProcesses for better dependability. Likewise, add project Queue.Core for queue related API methods. Queuer incorporated into new matchmaking logic for matching and pairing players for ranked matches, as well as handling server management. Adapt Core and Arcade to new ranked system for proper loading, modification, and saving of rankings."	2015-05-01 12:34:32 -04:00
.gitignore	Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-16 18:16:08 +01:00
.project	Removed dead project ServerStatus	2014-05-28 11:18:30 -07:00
Mineplex.Queuer.iml	Removed dead project ServerStatus	2014-05-28 11:18:30 -07:00