2437 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zach Brown	57c2b8de43	Update upstream B/CB	2016-12-06 17:12:19 -06:00
Zach Brown	ebf1094ea5	Update upstream CB	2016-12-04 17:59:11 -06:00
Zach Brown	6c7152dbfe	Update upstream, fix accidental removal from last	2016-12-02 21:11:39 -06:00
Zach Brown	7e6d4b54e1	Don't remove random diffs in update	2016-12-02 21:06:21 -06:00
Zach Brown	f986ebbae5	Update upstream CB	2016-12-02 18:07:07 -06:00
Aikar	4de83c79ab	Optimize World.isLoaded(BlockPosition)Z ... Reduce method invocations for World.isLoaded(BlockPosition)Z	2016-12-02 00:20:34 -05:00
Aikar	5d1cc02e6a	Ignore "Unable to resolve BlockEntity" debug messages - Fixes #489	2016-12-02 00:02:18 -05:00
Zach Brown	357b402cbc	Update upstream B/CB some more	2016-12-01 19:34:07 -06:00
Zach Brown	7556f6a556	Update upstream B/CB	2016-11-30 21:10:14 -06:00
Techcable	33e453fcfd	Speedup BlockPos by fixing inlining	2016-11-30 21:03:50 -06:00
AlphaBlend	dfdd4e3334	Add source to PlayerExpChangeEvent	2016-11-30 17:33:06 -06:00
Zach Brown	951fbf46dc	Update upstream CB	2016-11-29 23:14:49 -06:00
Zach Brown	2bfdbc4afa	Update upstream CB	2016-11-29 18:02:20 -06:00
Zach	bc55c519de	Merge pull request #525 from jamierocks/pr/update-cb ... Update upstream CB	2016-11-29 14:29:34 -06:00
Jamie Mansfield	6a127779e7	Update upstream CB	2016-11-29 20:09:37 +00:00
kashike	7114e859b0	Merge pull request #524 from jamierocks/pr/resolve-previous-pr ... Resolve previous pr	2016-11-29 12:00:50 -08:00
Jamie Mansfield	b4c00f4b27	Resolve previous pr	2016-11-29 19:58:13 +00:00
willies952002	6d966ed034	Allow Reloading of Command Aliases ... Use "/reload commands" to reload the aliases stored in commands.yml	2016-11-28 21:54:19 -05:00
Zach Brown	ed6bd4ea4a	Update upstream B/CB - hitEntity added upstream	2016-11-28 17:16:07 -06:00
Zach	422dd712f9	Merge pull request #519 from jamierocks/pr/update-inv ... Update inventory. Fixes #505	2016-11-28 15:42:12 -06:00
Jamie Mansfield	b45c0327c8	Update inventory. Fixes #505	2016-11-28 21:32:05 +00:00
DemonWav	a594f94666	Update Paperclip	2016-11-27 23:27:33 -06:00
Zach Brown	9571357cce	Rebuild patches	2016-11-27 17:39:16 -06:00
Zach Brown	b324a0ec4f	More upstream CB	2016-11-27 17:37:38 -06:00
Zach Brown	ceec3e2219	Update upstream CB	2016-11-27 17:00:08 -06:00
Zach Brown	2807fdcf84	Update patch number	2016-11-27 16:54:10 -06:00
Zach	3f5dffc4e5	Merge pull request #517 ... Don't process packets from offline players	2016-11-27 16:23:17 -06:00
Alfie Cleveland	a2301816d0	Don't process packets from offline players	2016-11-27 22:17:55 +00:00
Alfie Cleveland	a0fce85086	Optimise removeQueue	2016-11-26 22:36:10 -06:00
Alfie Cleveland	ed90e5b3a6	Fix double lock in ServerConnection	2016-11-26 22:06:39 -06:00
Zach Brown	8c27c1fd27	Alter last to force conflicts but keep contents	2016-11-26 22:02:19 -06:00
Alfie Cleveland	324acd64b4	Optimise NetworkManager	2016-11-26 21:48:09 -06:00
Zach Brown	4056a8b468	Update upstream B/CB/S	2016-11-26 21:36:05 -06:00
Zach Brown	a68f5fbec0	Update upstream B/CB/S	2016-11-24 21:12:18 -06:00
vemacs	ddbf7318b2	Optimize network queue by making size() constant-time ... Idea from @AlfieC	2016-11-23 13:20:16 -05:00
Aikar	8d4d85ccb8	Merge branch 'vemacs-cachedthreadpool-login' ... * vemacs-cachedthreadpool-login: Cache user authenticator threads Idea from @AlfieC	2016-11-23 12:03:34 -05:00
vemacs	4eaa6f6dbc	Cache user authenticator threads ... Idea from @AlfieC	2016-11-23 08:48:47 -05:00
Zach Brown	4ea87e5378	Update upstream B/CB/S	2016-11-22 18:06:14 -06:00
AlphaBlend	5eebb50cf2	Relocate bad call to ProjectileHitEvent	2016-11-22 01:47:43 -05:00
Aikar	2290e5f85d	Update upstream	2016-11-21 18:00:40 -05:00
Zach	921963bce7	Merge pull request #490 from mikroskeem/master ... Fix building when parent directory with spaces is used	2016-11-21 16:32:17 -06:00
Zach Brown	97e0eac6e7	Update upstream B/CB	2016-11-21 15:51:27 -06:00
Zach Brown	eb877d8cdb	Update upstream CB	2016-11-20 17:02:00 -06:00
Mark Vainomaa	b872639961	Fix building when directory with spaces is used	2016-11-20 23:58:20 +02:00
Zach Brown	a27cdba309	Update upstream CB	2016-11-19 21:30:09 -06:00
Zach Brown	508ce52d68	Update upstream CB	2016-11-19 17:24:37 -06:00
Zach Brown	cb66c8dce7	Add ShulkerBoxes to the LootTable API	2016-11-19 11:31:01 -06:00
Zach Brown	26e4ac4330	Update upstream B/CB	2016-11-19 11:27:13 -06:00
Aikar	6b81efa677	Upstream update again	2016-11-19 00:16:42 -05:00
Aikar	9725050889	Update Upstream	2016-11-18 23:58:56 -05:00