Ty Sayers 227a077dba Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear ... Conflicts: Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java		2015-08-29 15:53:42 -07:00
..
.idea	Fix a bug where claiming a new land would display that land as neutral	2015-08-29 13:56:26 -07:00
BuildFiles	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Classpath.Dummy	Remove debug messages	2015-08-28 12:56:43 -07:00
JedisTest	messing with jedis subpub	2014-12-22 22:49:28 -06:00
Libraries	Enable caching for clans, update craftbukkit jar	2015-08-28 13:10:30 -07:00
Mineplex.Bungee.Mineplexer	Carl!	2015-08-13 03:32:31 -05:00
Mineplex.BungeeRotator	Fixed Bungee issues with new redis configs.	2015-07-03 02:17:27 -04:00
Mineplex.ChestConverter	Fixed global player count.	2015-05-22 14:33:25 -07:00
Mineplex.Core	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Mineplex.Core.Common	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 15:53:42 -07:00
Mineplex.Database	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -05:00
Mineplex.DDoSProtectionSwitcher	Editing .classpath and a main testing method in UtilBlock	2015-06-19 21:10:10 -04:00
Mineplex.EnjinTranslator	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars	2015-06-21 16:17:51 -04:00
Mineplex.Game.Clans	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 15:53:42 -07:00
Mineplex.Game.Clans.Core	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 15:53:42 -07:00
Mineplex.Hub	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00
Mineplex.MapParser	fixed a uid problem with maps	2015-08-12 18:36:29 +02:00
Mineplex.Minecraft.Game.ClassCombat	Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.	2015-08-28 12:52:02 -07:00
Mineplex.Minecraft.Game.Core	For Chiss, may the code never break.	2015-08-29 15:03:22 -07:00
Mineplex.PlayerCache	Revert "Add IntelliJ IDE library files"	2015-07-06 17:06:29 -05:00
Mineplex.Queue.Core	Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.	2015-06-29 19:27:05 -04:00
Mineplex.Queuer	Revert "Add IntelliJ IDE library files"	2015-07-06 17:06:29 -05:00
Mineplex.ServerData	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Mineplex.ServerMonitor	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events	2015-08-14 19:44:56 +12:00
Mineplex.ServerProcesses	Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.	2015-06-29 19:27:05 -04:00
Mineplex.StaffServer	Fixes to redis	2015-07-26 08:49:35 -07:00
Mineplex.Votifier	Use login query to handle logins	2015-08-13 06:12:11 -05:00
Nautilus.Game.Arcade	Fix spawning	2015-08-29 15:07:51 -07:00
Nautilus.Game.MineKart	Started adding SkyWars game mechanics	2015-06-18 14:54:26 -04:00
Nautilus.Game.PvP	Merge master into clans	2015-07-13 20:42:10 -05:00