JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,423 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

8423 Commits

Author SHA1 Message Date
Shaun Bennett 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
Shaun Bennett 043f9576dd Fix smash mobs booster group 2016-06-23 22:50:31 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
TadahTech c204562eb3 Fix cross server invites / joining servers. 2016-06-23 23:25:26 -05:00
TadahTech eeaf9fa49a Fix chat in arcade 2016-06-23 23:24:50 -05:00
TadahTech ce1aab5e11 Fixes and changes 2016-06-23 21:53:12 -05:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
xXVevzZXx e09df7ccfd fix chests being opened by specs 2016-06-23 16:46:54 -05:00
xXVevzZXx 399ab5c363 fix supply chest protection, absorbtion effect, tnt and level bugs 2016-06-23 16:46:45 -05:00
Sam f8080d2663 PC-574 
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
 2016-06-23 22:40:15 +01:00
xXVevzZXx dc57f7b4e6 add testrank command for SR.Mods 2016-06-23 22:05:26 +02:00
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
Thanos Paravantis 4e9ea23db8 Fix spawn facing, separate scoreboard functions 2016-06-22 21:47:39 +03: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
Sam 0131850fc3 SSM fixes 2016-06-21 20:41:53 +01: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