| .. |
|
.idea
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-10-18 12:35:31 -04:00 |
|
BuildFiles
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
|
2015-09-29 18:09:52 -04:00 |
|
Classpath.Dummy
|
Remove debug messages
|
2015-08-28 12:56:43 -07:00 |
|
JedisTest
|
…
|
|
|
Libraries
|
Merge with master
|
2015-10-13 18:13:01 -04:00 |
|
Mineplex.Bungee.Mineplexer
|
Added 43k player chest benefit.
|
2015-10-18 00:21:01 -05:00 |
|
Mineplex.BungeeRotator
|
Should include the file with the change commit.
|
2015-09-26 18:30:45 -04:00 |
|
Mineplex.ChestConverter
|
Added donorsOnline to MinecraftServer snapshot
|
2015-08-28 13:22:04 -07:00 |
|
Mineplex.Core
|
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
|
2015-10-25 12:28:12 +00:00 |
|
Mineplex.Core.Common
|
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
|
2015-10-26 12:21:33 +00:00 |
|
Mineplex.DDoSProtectionSwitcher
|
Editing .classpath and a main testing method in UtilBlock
|
2015-06-19 21:10:10 -04:00 |
|
Mineplex.Database
|
Lots of bonus work, start adding Votifier plugin
|
2015-08-06 00:45:39 -05:00 |
|
Mineplex.EnjinTranslator
|
Fix for punishments to match names exactly
|
2015-09-26 18:31:37 -04:00 |
|
Mineplex.Game.Clans
|
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
|
2015-10-28 17:08:48 +00:00 |
|
Mineplex.Game.Clans.Core
|
More war fixes - still needs tweaking
|
2015-10-23 02:17:47 -04:00 |
|
Mineplex.Hub
|
Conflicts:
|
2015-10-24 20:45:39 +01:00 |
|
Mineplex.MapParser
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-11 10:52:45 -04:00 |
|
Mineplex.Minecraft.Game.ClassCombat
|
Conflicts:
|
2015-10-24 20:45:39 +01:00 |
|
Mineplex.Minecraft.Game.Core
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
|
2015-09-29 18:09:52 -04:00 |
|
Mineplex.PlayerCache
|
Added LoginTime setting as RedisTime for use in calculating time on server.
|
2015-08-28 21:44:00 -07: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
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
|
2015-09-29 18:09:52 -04:00 |
|
Mineplex.ServerMonitor
|
Added failsafe for ServerMonitor.
|
2015-10-12 22:26:24 -05: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
|
Removed all create table statements.
|
2015-10-09 21:02:35 -06:00 |
|
Mineplex.Votifier
|
Use login query to handle logins
|
2015-08-13 06:12:11 -05:00 |
|
Nautilus.Game.Arcade
|
Conflicts:
|
2015-10-24 20:45:39 +01: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 |
8ce50d1fc7