samczsun
a33b070ae7
Deny placing skulls
2016-06-23 15:34:29 -04:00
LCastr0
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
LCastr0
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
LCastr0
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
TadahTech
69c7c9edc8
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-23 03:13:10 -05:00
TadahTech
a29b22b8be
Undo comments.
2016-06-23 03:12:49 -05:00
TadahTech
33cce620be
Update UI and fix typos
2016-06-23 03:11:45 -05:00
TadahTech
df53021f7c
Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again.
2016-06-23 02:56:42 -05:00
TadahTech
fb6a772eb0
Fix Party Redis. Improve Party UI. General testing and fixing.
2016-06-23 02:39:05 -05:00
Shaun Bennett
6e2c751be1
Adjust amplifiers queue message
2016-06-22 21:09:09 -07:00
Shaun Bennett
1ea680cd20
Return to an invisible armor stand name
2016-06-22 21:01:37 -07:00
Shaun Bennett
bcf82ad513
Remove debug messages
2016-06-22 21:00:50 -07:00
Shaun Bennett
761e550d6c
Add shards to announcement message
2016-06-22 20:55:27 -07:00
Shaun Bennett
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
Shaun Bennett
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
Shaun Bennett
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
Shaun Bennett
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
samczsun
956cfeac44
Don't recall if player is dead, show UUID for custom items
2016-06-22 21:14:50 -04:00
samczsun
14c6c4215c
Silent chest opening!
2016-06-22 21:12:24 -04:00
samczsun
032b6a77c0
Display UUID for CMod+
2016-06-22 21:12:24 -04:00
samczsun
2e1bb25b0b
Fix exceptions
2016-06-22 21:12:24 -04:00
Alex-The-Coder
2453f82061
Rename Filterbutton.java to FilterButton.java
2016-06-22 18:40:12 -04:00
TadahTech
50534c3af9
UI And server manager changes
2016-06-22 17:28:43 -05:00
Shaun Bennett
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
TadahTech
e53b474f3f
Fix typo.
2016-06-22 00:59:22 -05:00
TadahTech
ebff8f865b
Undid a little too much.
2016-06-22 00:58:30 -05:00
TadahTech
38a13d01f1
Open server menu properly
2016-06-22 00:56:44 -05:00
TadahTech
d9c5e6323a
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-22 00:36:23 -05:00
TadahTech
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
samczsun
d739df8623
UHC is faster now
2016-06-21 22:21:27 -05:00
TadahTech
e39326b592
Help Command UI.
2016-06-21 00:11:33 -05:00
TadahTech
b75e87753d
Party UI work.
2016-06-20 22:45:53 -05:00
TadahTech
a49e815765
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-20 16:40:33 -05:00
TadahTech
2211cf4dec
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
Shaun Bennett
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
Shaun Bennett
73183af9bf
Fixing podium npc bug
2016-06-20 00:45:57 -05:00
Shaun Bennett
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
Shaun Bennett
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
TadahTech
d572635e99
Fix spelling mistake
2016-06-19 02:19:33 -05:00
TadahTech
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
xXVevzZXx
95649a5f14
adjust amount of gems as win reward
2016-06-18 20:48:55 -05:00
Shaun Bennett
a8e67eda88
Rename tip message PC-566
2016-06-18 14:45:39 -05:00
Shaun Bennett
2f0a559441
Add reload command, change podium to lime dye, change tip message
2016-06-18 14:41:32 -05:00
Shaun Bennett
690c6160b9
Green Armor
2016-06-18 14:27:53 -05:00
Shaun Bennett
5f9a57b7e2
Lower booster tip cooldown to 1 minute
2016-06-17 16:10:01 -05:00
Shaun Bennett
4e3062f413
Swap Cosmetic and Booster interface slot
2016-06-17 15:23:53 -05:00
TadahTech
d16f83af00
Attempt to fix duplicate messages bug. I cannot reproduce in testing.
2016-06-16 21:12:17 -05:00
cnr
16f6d75dea
Revert kit name changes
...
We can change this back whenever we've migrated to the new name in mssql
2016-06-16 20:36:33 -05:00
