2 Commits

Author	SHA1	Message	Date
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
Jonathan Williams	d5ea6c5377	Removed dead project ServerStatus ... Tweaked connection strings so they autoreconnect. Added dragon sound to pre-queue prompt. Added rest of missing files.	2014-05-28 11:18:30 -07:00