1388 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Myles	4f84200a47	Merge upstream	2018-08-12 20:29:30 +01:00
Myles	e4a99c4a3d	Merge pull request #942 from creeper123123321/buffer-changes ... Replace Unpooled.buffer()	2018-08-12 20:27:44 +01:00
Myles	75adf7c9d4	Merge pull request #969 from creeper123123321/master ... Metadata rewriting, noteblocks and enchanting	2018-08-12 20:26:44 +01:00
Myles	5fc693da22	Merge pull request #964 from creeper123123321/dev ... Some untested code	2018-08-12 20:26:17 +01:00
creeper123123321	12e2f8b35a	Make enchanting table show the enchantment correctly	2018-08-12 09:56:39 -03:00
creeper123123321	1e7dbac34e	Reduce cooldown	2018-08-11 12:31:45 -03:00
creeper123123321	e39876ae67	Use unpowered note block	2018-08-11 06:54:38 -03:00
creeper123123321	ff3bc9a0cd	Rewrite block action, effect, tags and advancements; palette rewriting	2018-08-10 19:21:35 -03:00
creeper123123321	dfe1850b93	Merge remote-tracking branch 'upstream/master' into dev	2018-08-10 18:34:32 -03:00
Myles	6f50fdc026	Merge pull request #962 from ForceUpdate1/master ... add support for 18w32a	2018-08-09 21:00:47 +01:00
Marco Neuhaus	5c490be861	remove file header	2018-08-09 09:25:00 +02:00
Marco Neuhaus	849c7b4fcf	fix wrong import	2018-08-08 23:35:14 +02:00
Marco Neuhaus	fd5bb94cb5	code cleanup	2018-08-08 22:32:29 +02:00
Marco Neuhaus	647bbbedb0	add items remapping	2018-08-08 21:45:54 +02:00
Marco Neuhaus	6cfb21f660	add support for 18w32a	2018-08-08 18:58:25 +02:00
creeper123123321	c709b019e1	Use ChatRewriter.legacyTextToJson in metadata rewriting	2018-08-06 15:31:05 -03:00
Myles	faabe5afb2	Merge pull request #958 from creeper123123321/master ... Biomes / Bungee relay msgs	2018-08-05 22:04:52 +01:00
creeper123123321	798bf15155	Remove unused code	2018-08-05 17:54:17 -03:00
creeper123123321	543daa2628	Rewrite invalid biomes	2018-08-05 17:45:22 -03:00
creeper123123321	3bdf81158a	Rewrite BungeeCord's plugin channel format	2018-08-05 17:26:14 -03:00
creeper123123321	9b42094273	Rewrite bungeecord relay messages	2018-08-04 07:37:33 -03:00
Myles	94f3fcba12	Merge pull request #953 from ForceUpdate1/master ... Add support Snapshot 18w31a	2018-08-03 22:17:46 +01:00
Marco Neuhaus	58b30341ee	remove comment headers	2018-08-03 23:15:59 +02:00
Marco Neuhaus	741e0f8fda	add support for 18w31a	2018-08-01 20:20:52 +02:00
creeper123123321	d8885f9156	Put prefix last color into the start of suffix	2018-07-30 08:49:32 -03:00
creeper123123321	e9aa18fd6b	Fix memory leak	2018-07-29 09:34:27 -03:00
creeper123123321	7518f8b98b	Replace Unpooled.buffer() ... (cherry picked from commit e9159cb2de)	2018-07-29 09:11:55 -03:00
Myles	c9dab5402e	Merge pull request #923 from creeper123123321/master ... Named sound effect rewriting + Effect rewriting	2018-07-29 12:59:01 +01:00
creeper123123321	e5169378fc	Revert "Replace Unpooled.buffer()" ... This reverts commit e9159cb	2018-07-29 08:56:26 -03:00
creeper123123321	ca23750c28	merge upstream^2 + lowercase sound ids	2018-07-29 08:31:48 -03:00
creeper123123321	446fd84035	merge upstream	2018-07-29 08:30:58 -03:00
Myles	fc264d0b0f	Cleanup various debug code	2018-07-29 12:14:17 +01:00
Myles	e9ad372039	Remap negative ids to air (workaround for #933)	2018-07-29 11:48:38 +01:00
creeper123123321	b1e8efb00b	Fix memory leak	2018-07-28 17:53:17 -03:00
creeper123123321	73ee2498e8	More optimization	2018-07-25 18:12:38 -03:00
creeper123123321	6608877ef0	Rewrite palette instead of rewriting each block	2018-07-25 18:03:25 -03:00
creeper123123321	e9159cb2de	Replace Unpooled.buffer()	2018-07-25 09:04:06 -03:00
creeper123123321	a403c7424c	*facepalm*	2018-07-24 10:55:08 -03:00
creeper123123321	de2abdcab0	*facepalm*	2018-07-23 10:20:41 -03:00
creeper123123321	088ce93701	Use short[] for sound remapping	2018-07-23 10:15:55 -03:00
creeper123123321	b5a7c92c8d	Add missing .toClient	2018-07-22 19:11:29 -03:00
creeper123123321	d4144264d5	Use short[] for block mappings	2018-07-22 19:03:22 -03:00
creeper123123321	b221530276	Update Protocol1_13To1_12_2.java	2018-07-22 18:02:17 -03:00
creeper123123321	8476c83d62	Merge branch 'master' into master	2018-07-22 18:01:04 -03:00
Matsv	9d624bc822	Reimplement advancements by rewriting the items to flat items	2018-07-22 22:58:18 +02:00
creeper123123321	f15c841b99	Hacky fix to noteblock	2018-07-22 17:51:18 -03:00
creeper123123321	019bccd24a	Rewrite advancements	2018-07-22 17:06:43 -03:00
creeper123123321	584c0709e8	Block data	2018-07-22 16:24:38 -03:00
creeper123123321	d577088b8c	Named sound effect rewriting + Effect rewriting (thanks @Pokechu22)	2018-07-22 15:15:40 -03:00
Mats	72f5d8addc	Merge pull request #910 from creeper123123321/master ... Fix bungee-chat italic, bold, obfuscated, underline, strikethrough	2018-07-22 03:24:51 +02:00