Keir 8459cf0f95 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java		2015-12-09 18:13:26 +00:00
..
addons	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""	2015-11-12 17:51:13 -05:00
command	small youtuber perms	2015-12-06 18:08:36 +11:00
events	- Fixed permanent dwarf toss bug	2015-10-27 01:38:41 -04:00
game	fixed a bug where old displayName would be used after name was updated.	2015-12-09 08:38:05 +11:00
gui	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""	2015-11-12 17:51:13 -05:00
kit	fixed my muddling of perks	2015-12-09 07:47:07 +11:00
managers	Now Playing, Preference to disable ads	2015-12-07 18:28:05 -05:00
ore	ore changes	2015-06-26 10:36:45 +10:00
player	Initial Commit	2013-08-27 08:14:08 -07:00
scoreboard	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""	2015-11-12 17:51:13 -05:00
shop	DEVP-66 Refactor commonly used classes to Java conventions	2015-02-26 00:07:07 -05:00
stats	-B	2015-11-20 05:57:29 -05:00
world	LinkedHashMaps, Buttons	2015-12-08 17:45:27 -05:00
Arcade.java	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-05 00:05:05 +00:00
ArcadeFormat.java	Initial Commit	2013-08-27 08:14:08 -07:00
ArcadeManager.java	Now Playing, Preference to disable ads	2015-12-07 18:28:05 -05:00
GameType.java	small youtuber perms	2015-12-06 18:08:36 +11:00
TournamentType.java	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04:00