324a967135
Merge pull request #118 from Mineplex-LLC/develop
...
Merge develop into project-cosmetics
2016-06-28 18:13:09 -03:00
fbd9b17ba0
fix playeringametime being 0
2016-06-25 12:35:59 -05:00
30f413d04e
Fixes for persistence:
...
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
a18976649b
Merge pull request #116 from Mineplex-LLC/develop
...
Merge develop into project-cosmetics
2016-06-25 00:27:01 -03:00
c430566c6d
Never reset a player's YouTube click time locally
2016-06-24 16:59:27 -05:00
94fe9f57d2
Add missing imports
2016-06-24 12:36:56 -07:00
dc9145c707
Hotfix, disable youtube and twitter buttons in BonusGUI
2016-06-24 15:33:07 -04:00
14542d7dac
Close open UIs except for Champions kits
2016-06-24 04:10:08 -05:00
95f7c757cb
Fix booster group naming for the quick menu
2016-06-24 04:07:27 -05:00
c40e07695c
Only close open UIs when choosing SSM kits
2016-06-24 04:06:28 -05:00
560abc933c
Replace underscores with spaces in booster group
2016-06-24 03:16:42 -05:00
b4caf5125b
Adjust tip amounts
2016-06-24 03:16:42 -05:00
d708c478d7
Dont display other boosters, fix typo
2016-06-24 03:16:42 -05:00
348cb9efba
Fix remaining booster message
2016-06-24 02:23:09 -05:00
b58ff8c066
Add YouTube and Twitter buttons to UI
2016-06-24 01:30:10 -05:00
def57e2c0b
Fix HubManager, add failsafe for BoosterManager
2016-06-23 23:19:02 -07:00
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
043f9576dd
Fix smash mobs booster group
2016-06-23 22:50:31 -07:00
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
e09df7ccfd
fix chests being opened by specs
2016-06-23 16:46:54 -05:00
399ab5c363
fix supply chest protection, absorbtion effect, tnt and level bugs
2016-06-23 16:46:45 -05:00
a33b070ae7
Deny placing skulls
2016-06-23 15:34:29 -04:00
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
6e2c751be1
Adjust amplifiers queue message
2016-06-22 21:09:09 -07:00
1ea680cd20
Return to an invisible armor stand name
2016-06-22 21:01:37 -07:00
bcf82ad513
Remove debug messages
2016-06-22 21:00:50 -07:00
761e550d6c
Add shards to announcement message
2016-06-22 20:55:27 -07:00
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
956cfeac44
Don't recall if player is dead, show UUID for custom items
2016-06-22 21:14:50 -04:00
14c6c4215c
Silent chest opening!
2016-06-22 21:12:24 -04:00
032b6a77c0
Display UUID for CMod+
2016-06-22 21:12:24 -04:00
2e1bb25b0b
Fix exceptions
2016-06-22 21:12:24 -04:00
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
d739df8623
UHC is faster now
2016-06-21 22:21:27 -05:00
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
73183af9bf
Fixing podium npc bug
2016-06-20 00:45:57 -05:00
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
d572635e99
Fix spelling mistake
2016-06-19 02:19:33 -05:00
5316dfe0c6
Remove Spammy "Loaded default kit message".
...
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
2016-06-19 02:09:17 -05:00
LCastr0
xXVevzZXx
cnr
Shaun Bennett
Kenny Goodin
samczsun
TadahTech