Keir ef6fd0eaa3 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 # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2015-12-05 00:05:05 +00:00
..
clans	disabled koth	2015-12-02 18:25:53 +00:00
economy	im an idiot	2015-11-27 01:40:28 -05:00
fields	hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces.	2015-11-15 21:03:48 +00:00
gameplay	forcejoin command for ADMIN+ and fixed auto tree replanting.	2015-12-02 05:54:00 +00:00
items	removed some testing stuff	2015-11-30 07:06:36 +00:00
shop	tutorial revamp 2.0	2015-11-29 02:10:39 +00:00
spawn	item frame cancel!	2015-11-27 22:27:20 +11:00
tutorials	a few last touches	2015-12-02 06:04:53 +00:00
world	don't cull an entity if a player is nearby	2015-11-28 20:14:48 +00:00
Clans.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
Farming.java	Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.	2015-08-26 17:37:31 -07:00
Recipes.java	Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items	2015-08-27 13:57:57 -07:00