Commit Graph

3359 Commits

Author SHA1 Message Date
Aaron Brock 7b73f73561 Switched updateTypes to use the key instead of the value.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 03:58:46 -04:00
Aaron Brock 085f9f16ca Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 03:52:45 -04:00
Aaron Brock b8b12d7f17 LobbyComponent.php added
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-05 03:52:35 -04:00
Cheese c7d758c8d8 fixed UpdateEvent
added WorldComponent
2015-07-05 17:50:18 +10:00
Cheese e24890d292 fixed some buggies 2015-07-05 15:26:56 +10:00
Cheese bde58fcad9 debug file 2015-07-05 15:14:24 +10:00
Cheese 7182205fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-05 15:13:33 +10:00
Cheese 8d2b1650af world component for MCPE 2015-07-05 15:13:18 +10:00
libraryaddict 4a71823d55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-05 13:37:22 +12:00
libraryaddict e002e4af18 Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises 2015-07-05 13:37:07 +12:00
Aaron Brock 514fe4a18a Added some stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-04 20:59:15 -04:00
Aaron Brock 00b5c6f3d4 Fixing/adding some things.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-04 03:01:56 -04:00
Aaron Brock 73ffc97cc9 A more complete BenchSchedule.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-03 14:14:24 -04:00
Aaron Brock f2f038f1cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-03 01:03:06 -04:00
Aaron Brock 060a928dd5 Added bench time stuff.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-03 01:02:16 -04:00
Cheese 556e524e18 changed notifications back to 75% sale 2015-07-02 16:14:47 +10:00
Aaron Brock 61d2247cee Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-01 22:12:42 -04:00
Aaron Brock 6d05e40df2 Things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 22:11:57 -04:00
Cheese 42580c09d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-02 12:06:04 +10:00
Cheese aa072d7f58 improved updateevent 2015-07-02 12:05:48 +10:00
Aaron Brock 0920c27040 Stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 21:59:38 -04:00
Aaron Brock dec7d55fb0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-01 20:12:07 -04:00
Aaron Brock a240181650 More stuff...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 20:11:07 -04:00
Cheese 1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
Cheese 607a94f985 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-02 09:41:47 +10:00
Cheese 0100ca1b8c fixed a derp bug 2015-07-02 09:41:33 +10:00
Aaron Brock 88241fa4d5 Added some stuff and things
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 18:36:05 -04:00
Aaron Brock 28927a5965 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-01 02:19:10 -04:00
Aaron Brock 7d55221515 Some game stuff I don't know why this no work!
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 02:12:19 -04:00
Aaron Brock e3b0ee9ae3 Switched it so it enables my game
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-01 02:02:51 -04:00
Cheese dd9fc8e7c6 bridge speed increase 2015-07-01 15:14:46 +10:00
Cheese 0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Cheese 190e58c37e bridges update 2015-07-01 12:58:54 +10:00
Cheese fcedb4d6ba added the plugin thingy that you need! 2015-07-01 00:27:28 +10:00
Cheese de36e3d8e4 added WATER_DAMAGE support for maps
modified some bridges code
2015-07-01 00:18:06 +10:00
Jonathan Williams c6e4c5c5e4 Fixed mineplexer server status link.
Fixed issue with ServerManager and default connection.
2015-06-30 03:49:53 -04:00
Cheese e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
Cheese a92fddc4a1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-30 10:13:03 +10:00
Jonathan Williams 24b2d35dda Removed unnecessary files for POcket. 2015-06-29 20:11:09 -04:00
Cheese 63ef877d46 removed stuff 2015-06-30 10:01:32 +10:00
Cheese 6976b48645 update 2015-06-30 09:57:24 +10:00
Jonathan Williams 78c5b63e85 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 19:43:58 -04:00
Jonathan Williams 59f0053419 Implemented Updater for PE 2015-06-29 19:43:35 -04:00
Ty Sayers cd4bebbeee Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-06-29 19:27:23 -04:00
Ty Sayers 1992205393 Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up. 2015-06-29 19:27:05 -04:00
Jonathan Williams 2069524f15 Merge remote-tracking branch 'remotes/origin/foo' 2015-06-29 18:14:07 -04:00
Jonathan Williams 5249fcc279 Removed Pocket log from source control. 2015-06-29 18:13:30 -04:00
Jonathan Williams bbb661d686 Fixed up BenefitManager. 2015-06-29 18:07:06 -04:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Jonathan Williams d426c24970 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:14:30 -04:00