Shaun Bennett
|
e66bebcfb1
|
Give all treaure items when opening the chest
|
2015-11-11 18:13:47 -05:00 |
|
Shaun Bennett
|
994a9e3e43
|
Clans Gui Work, commiting so I can switch branches
|
2015-11-11 18:05:48 -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 |
|
Keir
|
9573751a87
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-11 19:24:34 +00:00 |
|
Keir
|
727da2c6b5
|
Embarrassing typo.
|
2015-11-11 19:23:10 +00:00 |
|
Keir
|
f2e88c1c54
|
Only allow 1 player at a time to handle a report.
|
2015-11-11 19:05:29 +00:00 |
|
Keir
|
d7ba2e4731
|
Fix infinite gson loop by separating dependencies.
|
2015-11-11 16:12:28 +00:00 |
|
libraryaddict
|
ba7515f761
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-12 04:27:17 +13:00 |
|
libraryaddict
|
b915131407
|
Fix some armorstands and interaction bugs
|
2015-11-12 04:26:55 +13:00 |
|
Keir
|
9c45a48a26
|
Add confirmation message when a report is successful.
|
2015-11-11 15:05:36 +00:00 |
|
Keir
|
2722aeaaec
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-11 14:53:49 +00:00 |
|
Keir
|
191fa0ec53
|
Actually fetch the showUserReports value from the database.
|
2015-11-11 14:53:22 +00:00 |
|
Jonathan Williams
|
27ef2c0bbb
|
Fixed UtilEnt.Leash method.
|
2015-11-11 04:36:10 -06:00 |
|
Jonathan Williams
|
0e6146d5c9
|
Added expire to Stacker throw.
|
2015-11-11 04:32:56 -06:00 |
|
Cheese
|
3ed680e1c2
|
ms update
|
2015-11-11 15:55:48 +11:00 |
|
Cheese
|
ef2411b7d5
|
Merge branch 'master' into minestrike-update
|
2015-11-11 13:43:36 +11:00 |
|
libraryaddict
|
3e6d73221b
|
Disabled a fix
|
2015-11-11 15:21:17 +13:00 |
|
Cheese
|
4dd9b0967a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 12:50:07 +11:00 |
|
Cheese
|
a47752cfe2
|
disabled usage of /minecraft: commands in 1..8
|
2015-11-11 12:49:19 +11:00 |
|
Cheese
|
d971e3c8a3
|
ms update
|
2015-11-11 12:46:58 +11:00 |
|
libraryaddict
|
ee286c2676
|
Disable /minecraft commands
|
2015-11-11 13:49:06 +13:00 |
|
libraryaddict
|
7559d1feb5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-11 11:45:40 +13:00 |
|
libraryaddict
|
f18c55cbd9
|
Fix schedulers
|
2015-11-11 11:45:17 +13:00 |
|
Keir
|
f1c8564263
|
Fix preference inventory.
|
2015-11-10 21:40:35 +00:00 |
|
Keir
|
7d63a95ec9
|
Remove ALTER statement, modifications have been done.
|
2015-11-10 21:22:21 +00:00 |
|
Keir
|
fa9530b5bf
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-10 21:06:03 +00:00 |
|
Cheese
|
e3c22b356b
|
Merge branch 'master' into minestrike-update
|
2015-11-11 07:54:28 +11:00 |
|
Cheese
|
4eaa165826
|
such format
|
2015-11-11 07:54:13 +11:00 |
|
Cheese
|
59a054eeba
|
fixed merge erorr
|
2015-11-11 07:52:02 +11:00 |
|
Cheese
|
520eb55b88
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
|
2015-11-11 07:43:50 +11:00 |
|
Cheese
|
b3125e40ff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 07:43:01 +11:00 |
|
Keir
|
a81da156ac
|
Load show user reports value from database.
|
2015-11-10 16:08:16 +00:00 |
|
Keir
|
e59b5c2549
|
Actually show the report toggle action.
|
2015-11-10 16:07:32 +00:00 |
|
fooify
|
394d680470
|
Merge remote-tracking branch 'origin/master' into monster-league
|
2015-11-10 07:09:19 -08:00 |
|
fooify
|
ca1177685f
|
totally WIP commit
|
2015-11-10 07:08:08 -08:00 |
|
Keir
|
ff65231912
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
|
2015-11-10 11:38:29 +00:00 |
|
Keir
|
217ac78d49
|
Alter "accountPreferences" table to include a new column "showUserReports".
|
2015-11-10 11:38:13 +00:00 |
|
libraryaddict
|
6983af944f
|
Fix a craftbukkit bug
|
2015-11-11 00:25:20 +13:00 |
|
libraryaddict
|
37fdf53a51
|
Fixed champion's Illusion crash
|
2015-11-11 00:21:28 +13:00 |
|
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 |
|
AlexTheCoder
|
d654f1f4b1
|
- Fixed class edit in lobbies
- Fixed conflict between rave suit and assassin
|
2015-11-10 06:17:25 -05:00 |
|
libraryaddict
|
1a2c163ce2
|
Fix scoreboard out of bounds error
|
2015-11-11 00:03:08 +13:00 |
|
AlexTheCoder
|
e165cad50f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-10 04:53:32 -05:00 |
|
Jonathan Williams
|
6e90052480
|
Updated StaffServer to 1.8
|
2015-11-10 02:01:39 -06:00 |
|
Cheese
|
0a9c97c32a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 18:05:01 +11:00 |
|
Shaun Bennett
|
2707173a8b
|
Merge with 1.8 Branch
|
2015-11-10 01:48:33 -05:00 |
|
Keir
|
47c509c975
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
|
2015-11-09 22:55:00 +00:00 |
|
Cheese
|
83248a8fec
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 09:11:27 +11:00 |
|
Cheese
|
0ae5330634
|
squid changes
|
2015-11-10 09:11:10 +11:00 |
|
NewGarbo
|
1aef7fe0b9
|
bunch of fixes reported by qa in tutorials.
|
2015-11-09 20:46:38 +00:00 |
|