Commit Graph

6545 Commits

Author SHA1 Message Date
Joseph Prezioso Jr
09db5a8131 I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04:00
Cheese
8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
William Burns
e7245bcc11 Merge pull request #15 from Mineplex-LLC/feature/slack-api
Add a Slack API for sending messages through plugins.
2016-03-27 10:15:30 +01:00
William Burns
c1adb7e1bc Remove Slack attachment functionality (for now). 2016-03-26 13:12:59 -04:00
William Burns
29966195ee Create an API for sending Slack message to multiple teams and channels. 2016-03-26 13:07:41 -04:00
Jonathan Williams
105f62e563 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-03-23 16:02:30 -05:00
Jonathan Williams
ee22274ef5 Removed Stacker debug messages. 2016-03-23 16:02:06 -05:00
Shaun Bennett
1e73adf2af Increase ram and cpu for event server 2016-03-23 10:23:04 +11:00
Shaun Bennett
656780d027 Change runAsync in MiniPlugin to use our own thread pool
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
Shaun Bennett
da9a642a6d Process item for treasure before opening 2016-03-23 10:21:36 +11:00
Shaun Bennett
309b5464f2 Clean up Account Repository, attempt to load account ID from cache 2016-03-23 10:21:02 +11:00
Shaun Bennett
a107c38f28 Comment out missing ring game kit so we can compile 2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Jonathan Williams
c9fdd83e17 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-03-21 20:31:04 -05:00
Jonathan Williams
2cff7003e6 Added more debug to Stacker interaction. 2016-03-21 20:30:54 -05:00
Shaun Bennett
61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
Jonathan Williams
b4dfeb224b Reduced NCP exempt time by .5s. 2016-03-21 02:06:11 -05:00
Jonathan Williams
faf6834e23 Added some protection for stacker and offline players. 2016-03-20 16:27:59 -05:00
Jonathan Williams
750b960b46 Fixed references to snake events. 2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58 Moved snake events to their own classes.
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa Fix with TurfForts infinite while loop. 2016-03-20 15:46:57 -05:00
Jonathan Williams
3bc8dd0098 Fixed bug with infinite loop in Bridges MushroomSpawn. 2016-03-20 00:32:33 -05:00
Jonathan Williams
8427ead097 Changed how currency types is initialized to avoid possible NPE 2016-03-19 15:33:16 -05:00
git
557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00
Virizion
67e844db29 Added /e bridge <seconds> PC-17 2016-03-08 21:21:53 -05:00
Virizion
6c0d18662f Added /e clear <player or @a> PC-16 2016-03-08 20:45:23 -05:00
Virizion
c89669aec9 Add /e announce <text> PC-15 2016-03-08 20:23:33 -05:00
Virizion
b1c8158e2f Added @a argument to /shard, /gem and /giveitem PC-13 2016-03-08 19:52:31 -05:00
Shaun Bennett
9b65926d42 Fix rank monthly rewards description 2016-03-08 13:26:26 -06:00
git
0f752fb7e3 Fix custom names in 1.9 2016-03-08 16:11:12 +13:00
git
280d03daa7 Fix names 2016-03-08 09:52:30 +13:00
git
496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
Shaun Bennett
d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
git
6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
git
0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Shaun Bennett
28486c8d65 Merge pull request #10 from Mineplex-LLC/Dual_1.9
Dual 1.9 Build
2016-03-02 13:00:09 -06:00
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
git
2062ca7efc Updated patch 2016-03-01 13:05:12 +13:00
Shaun Bennett
e8d5165634 Merge pull request #9 from Mineplex-LLC/develop
Merge v1.2.0 into Master
2016-02-27 20:06:55 -06:00
git
0284fed2a9 Update patch 2016-02-28 13:12:59 +13:00
Shaun Bennett
775b6eeffa Merge pull request #7 from Mineplex-LLC/feature/dmt-update
Draw My Thing Update
2016-02-26 04:38:10 -06:00
Shaun Bennett
b0301bbf24 Merge pull request #4 from Mineplex-LLC/feature/parser-commands
Add extra commands to the map parser
2016-02-26 04:34:18 -06:00
Shaun Bennett
923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns
268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
9a8c410448 Fix lore being null. 2016-02-25 15:39:18 +00:00