407ec0d924
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-11-03 20:11:21 +00:00
9267a36528
Disable Halloween 2016 ( #261 )
...
* Removed all the halloween related items:
- Haunted chests can only be opened if player already had ammo
- Removed Halloween theme from the hub
- Removed pumpkins from in-game
* Added Halloween items to the Omega Chest
* Fixed weight for items in the omega chest
* Changed Disk to Disc in RewardManager
Changed values for omega rarities
* Final commit (removed win room test command)
* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
e8becf3819
Op on dev servers too
2016-10-28 17:56:08 -04:00
e0d05d3c87
PC-1140 Keep reports region-separated
2016-10-22 15:06:18 +01:00
0dca2e9d46
Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub
2016-10-08 19:42:29 -04:00
0f44483f07
Merge pull request #233 from Mineplex-LLC/project-cosmetics
...
Project cosmetics
2016-10-06 04:31:56 -04:00
d6e9283cce
Changed world time so its not too dark
2016-10-06 05:26:58 -03:00
a6727bf104
Halloween Fixes/Prep
2016-10-05 22:57:44 -04:00
c0754a23c8
Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players ( #232 )
...
* Added option to run /unlockcosmetics and /lockcosmetics for other players
* Fixed Slimeball Soccer field location
2016-10-05 22:08:27 -04:00
a1ec102419
Fixed Slimeball Soccer field location
2016-10-05 21:54:17 -03:00
8da5813f29
Add Halloween Cosmetics ( #227 )
...
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color
External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat
* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods
External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed
* Internal:
Renamed RewardType enums to have upper case
External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet
* Slack integration to test stuff (Will not be in the code in the last commit)
* Fixed Grim Reaper Hoe not being removed after the morph is disabled
* Details for the Haunted Chest
* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph
* Fixes for lores and names
Support server stuff
* Fixes for the Lock and Unlock cosmetics commands
* Fixes for the Grim Reaper Morph
* Fixes for the Grim Reaper Morph
Removed debug messages
* Fixed a memory leak. Thanks to Sam
* Fix imports
* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()
* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
3ede0e5644
Merge Report System v2 ( #216 )
...
Report system (v2)
2016-09-28 17:39:26 -04:00
3d7647b26b
Game Lobby Update ( #215 )
...
* Game Lobby update. Phase 1.
* Correctly apply kit data to players who use the next best game feature.
* I can do integer comparisons, I promise.
* So much stuff, all minor.
* Suck it Carl.
* Fix Party bug.
Update LobbyManager
* Allow QA to test KitProgression @shaun cherry pick this plz.
* Proper generation check (testing)
Remove debugging from NextBestGame
* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.
* ClansHub and Tweaks to the lobby manager
* WA Tweak.
2016-09-28 10:17:05 -04:00
f63561b05e
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-26 10:19:13 +01:00
3f3241bec9
Reformat developer servers
2016-09-25 16:28:01 -04:00
b24429783b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
7f447f8084
Setup compass for game changes
2016-09-22 00:33:48 -04:00
bf61296948
PlayWire Ad integration ( #207 )
...
* PlayWire integration.
* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*
* PlayWire stuff.
* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
2cdab061b6
PC-886 Move report bans over to punishment gui
2016-09-16 17:40:14 +01:00
5e5cb3284a
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-12 10:11:31 +01:00
23a330d449
Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode
2016-09-08 03:50:45 -04:00
fba449ca03
Don't rearrange GUI if all dev servers are ingame
2016-09-07 19:17:47 -04:00
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -04:00
225583a13d
Remove join restrictions on beta servers from unranked players
2016-09-06 21:36:30 -04:00
e2455bbc9d
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-05 20:04:12 +01:00
ccd81c1820
Fix BlockIgniteEvent NPE in MavericksManager
2016-09-05 13:42:24 -05:00
acd63c90a1
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
ae0d30558c
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:12:12 -05:00
f6db5393a3
Merge branch 'project-cosmetics' into develop
2016-09-02 00:08:23 -05:00
d8486abbfd
Fix minor best game issues.
2016-09-01 20:05:53 -05:00
107a296239
Fuck you intellij
2016-09-01 05:49:59 -05:00
68743cf73c
Mavs changes.
2016-09-01 03:24:38 -05:00
46053e82e1
Mavs changes.
2016-09-01 02:35:31 -05:00
c0c75ea375
Allow team selecting to work on the mavs hub.
2016-08-31 23:46:29 -05:00
9cd5b73432
Merge branch 'update/basketball-game' into develop
2016-08-31 23:19:51 -05:00
55086efd91
Merge branch 'feature/shadowmute' into develop
2016-08-31 23:16:57 -05:00
8ca214a4d8
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-08-30 01:37:14 -04:00
5108a6f08d
Convert to npc for entering mavericks lobby
2016-08-30 01:02:26 -04:00
d7d8ef021e
Disable using cosmetics inside mavericks hub
2016-08-30 00:47:48 -04:00
dfced7186f
Finish tweaks for the hub
2016-08-29 22:32:07 -05:00
f72647e1d4
Merge with develop
2016-08-29 21:56:03 -04:00
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
f3e38031ab
Add shadowmuting
2016-08-29 18:57:07 -04:00
cd9423a8e4
De-couple chatsnap from report system
2016-08-27 22:21:56 +01:00
3e38eb5990
Fixes to the merging conflicts
2016-08-25 20:13:59 -03:00
25d64c6dee
Changes to lock command
2016-08-25 20:12:00 -03:00
f9cc505908
Minor tweaks to soccer fields
2016-08-25 04:02:17 -05:00
19cfcc414b
Fix stacking minecarts
2016-08-25 03:58:39 -05:00
f518185518
Tweak parkour
2016-08-24 22:55:39 -05:00
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
ba2bee4f25
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
42c228773c
Fix entity directions
2016-08-23 01:52:19 -05:00
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
a8e891f247
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
14f140143b
Re-enable music in hub gadgets
2016-08-05 13:34:33 -04:00
1854b71757
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
ca13b8f29e
Fix compile errors
2016-08-03 14:18:26 -05:00
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
bb9dbf1da4
PC-877 Vanish report handler when teleporting to offender's server
2016-07-29 15:08:03 +01:00
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
3aad06cc8a
Make Clans displayed as FULL instead of BETA in server compass
2016-07-28 19:11:14 -04:00
ab8d6daa2c
GitHub being annoying again
2016-07-28 19:59:49 -03:00
ab9bf2f405
Fixes possible bug with party leaders not seeing chat.
...
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
9a73784b7c
Make clans in the hub route through clans hubs
2016-07-25 11:18:10 -04:00
5180e46be7
Revert party chat symbol to "@". Change team chat symbol to "#".
2016-07-24 22:17:50 -05:00
f4c40c61bb
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-24 13:18:53 -03:00
195a82f78f
Github is annoying me about this, but I don't know what it is
2016-07-24 13:18:33 -03:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
55c63364f2
Fix KOTH starting in other hub worlds and hub basketball teams always being null
2016-07-21 16:57:24 -04:00
286a7aa32a
Even more debug
2016-07-21 16:16:38 -04:00
b5ce35544f
Fix merge conflict
2016-07-21 15:48:56 -04:00
fc3ceddf4d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
97ef408e14
Debug
2016-07-21 15:46:48 -04:00
11992129d1
Convert to EntityPortalEnterEvent
2016-07-21 14:01:08 -04:00
d59882007b
Slightly increase boundaries
2016-07-21 13:55:09 -04:00
37cf863625
Tiny fixes
2016-07-21 13:46:13 -04:00
57f9f7db4b
Fix ClassCastException
2016-07-21 13:25:17 -04:00
9b58c53e90
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-21 16:11:09 +01:00
9a06cce0a0
Merge branch 'feature/party-v2' into develop
2016-07-20 16:41:50 -05:00
67a185acc9
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-20 15:52:59 -05:00
ff210271c9
Add javadocs
2016-07-20 12:21:15 -04:00
0b4c9d78ff
Finalize game integration into map
2016-07-20 11:22:14 -04:00
136eb078ef
PC-426: Update UX for non-premium players:
...
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
2016-07-20 06:59:37 -05:00
0eac157701
Implement basketball features in the hub and begin setting up coordinates
2016-07-19 12:45:38 -04:00
f0c2686ca7
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-14 23:01:11 +01:00
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
6082418fc7
Update game tags on the hub game compass
2016-07-13 23:59:37 +03:00
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
5c83f09456
SnapshotRepository no longer extends MinecraftRepository
...
It doesn't need to.
2016-07-08 23:26:33 -04:00
ce72d25832
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-08 13:09:02 -05:00
4aad663bec
Left over from merge
2016-07-08 03:59:16 +02:00
5349d26115
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-07-08 03:41:13 +02:00
c50ec49ad9
Minor updates
...
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
cb555a41ab
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-07 20:47:19 -04:00
0dc17bf6fa
Further code cleanup
2016-07-07 18:12:52 -04:00
4e0287ad03
Re-import report feature classes in Hub and Arcade
2016-07-07 14:01:18 -04:00
17f89f6937
Merge branch 'project-cosmetics' into develop
2016-07-06 13:00:29 -05:00
0eab6db116
Soccer bug fixes and minor improvements
...
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
2016-07-05 15:39:10 -05:00
584c8f50f0
PC Party bugs and tweaks.
2016-07-04 05:12:02 -05:00
06feb615a9
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-04 04:18:01 -05:00
0393e682c3
Merge clean up
...
Every bloody time there are files who don't want to join the rest in the
merge commit.... >.>
2016-06-30 23:10:28 +02:00
6d9e84b817
Merge branch 'develop' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
03511a7234
Updated values
...
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.
Seem to have forgotten to include the MavWorldManager earlier... ups.
2016-06-30 22:56:26 +02:00
f9208b67ef
Added schematic support for ground in MB.
...
Also fixed an NPE and moved a constructor to protected.
2016-06-29 15:19:46 +02:00
32ee27d9ee
Small bugfixes with QA
...
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
2016-06-29 03:49:53 +02:00
24186d9992
More fixes for gadget persistence
2016-06-28 18:11:00 -03:00
a69101bef3
Cleaned out some debug messages and added some java-docs.
2016-06-28 01:35:37 +02:00
d6672c44f4
Finalized the hub module and finished local testing
...
Cleaned up some source. Applied some small updates. Finished local
testing.
2016-06-27 00:34:17 +02:00
90df695624
Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-26 00:18:07 +01:00
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
323d865b57
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
0cda8ab7a3
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 04:11:59 -05:00
8fbb06ae3d
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
95f7c757cb
Fix booster group naming for the quick menu
2016-06-24 04:07:27 -05:00
d708c478d7
Dont display other boosters, fix typo
2016-06-24 03:16:42 -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
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
a29b22b8be
Undo comments.
2016-06-23 03:12:49 -05: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
a795ee3d0f
Fix feature initialisation code
2016-06-23 01:18:16 +01:00
09a74e3772
Work on pushing chat snapshots to db
2016-06-23 00:38:24 +01:00
31352a86d7
Added Mavericks module to Hub
2016-06-23 01:17:16 +02:00
50534c3af9
UI And server manager changes
2016-06-22 17:28:43 -05:00
e53b474f3f
Fix typo.
2016-06-22 00:59:22 -05:00
ebff8f865b
Undid a little too much.
2016-06-22 00:58:30 -05:00
38a13d01f1
Open server menu properly
2016-06-22 00:56:44 -05:00
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
2f1954e41c
Rename to booster group
2016-06-15 18:18:09 -05:00
cbfbd6fe1c
Booster GUI update
2016-06-15 17:40:20 -05:00
aa785ed3d5
Code clean-up and documentation
2016-06-12 21:18:11 -05:00
22e22ff508
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
Keir Nellyer
LCastr0
samczsun
Shaun Bennett
Kenny
Shaun Bennett
Timothy Andis
AlexTheCoder
cnr
Shaun Bennett
Thanos Paravantis
xGamingDudex