Shaun Bennett
|
e8b0e5dd8e
|
Fix IntellIJ Files
|
2015-12-13 23:51:47 -05:00 |
|
Shaun Bennett
|
b22c64ca6a
|
Fix excludes
|
2015-12-08 05:51:21 -05:00 |
|
Shaun Bennett
|
a84f580719
|
Update IntelliJ to Java 8
|
2015-12-08 05:45:26 -05:00 |
|
Shaun Bennett
|
7c947ad97b
|
Merge master
|
2015-11-28 23:55:00 -05:00 |
|
Shaun Bennett
|
52c55335fa
|
Add chunk to unclaim map
|
2015-11-17 18:33:21 -05:00 |
|
Shaun Bennett
|
c4e188296a
|
Fix compiler and misc
|
2015-11-12 17:55:00 -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 |
|
NewGarbo
|
7a8a5918c0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/.idea/dataSources.xml
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
** CONFLICTS ALL FIXED **
|
2015-11-09 08:59:37 +00:00 |
|
libraryaddict
|
79d0466355
|
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/Arcade.java
|
2015-11-07 21:36:36 +13:00 |
|
Shaun Bennett
|
ec7600a4a2
|
Giveaway tweaks
|
2015-11-07 01:10:27 -05: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 |
|
Shaun Bennett
|
9c38e8039e
|
Add clans to compiler
|
2015-10-01 22:59:42 -04:00 |
|
Ty Sayers
|
b4c9bfbb57
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
|
2015-09-29 18:09:52 -04:00 |
|
Shaun Bennett
|
cf618abd4e
|
BotSpam Module
|
2015-09-22 01:38:45 -04:00 |
|
Shaun Bennett
|
62cf58bd55
|
Fix a bug where claiming a new land would display that land as neutral
|
2015-08-29 13:56:26 -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
|
adfc451e9f
|
You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift
|
2015-08-27 09:33:44 -07:00 |
|
Shaun Bennett
|
b13c9fe227
|
Field updates, War updates, bug fixes
|
2015-08-26 12:26:27 -07:00 |
|
libraryaddict
|
a1ea03f74b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
|
2015-08-14 19:44:56 +12:00 |
|
William Burns
|
0c5cc25634
|
Stuff
|
2015-08-03 12:48:17 +01:00 |
|
William Burns
|
a964f343c7
|
xml files are ew
|
2015-08-01 14:55:01 +01:00 |
|
Shaun Bennett
|
16bad71dcc
|
1.8 Updates
|
2015-07-27 20:26:37 -05:00 |
|
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
|
Shaun Bennett
|
3f9010fb7a
|
Fix GameScore comparator
|
2015-06-09 13:21:15 -05:00 |
|
Shaun Bennett
|
8c7faf27dd
|
Store gold drop amounts in item metadata (might be worth switching to our own storage?)
|
2015-06-06 16:04:11 -05:00 |
|
Shaun Bennett
|
2cb87b23e6
|
Stat Gui, Start of Treasure Gui (disabled)
|
2014-08-24 16:08:19 -05:00 |
|
Chiss
|
508ef65fcf
|
Added missing file
|
2014-08-16 14:17:15 +10:00 |
|
CoderTim
|
aa6b5324eb
|
Set up IntelliJ IDEA
|
2014-05-20 00:39:50 -04:00 |
|