Conrad S ccf9d4a4c2 Merge remote-tracking branch 'origin/clans/beta' into clans/beta ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java		2016-04-09 13:01:04 -04:00
..
clans	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-09 13:01:04 -04:00
economy	Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32	2016-04-09 00:27:24 +01:00
fields	Use DBPool for everything	2016-02-19 00:17:38 -06:00
gameplay	stop iron door from being opened by players not in clan (outpost)	2016-04-05 23:49:16 +01:00
items	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-05 12:37:23 +01:00
legacytutorial	tutorial changes, chat filter system, commented out all web stuff for analytics.	2016-03-16 22:46:18 +00:00
message	Objectives!	2016-03-15 11:50:35 -05:00
shop	So many fixes <3	2016-04-04 12:47:23 +10:00
spawn	Final changes	2016-04-04 23:28:38 +10:00
texttutorial	Add support for 1.9 resource packs, Text Tutorials	2016-03-11 11:50:08 -06:00
tutorial	Stop using static with Siege Manager	2016-04-07 21:01:25 +01:00
world	don't cull an entity if a player is nearby	2015-11-28 20:14:48 +00:00
Clans.java	Disable incognito for staff in hub invisibility, and vice-versa	2016-04-08 20:18:56 +01: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	some fixes and updates	2016-03-10 02:47:48 +00:00