Keir
e00c11ae28
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 11:17:49 +00:00
libraryaddict
627ce08113
Add info on note particle
2015-11-07 21:35:26 +13:00
Keir
0c0b3708c6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-06 01:34:13 +00:00
libraryaddict
c25b1969de
More progress
2015-11-04 04:00:53 +13:00
libraryaddict
f66c85d5b0
When clearing or getting items from player inventory, get it from player crafting as well
2015-11-03 18:57:41 +13:00
libraryaddict
3de906ab19
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
libraryaddict
3f66e11b3d
Add fence to non-full-solids
2015-11-03 12:39:13 +13:00
Cheese
b9d7c80f80
cow kit
2015-10-31 13:25:57 +11:00
libraryaddict
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
libraryaddict
388aa1611c
Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate
2015-10-30 15:44:37 +13:00
Cheese
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
libraryaddict
14df456b3d
Progres
2015-10-29 21:39:38 +13:00
Keir
38425f25fe
Add missing child overridden methods for chaining.
2015-10-28 16:03:02 +00:00
libraryaddict
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13:00
libraryaddict
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
libraryaddict
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
libraryaddict
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
libraryaddict
f71cb80bd0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
libraryaddict
70c76d976f
More changes
2015-10-16 22:10:13 +13:00
libraryaddict
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
libraryaddict
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
libraryaddict
dab258dcdd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
Mysticate
20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
Cheese
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
Mysticate
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
Mysticate
90c685617d
Animation
2015-10-09 22:14:01 -04:00
Cheese
99fd88473b
rank colors
2015-10-09 14:20:02 +11:00
Mysticate
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
Cheese
ec5694737c
statsmanager debug
...
rank fix
2015-10-09 11:44:12 +11:00
Cheese
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
alexmack929
6c73b1a5ac
Start moving i18n into master.
2015-10-04 15:24:58 +01:00
Mysticate
68c6ba595e
Visual enhancements.
2015-09-30 19:31:36 -04:00
Shaun Bennett
8a9cc9ff14
Food Dupe Fix
2015-09-28 20:42:14 -04:00
Mysticate
00eecc0325
Fixes
2015-09-28 20:33:38 -04:00
Mysticate
eea7ef8350
Swag
2015-09-27 02:11:28 -04:00
Mysticate
b2f1f7d2ae
Fixed the tracker for pilot.
2015-09-25 11:38:32 -04:00
Christopher Jozsa
9a3ef895c9
Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
2015-09-23 19:37:48 -05:00
fooify
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
Cheese
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
fooify
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
Cheese
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
Cheese
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
Cheese
a4cc70c3f0
new small youtuber rank
2015-09-10 13:17:11 +10:00
Mysticate
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Mysticate
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
Mysticate
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
Mini-Chiss
63107b0c26
missing file
2015-08-20 20:39:20 +02:00
