Shaun Bennett c23855bd65 Merge with develop		2016-01-30 02:44:24 -05:00
..
clans	Merge with develop	2016-01-30 02:44:24 -05:00
economy	im an idiot	2015-11-27 01:40:28 -05:00
fields	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
gameplay	sapling fix	2016-01-29 20:56:38 +00:00
items	fix dupe bug and safelog	2016-01-23 13:40:49 +00:00
shop	Lots of changes, specifics:	2015-12-18 11:13:38 +00:00
spawn	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-07 09:35:07 +00:00
tutorials	few changes to pvp timer, and fixed bugs etc	2015-12-16 18:25:30 +00:00
world	don't cull an entity if a player is nearby	2015-11-28 20:14:48 +00:00
Clans.java	Update fixes - @Teddy!	2016-01-29 14:05:09 -05: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