1616 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Myles	1fd0211725	Merge pull request #1120 from creeper123123321/master ... ProtocolVersion#SUPPORTED_VERSIONS, relocate javassist	2018-12-13 11:57:05 +00:00
creeper123123321	1932c7af4f	ProtocolVersion#SUPPORTED_VERSIONS, relocate javassist	2018-12-13 09:47:58 -02:00
Myles	94422dab77	Merge pull request #1119 from creeper123123321/master ... Fix breaking change caused by VelocityPowered/Velocity@853fd22	2018-12-13 10:03:45 +00:00
creeper123123321	b10ca3ebcf	Fix breaking change caused by VelocityPowered/Velocity@853fd22	2018-12-13 07:41:05 -02:00
Myles	aa2ff4b741	Merge pull request #1118 from Gerrygames/1.14 ... 18w50a	2018-12-12 19:57:23 +00:00
Gerrygames	284a462936	18w50a	2018-12-12 20:48:52 +01:00
Myles	858e0a5b21	Merge pull request #1117 from creeper123123321/master ... Fix mappings, fixing shift click on furnaces	2018-12-10 19:46:09 +00:00
creeper123123321	eaa8e05373	Fix mappings, fixing shift click on furnaces	2018-12-10 17:23:29 -02:00
Myles	3e3d338ed0	Merge pull request #1116 from creeper123123321/master ... Recipe book	2018-12-10 15:09:20 +00:00
creeper123123321	0c5f5c6e3f	remove debug	2018-12-10 12:56:45 -02:00
creeper123123321	7c6118bd6f	facepalm	2018-12-10 12:54:06 -02:00
creeper123123321	7fe99c98f0	clicking in recipe doesn't work	2018-12-10 12:54:06 -02:00
creeper123123321	d6c4c18d35	still not working	2018-12-10 12:54:06 -02:00
creeper123123321	649676e811	trying recipes, currently not working	2018-12-10 12:54:05 -02:00
Myles	98c0985657	Merge branch 'master' into dev	2018-12-07 21:15:49 +00:00
Myles	43e93e74b1	Merge pull request #1113 from creeper123123321/master ... Fix chunk writing	2018-12-07 21:14:18 +00:00
creeper123123321	ba7817170b	Fix chunk writing	2018-12-07 19:10:40 -02:00
Myles	88279906b5	Merge pull request #1108 from Gerrygames/1.14 ... 18w49a	2018-12-06 08:45:13 +00:00
Gerrygames	134987cb20	18w49a	2018-12-06 09:32:53 +01:00
Myles	7b880ae967	Fix type being byte instead of int	2018-12-05 19:13:26 +00:00
Myles	7e8e3fef61	Merge branch 'master' into dev	2018-12-05 19:10:52 +00:00
Myles	c1147cb9f7	Formatting	2018-12-05 19:08:55 +00:00
Myles	54b35ef075	Merge branch 'master' into dev	2018-12-05 19:02:50 +00:00
Myles	fba0a59324	Merge pull request #1107 from creeper123123321/master ... Change Chunk#getBiomeData() to int[]	2018-12-05 19:01:25 +00:00
creeper123123321	c5c7d36bd1	Change Chunk#getBiomeData() to int[]	2018-12-05 16:52:53 -02:00
Myles	83ba55dda5	Merge pull request #1104 from Gerrygames/block-connections-master ... fix BlockConnectionStorage not being initialized	2018-12-03 08:26:46 +00:00
Gerrygames	000fff210a	fix BlockConnectionStorage not being initialized	2018-12-03 09:21:07 +01:00
Myles	8965b22f6d	Merge branch 'master' into dev	2018-12-02 12:38:10 +00:00
Myles	4023f2412d	Merge pull request #1093 from Gerrygames/block-connections-master ... Implement 'serverside-blockconnection' for block-connections.	2018-12-02 12:28:58 +00:00
Myles	27d56caa48	Merge pull request #1100 from creeper123123321/master ... Make Travis test compiling with Java 11	2018-11-29 15:36:14 +00:00
Myles	0cc1146f0e	Merge pull request #1103 from Gerrygames/1.14 ... 18w48a	2018-11-29 15:34:53 +00:00
Gerrygames	8aa7b749ca	18w48a	2018-11-29 16:31:39 +01:00
creeper123123321	55fad45a6c	Update Lombok to make compile on Java 11	2018-11-26 16:30:18 -02:00
creeper123123321	22cc12e7a9	Try to compile with Java 11	2018-11-26 16:30:12 -02:00
Myles	2812b121ab	Merge pull request #1099 from creeper123123321/master ... Fix Velocity platform breaking changes	2018-11-26 18:02:41 +00:00
creeper123123321	ad3465f0d3	Fix Velocity platform breaking changes	2018-11-26 15:58:17 -02:00
Marco Neuhaus	fc8b55dce7	fix spelling mistake	2018-11-24 18:42:00 +01:00
Myles	62d67e9a38	Merge pull request #1095 from Gerrygames/1.14 ... 18w47a	2018-11-21 16:23:30 +00:00
Gerrygames	079cd7210b	18w47a	2018-11-21 17:20:26 +01:00
Gerrygames	b60c56f464	Tripwire connections	2018-11-19 09:28:37 +01:00
Gerrygames	eb1571d3e4	init ConnectionData	2018-11-17 16:10:13 +01:00
Gerrygames	9a13eb36b3	Serverside block-connections!	2018-11-17 15:45:37 +01:00
Myles	9ba5cc1f98	Merge branch 'master' into dev	2018-11-17 14:11:04 +00:00
Myles	2778ec0d9d	Merge pull request #1060 from creeper123123321/dev ... Change item id to int, fix valid string being considered as invalid + tests	2018-11-17 13:48:31 +00:00
Myles	20b0954f8c	Missed one - oops	2018-11-17 13:47:58 +00:00
Myles	69aa7be6c5	Refactor tests to be one general test per method and include plugin	2018-11-17 13:46:32 +00:00
Myles	73dccbaf24	Merge branch 'pr/1045'	2018-11-17 13:15:20 +00:00
Myles	66d836739c	Merge pull request #1092 from Gerrygames/chunk-refactor ... Chunk refactor	2018-11-17 13:14:27 +00:00
Myles	ab1c44c4fb	Propose 2.0.0 snapshot as this version contains several API breaking changes	2018-11-17 13:13:55 +00:00
Myles	8549c22567	Change the name of the config class to be more consistent	2018-11-17 13:12:19 +00:00