Merge remote-tracking branch 'remotes/origin/master' into develop

# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
This commit is contained in:
Shaun Bennett 2015-12-15 15:00:14 -05:00
commit 211e440e67

View File

@ -9,7 +9,7 @@ public enum RewardType
OldChest( 0, 0.06, 0.8, 16), OldChest( 0, 0.06, 0.8, 16),
AncientChest( 0, 2, 8, 32), AncientChest( 0, 2, 8, 32),
MythicalChest( 0.3, 4, 16, 72), MythicalChest( 0.1, 4, 16, 72),
WinterChest( 0, 5, 18, 32), WinterChest( 0, 5, 18, 32),
SpinnerFiller( 0.1, 1, 4, 20), SpinnerFiller( 0.1, 1, 4, 20),