Shaun Bennett 23232efd63 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java		2016-04-05 13:04:39 +10:00
..
ui	Merge remote-tracking branch 'remotes/origin/develop' into clans/beta	2016-04-05 13:04:39 +10:00
LobbySorter.java	Fixed up AntiHack database reporting.	2014-03-24 01:16:02 -07:00
ServerInfo.java	Show Host Rank in private servers	2015-12-29 00:50:20 -06:00
ServerManager.java	Removed pesky '?' causing login query to stall.	2016-04-04 16:30:57 -05:00
ServerSorter.java	Made clans sort by server number.	2016-04-04 17:46:51 -05:00