Shaun Bennett
|
bbc7bf770c
|
1.8 Fixes - Still doing map fix
|
2015-11-12 19:18:42 -05:00 |
|
Shaun Bennett
|
0b41450603
|
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c.
|
2015-11-12 17:51:13 -05:00 |
|
Shaun Bennett
|
6c17b2926c
|
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
|
2015-11-12 16:35:31 -05:00 |
|
NewGarbo
|
ce1c09b88f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
|
2015-11-11 19:35:44 +00:00 |
|
Shaun Bennett
|
7761ca7e6f
|
Remove debug messages
|
2015-08-28 12:56:43 -07:00 |
|
Shaun Bennett
|
cd145324d8
|
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
|
2015-08-28 12:00:23 -07:00 |
|
Shaun Bennett
|
4f2d861b21
|
Fix chat bug, enable TablistFix for clans
|
2015-08-27 14:53:52 -07:00 |
|
Shaun Bennett
|
16bad71dcc
|
1.8 Updates
|
2015-07-27 20:26:37 -05:00 |
|
Shaun Bennett
|
da3500cc32
|
Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
# Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
# Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
# Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
# Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
# Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
# Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
# Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
|
2015-07-27 19:39:18 -05:00 |
|
Shaun Bennett
|
cc1219fd38
|
[Spigot] Spigot class change for Ty
|
2015-05-28 15:24:10 -05:00 |
|
Shaun Bennett
|
73719e0df3
|
Fix world particles issues
|
2015-05-03 15:30:58 -05:00 |
|
Shaun Bennett
|
ff6da92fb7
|
Some Build world, support for far rendered particles
|
2015-05-03 14:41:09 -05:00 |
|
Shaun Bennett
|
cf4353bedf
|
Delete some classpath dummy changes, jsonmessage fixed
|
2015-04-22 16:37:45 -04:00 |
|
Shaun Bennett
|
50c38dc467
|
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
|
2015-03-31 17:22:50 -04:00 |
|
Shaun Bennett
|
336ba50f59
|
Rename some enum values for treasures, update my packet change
|
2015-02-09 23:24:43 -05:00 |
|
Shaun Bennett
|
2f64b5f401
|
1.8 tablist fix - spigot needs to be updated!
|
2015-02-05 23:09:20 -05:00 |
|
Shaun Bennett
|
5b9b7347c6
|
Add tab complete processing for commands
|
2014-11-10 23:49:35 -06:00 |
|
Shaun Bennett
|
62d4804aa6
|
Update Craftbukkit.jar for new chat features
|
2014-10-15 11:10:28 -05:00 |
|
CoderTim
|
3ba748f2de
|
Merge branch 'feature/currency-log'
|
2014-10-13 23:13:44 -04:00 |
|
Shaun Bennett
|
2a2191f23b
|
Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams
|
2014-10-05 21:16:40 -05:00 |
|
CoderTim
|
f6f484c134
|
Refactored /npc commands
|
2014-10-02 22:08:00 -04:00 |
|
CoderTim
|
91a2266a04
|
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
|
2014-09-05 04:00:51 -04:00 |
|