1adb4b8239
Give cma access to freeze
2017-05-29 22:48:25 -05:00
cd8e805435
Give CMA access to unfreeze
2017-05-29 22:48:25 -05:00
6ae6f7b627
Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
...
This reverts commit f5cba1eb1e
2017-04-30 01:54:43 -07:00
d99f51f3a9
Revert "Clans doesn't have access to this through core for some reason"
...
This reverts commit 20264ff1af
2017-04-30 01:54:36 -07:00
20264ff1af
Clans doesn't have access to this through core for some reason
2017-04-29 02:17:50 -04:00
f5cba1eb1e
Rate limit book/sign edits as a temporary measure against a crash exploit
2017-04-29 02:05:07 -04:00
03d781ca70
It be April fools matey, walk yee plank
2017-04-01 02:11:11 -05:00
a4c875b4bd
Refactor Clans gold to be set from Core
2017-03-09 01:04:50 -06:00
699845d6d7
Merge branch 'feature/gem-hunters' into develop
2017-02-25 00:40:05 -06:00
7de556e3d8
Allow plugins to choose a hub type when restarting
...
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
3a4e973551
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-12 13:12:53 +00:00
11791bc461
Block joining clans servers via friends, block joining of clans servers that are restarting, clean up log mob armor stands on restart, take staff out of observer mode on restart
2017-02-09 22:44:30 -06:00
8d47e80066
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-12 18:03:07 +00:00
132036bd17
Move Constants to common
2017-01-11 20:42:46 -06:00
39ba03d1b4
Convert to UtilServer.isTestServer
2017-01-11 20:29:36 -06:00
19ac8f0c3b
Create framework for proper test network
2017-01-11 20:29:36 -06:00
56d4ed9e11
Parties rewrite
...
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
21473a7d82
Fixed merge conflict
2017-01-10 21:27:47 -02:00
64026f81ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-08 21:12:28 +00:00
0218965bee
Villager trading and loot upgrades
2017-01-08 15:44:04 +00:00
3af401ee8f
Implement two-factor authentication
2017-01-04 20:33:09 -07:00
6478656501
Fixed armorstand balloon types
2016-12-29 16:25:20 -02:00
ca19840b19
Revert "Disable communities temporarily."
...
This reverts commit 6d5d2b551b
2016-12-22 16:50:35 -07:00
6d5d2b551b
Disable communities temporarily.
2016-12-22 17:07:36 +00:00
2611ba7a7a
Bugfixes from iteration, & new features requested by sampson sigils and relyh
2016-12-21 19:30:53 -07:00
6970c3205e
AntiHack Logging
2016-12-20 15:05:01 -05:00
77da6ac2c2
Remove MAC
2016-12-20 15:05:01 -05:00
87eaeabd7f
Document and clean up StatsManager
2016-12-14 19:52:13 -07:00
d291521ad1
Clean up DonationManager
2016-12-14 19:52:13 -07:00
fa0e42a918
Revert "Anticheat Logging #299 "
...
This reverts commit cae9d2f67e
2016-12-01 01:59:50 -06:00
cae9d2f67e
Anticheat Logging #299
...
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
72669c7640
Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff
2016-12-01 01:20:18 -06:00
26262479f6
Remove Smoke Bomb and Illusion from Clans
2016-11-25 00:41:47 -05:00
0a458c150f
Take a second crack at fixing invisibility across Arcade and Clans
2016-11-23 23:41:10 -05:00
e4a968759a
Properly block placement of redstone-based blocks in Clans
2016-11-23 23:41:10 -05:00
32c9900069
Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
2016-11-23 23:41:10 -05:00
18992efa5a
Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
2016-11-23 23:41:10 -05:00
3d5e61e0f1
Eternal Giveaway Fixes
2016-11-17 21:05:10 -05:00
cbc9aeedc6
Report Feature Improvements ( #269 )
...
Report Feature Improvements
2016-11-16 22:52:14 -05:00
7d14b6073d
Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map
2016-11-16 22:37:25 -05:00
5e1fcabe36
Final changes for S2
2016-11-16 22:37:25 -05:00
a8e3a530c1
Prevent safely logging out in shop zones while tagged
2016-11-16 22:37:25 -05:00
4a186a8dec
Disable crafting of hoppers
2016-11-16 22:37:25 -05:00
a219a2d072
Fix TNT breaking bedrock, increase build height and add a minimum chest place height
2016-11-16 22:37:25 -05:00
1535fcc38b
Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks
2016-11-16 22:37:25 -05:00
63ef68976c
Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective
2016-11-16 22:37:25 -05:00
e0d05d3c87
PC-1140 Keep reports region-separated
2016-10-22 15:06:18 +01:00
09fe7b736a
Don't enable debugging
2016-10-19 22:38:39 -04:00
66dfe06b34
Clean up bucket fixing in clans
2016-10-12 21:50:18 -04:00
2ac7f72327
Fix clans water exploit and ruined pickaxe duping exploit
2016-10-12 21:50:18 -04:00
0caa84f703
Optimize Clan Banners ( #221 )
...
* Optimize BannerRepository.java
* Optimize banner loading in BannerManager.java
* Optimize banner loading in ClansManager.java
* Remove unnecessary runAsync
* Optimize Siege Weapon storage
* Forgot a ! in my while loop
2016-09-29 23:04:19 -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
92a0d606d4
Fix timings
2016-09-21 21:37:57 -04:00
2cdab061b6
PC-886 Move report bans over to punishment gui
2016-09-16 17:40:14 +01: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
8ca214a4d8
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-08-30 01:37:14 -04:00
cd9423a8e4
De-couple chatsnap from report system
2016-08-27 22:21:56 +01:00
8617572980
Fix preferences menu interaction in Clans{,Hub}
2016-08-25 02:26:42 -05:00
c9d14dc522
Update clans to new preferences. Remove debug messages.
2016-08-23 03:12:36 -05:00
5365f1269f
Delay Anticheat enable in Clans
...
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
72ddfd5d85
Disable server spawn radius in Clans
...
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -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
5fca64b86b
Remove safezone requirement for observer mode
2016-08-09 15:10:45 -04:00
e5a96e8189
Fix incorrect casing in mapping outposts
2016-08-08 21:54:27 -04:00
5a2871528f
Small aesthetic change to ghasts
2016-08-07 18:53:35 -04:00
73cb42c7ab
Make outposts actually end after they expire
2016-08-07 18:53:23 -04:00
cce871b0e2
Stop runes being applied to stacks of items
2016-08-07 18:53:05 -04:00
4e8ed68efd
Stop bows from selling in stacks
2016-08-07 18:52:48 -04:00
36e6c7ce33
Fix slight error in amplifier end messages
2016-08-07 18:52:21 -04:00
e16d88e52b
Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode
2016-08-07 18:52:00 -04:00
5985731909
Make block drop rate 30% like normal TNT
2016-08-07 17:55:38 -04:00
36aa1f9317
Stop swords and bows from being sold in stacks
2016-08-07 15:02:23 -04:00
c5d979e5dc
Remove unnecessary while loop
2016-08-06 03:08:29 -04:00
8eb74de2e8
Make outposts not try to block all right clicking everywhere -.-
2016-08-05 21:34:31 -04:00
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
5b03692c97
Add in cooldowns for other clans shop buttons to stop autoclick exploits
2016-08-05 14:33:59 -04:00
599c47a8c2
Prevent stacks of runes being consumed on one item
2016-08-05 14:33:21 -04:00
a56f72b6af
Unify standard for event spawn points
2016-08-05 14:32:30 -04:00
4637bc8531
Prevent war times from displaying as negative
2016-08-05 14:31:13 -04:00
223fb0e526
Use custom explosion calculations as opposed to default mineplex explosion handling
2016-08-05 14:30:00 -04:00
d73ced0e87
Stop portals from spawning in mid-air
2016-08-05 14:28:49 -04:00
6170f9df87
Actually enable create button by removing stray '!'
2016-08-05 14:27:07 -04:00
027b6b3fc4
Prevent players from using /c home after recently being in combat
2016-08-05 14:25:47 -04:00
ce6a0b376c
Prevent players using the gui to bypass join cooldowns
2016-08-05 14:24:56 -04:00
e01b57ceac
Implement auto restart system for clans servers in off-peak times
2016-08-05 14:24:00 -04:00
ee1f2a7ef9
Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611)
2016-08-05 14:22:17 -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
3f0938815d
Merge branch 'update/clans' into develop
2016-08-03 12:39:52 -04:00
fb3cfecc79
Move recharge handler
2016-08-02 20:44:09 -04:00
4fdbb1fc9d
Fix assorted bugs
2016-08-01 14:48:44 -04:00
cd237b8d3b
Make players teleport to shops once they return to the nether
2016-07-30 17:42:57 -04:00
2d39dbfb58
Move clans admin text
2016-07-30 17:34:03 -04:00
fe92633802
Add claim limit override for admin claiming
2016-07-30 16:49:39 -04:00
d1d366dcf8
Add a cooldown to clans shops to reduce chance of edge-case negative gold balances
2016-07-30 09:46:02 -04: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
62e0a39ee8
Fix some medium graphics issues
2016-07-28 23:28:47 -04:00
841a44b8a6
Make clan create button functional
2016-07-28 21:02:04 -04:00
16804a860c
Made duping usage for class shop impossible
2016-07-28 20:22:30 -04:00
853fe31fbe
Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-28 19:11:39 -04:00
47d79bbad5
Fix bugs arising during clans release
2016-07-28 19:08:47 -04:00
a498bc13db
Reinstate async wrappers for clans gold access
2016-07-28 14:59:43 -05:00
4efe1fe76d
Make boss portals open where the boss spawned
2016-07-28 05:46:26 -04:00
639e089901
Disable clans tutorial
2016-07-28 04:28:34 -04:00
b718a72366
Fix shop chunk size being too small for map
2016-07-28 02:59:03 -04:00
d5a1312c48
Update border size to match new map
2016-07-27 20:46:40 -04:00
646ce96250
Ensure gold balance row is present
2016-07-27 16:15:03 -05:00
dfbebe11f4
Use separate gold balances for each clans server
2016-07-27 15:52:07 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
6180bea5cc
Update clans drop aesthetics and spawn/shop locations
2016-07-27 15:07:11 -04:00
167c0f2b5e
Reimplement EnergyShopButton with new machinery
2016-07-27 13:52:03 -05:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
d162750aec
Keep nether loaded if its not empty
2016-07-27 04:47:03 -04:00
ea3cb36d3a
Clean up miniboss mobs after their chunk unloads
2016-07-27 04:43:00 -04:00
85cf005eba
Small clans economy changes
2016-07-26 22:33:19 -04:00
d98ca0ab3c
Remove unused miniboss
2016-07-26 09:00:37 -04:00
bb5d766ba6
Patch war point evasion by committing suicide in safezones
2016-07-26 07:35:11 -04:00
34d5fb5e24
Fix craters getting glitched in wilderness
2016-07-26 07:15:40 -04:00
4df8de58a6
More javadocs
2016-07-26 05:51:42 -04:00
bf5e9f1d76
ADD JAVADOCS TO CLANS
2016-07-26 05:50:43 -04:00
61eca3ced0
Removed auto disguising from clans hub and removed clans tnt protection
2016-07-26 00:54:31 -04:00
7b358adba1
Prevent runed pickaxe from destroying the nether
2016-07-25 20:26:23 -04:00
a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
6f0d21120e
Serious tweaks to gameplay and begin documentation
2016-07-25 10:59:03 -04:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
869dfc1dfa
Finalize Amplifier system
2016-07-21 20:21:11 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
891a3231d8
Change banner GUI
2016-07-21 17:37:02 -04:00
1f2b1557d5
Work on amplifiers and deleting banners when the clan is deleted
2016-07-21 13:20:45 -04:00
1dedde41a8
Banners and beginning javadocs
2016-07-21 05:09:31 -04:00
29d52ac075
More work on Nether
2016-07-20 10:42:24 -04:00
c58d226680
More work on Nether and Runes
2016-07-18 16:26:05 -04:00
4238a1c385
Implement rune system and main nether minibosses
2016-07-17 07:14:08 -04:00
98e88d1b77
Disable bosses not scheduled for initial releases
2016-07-16 22:00:38 -04:00
08850d909f
Further work on brood mother boss and nether
2016-07-16 21:59:03 -04:00
2034b5536e
Update and enable Clans Freezing
2016-07-13 09:42:46 -04:00
f0db20dbc2
Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans
2016-07-12 05:21:50 -04:00
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
5c83f09456
SnapshotRepository no longer extends MinecraftRepository
...
It doesn't need to.
2016-07-08 23:26:33 -04: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
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
b409009069
Create a way to remove siege weapons for testing
2016-07-05 10:05:53 -04:00
cc7fc164bb
Implement Necromancer boss and give it some beginning attacks
2016-07-05 07:52:21 -04:00
37d11cdd60
Make Meridian Scepter stronger
2016-07-03 05:41:59 -04:00
d0a8ee18c0
Fix concurrent modification error caused by poison looping every tick
2016-07-02 19:07:55 -04:00
ceb62f8dc9
Fix lore
2016-07-02 18:41:20 -04:00
b3c230082a
Allowed Meridian Scepter to damage non-player entities
2016-07-02 18:34:35 -04:00
32c91e2e0c
Make start command more informative
2016-07-02 17:52:04 -04:00
1655811d43
Added help messages to WorldEvent command
2016-07-02 17:47:13 -04:00
54cda56c11
Initial Commit
2016-07-02 17:16:42 -04:00
050ae75e49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-02 13:33:33 -03: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
045e1b3064
Fix various Clans bugs
...
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
2016-06-30 05:20:44 -05:00
24186d9992
More fixes for gadget persistence
2016-06-28 18:11:00 -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
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
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
a33b070ae7
Deny placing skulls
2016-06-23 15:34:29 -04: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
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
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
f34c65111b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-18 00:48:00 +01:00
01409af5bd
Fix misc bugs
...
Change UtilServer to return proper plugin instance
Remove /energyshop debug command
Add warning for opening chests while in vanish
Fix item maps being broken
Fix tutorials possibly wiping inventory
Make the project compile
2016-06-16 16:39:43 -04:00
5c2a9d5807
Prefixes are too long or something
2016-06-15 21:52:25 -04:00
2d8b7f4ecd
Cleanse lore
2016-06-15 21:52:25 -04:00
18d7eba9db
Let's not eagerly delete clans
2016-06-15 21:52:25 -04:00
5564b07a36
Remove unnecessary serializations
2016-06-15 21:52:25 -04:00
9933345a7b
Remove debug messages
2016-06-15 21:52:25 -04:00
67f4361959
Cleanup CustomItems after a while
2016-06-15 21:52:25 -04:00
1e5d91e392
Make porting from old legendaries work, fix null commandcenter
2016-06-15 21:52:25 -04:00
d49ce27a1b
Make GearShop work again
2016-06-15 21:52:25 -04:00
808e506911
Revert "Revert "Clans optimizations""
...
This reverts commit 25a315ac05
2016-06-15 21:52:25 -04:00
45e6cb902f
Save changes
2016-06-15 21:52:25 -04:00
a753a3ab07
Clean up legendary code
2016-06-15 21:52:25 -04:00
197acee4ae
Implement server weighting
2016-06-11 13:47:45 +01:00
8e48b00264
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-09 15:16:38 +01:00
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
2410151371
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-05 17:46:27 -03:00
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
fdf500b090
Allow opening chest in incognito... silently!
2016-06-04 23:54:13 -04:00
3444c9c7d7
Remove anti-fly-kick
2016-06-04 23:54:13 -04:00
dc419cb53c
Add /speed command
2016-06-04 23:54:13 -04:00
15a1a63c15
Add try/catch to render map just in case
2016-06-04 23:54:13 -04:00
64e1288ba2
Add nullcheck to WarPointEvasion
2016-06-04 23:54:13 -04:00
f9826abc1e
Make field in MeridianScepter transient
2016-06-04 23:54:13 -04:00
dbf61c5652
Set walk speed on join
2016-06-04 23:54:13 -04:00
c5cbca3ed0
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-02 18:30:22 -03:00
f7adf731a9
Delete query command
2016-06-01 16:17:17 -04:00
25a315ac05
Revert "Clans optimizations"
...
This reverts commit 89da8790bf
2016-06-01 00:58:58 -05:00
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
Alexander Meech
cnr
Kenny
Sam
AlexTheCoder
samczsun
LCastr0
William Burns
Shaun Bennett
Shaun Bennett
Keir Nellyer
TadahTech
xGamingDudex
Shaun Bennett