Keir cc421c1435 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java		2015-12-24 21:19:30 +00:00
..
commands	costume sets	2015-12-11 20:59:55 +11:00
mail	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
modules	Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics	2015-12-10 19:21:33 -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	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
server	Adjust GUI, fix beta button	2015-12-21 04:35:57 -05:00
tutorial	carl spinner in arcade/	2015-08-12 08:36:21 +02:00
Hub.java	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-24 21:19:30 +00:00
HubClient.java	fixed old staff being stuck invis.	2015-12-08 10:31:11 +11:00
HubManager.java	Add to Arcade and Hub	2015-12-16 22:01:51 +00:00
HubRepository.java	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
HubType.java	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00