378 commits

Author	SHA1	Message	Date
Redned	7a4621cf51	Fix 'version' typo in startup message	2019-11-27 22:33:45 -06:00
RednedEpic	ee4a01e304	(Actually) fix offline mode skins	2019-11-27 21:22:27 -06:00
Redned	0e7fff0b9b	Fix permissions	2019-11-27 20:58:58 -06:00
RednedEpic	9875d204e3	Add more entity metadata translations and fix autojump (Closes #73)	2019-11-27 19:30:30 -06:00
Redned	2e90759f40	Merge pull request #87 from GeyserMC/feature/1.13-bedrock ... 1.13 Support	2019-11-27 10:09:58 -06:00
Redned	f06eb6f718	Bump NukkitX protocol library version	2019-11-27 09:58:57 -06:00
RednedEpic	5c7ecbd203	Fix end crystal entity	2019-11-26 21:12:35 -06:00
RednedEpic	c67630dfb1	Update to latest NukkitX Protocol changes	2019-11-26 20:03:23 -06:00
RednedEpic	ca9fc4e64c	Merge remote-tracking branch 'origin/feature/1.13-bedrock' into feature/1.13-bedrock	2019-11-26 19:53:29 -06:00
RednedEpic	8725dba69c	Fix offline mode console spam for skins	2019-11-26 19:52:13 -06:00
Redned	beda8f24b4	Merge pull request #84 from Tim203/feature/1.13-bedrock ... Fixes errors related to skins	2019-11-26 19:45:43 -06:00
Redned	d7568ef523	Fix entity types with wrong names	2019-11-22 17:54:36 -06:00
AJ Ferguson	0fe1a302a3	Update mappings	2019-11-20 17:28:40 -09:00
Tim203	068033aeaa	Fixes errors related to skins	2019-11-19 21:31:24 +01:00
RednedEpic	577aa6c8fc	Add unload chunk translator	2019-11-17 15:40:13 -06:00
RednedEpic	d203485418	Add entity status translator	2019-11-17 15:29:49 -06:00
RednedEpic	51c1792d67	Only send one empty chunk upon login	2019-11-15 22:21:26 -06:00
RednedEpic	73c9ee313c	Add fox entity type	2019-11-15 22:10:23 -06:00
RednedEpic	3e8ab6ca83	Fix players not showing up ... Skins still need some work as it applies to every player online rather than a specific player; however, players are now visible regardless.	2019-11-15 21:25:43 -06:00
Redned	68b9f66e88	Fix tabs in formatting from previous commit	2019-11-14 21:07:22 -06:00
LegacyGamerHD	38ae400d0c	add phew entity flags (#79) ... * Add some entity flags * goddangit stupid web editor * whoops (Some information pulled from BMan's pull request for flags)	2019-11-14 21:04:30 -06:00
AJ Ferguson	7d4cb06fbe	Fix crash on login	2019-11-13 17:26:45 -09:00
RednedEpic	cfdaacf017	Minor cleanup	2019-11-12 22:28:47 -06:00
RednedEpic	3ffaf5c0e5	Attempt to fix crashes on login	2019-11-10 16:53:01 -06:00
AJ Ferguson	e676a428fb	Fix dropped items	2019-11-10 03:41:39 -09:00
RednedEpic	21ddf8af1e	Update block palette	2019-11-09 11:14:31 -06:00
RednedEpic	90e6ebc1be	More work on 1.13	2019-11-05 18:55:59 -06:00
RednedEpic	18c13067b8	Set version for ResourcePackStackPacket	2019-11-02 16:14:28 -05:00
Redned	a4b2a016f8	Set version for pong and StartGamePacket from bedrock packet codec	2019-11-02 15:58:50 -05:00
Redned	5fee344743	Fix block palette	2019-11-02 15:50:04 -05:00
RednedEpic	9b7fe5c879	Remove init method from previous testing	2019-10-30 21:27:34 -05:00
RednedEpic	0e2f64b95a	Start on 1.13 changes (not functional yet) ... Cached palette still needs fixing, therefore this build actually does nothing yet.	2019-10-30 21:14:23 -05:00
AJ Ferguson	a65a14c2f2	Fix block breaking in creative	2019-10-27 01:56:47 -08:00
Redned	6b0c45b6c1	Set 'auth-type' to online by default	2019-10-21 19:23:39 -05:00
AJ Ferguson	2bab0d1d19	Calculate attribute modifiers and fix sprinting/sneaking	2019-10-17 23:54:20 -08:00
RednedEpic	a45fdc508d	Fix fishing bobbers	2019-10-16 16:26:41 -05:00
RednedEpic	298b5e7a53	Fix colored titles	2019-10-16 16:16:58 -05:00
RednedEpic	d548647367	Fix/implement entity interaction and fix sprinting	2019-10-16 15:32:53 -05:00
RednedEpic	7571df9903	Attempt to reduce memory usage and fix not being disconnected from Java	2019-10-16 13:55:05 -05:00
RednedEpic	20dda985bc	Comment out unneeded collision code ... This may be handy in the future, but right now it serves no purpose.	2019-10-16 13:10:27 -05:00
RednedEpic	eabbacaaad	Remove unnecessary null checks for missing mappings ... "Missing mappings" are given placeholder values upon startup, so these null checks are pointless.	2019-10-15 22:21:44 -05:00
RednedEpic	0ac89f4880	Implement dimension changing and debugize 'moved too quickly' messages	2019-10-15 21:47:28 -05:00
RednedEpic	f6ab70cabb	Remove empty Remapper class from merge conflict	2019-10-13 15:28:46 -05:00
RednedEpic	5cf96ec5be	Update to latest MCProtocolLib version	2019-10-13 15:28:03 -05:00
RednedEpic	e815f58265	Fix sprinting (for now)	2019-10-13 14:41:49 -05:00
RednedEpic	3c9fab9fc4	Merge branch 'remapper' into master	2019-10-11 19:24:08 -05:00
RednedEpic	7c3a38698d	Fix compile error	2019-10-11 18:58:40 -05:00
Redned	30d15707a6	Merge pull request #41 from Tim203/master ... Players spawn, skins and capes, scoreboard, bossbar, fixes and updated protocol lib	2019-10-11 18:56:32 -05:00
RednedEpic	8c541304a6	Convert item and block maps in Toolbox to TIntObjectMaps	2019-10-11 18:38:34 -05:00
Tim203	c462017149	Improved remapper performance	2019-10-11 00:15:23 +02:00
Tim203	0e97e52337	Only notify debuggers that parsing GameProfile data failed and use the default skin and cape	2019-10-10 23:27:30 +02:00
Tim203	46cb14fc0a	Removed unused class and made PlayerList show every player again	2019-10-10 23:16:07 +02:00
AJ Ferguson	2261cfe76a	Update blocks.json	2019-10-10 12:49:18 -08:00
AJ Ferguson	c0c9fe95fb	Also fix digging acknowledgement block update	2019-10-09 17:41:41 -08:00
RednedEpic	2da7709cd1	Fix block updates (and add support for neighboring blocks)	2019-10-09 20:03:18 -05:00
RednedEpic	a125967ec3	Implement new remapper	2019-10-09 19:11:50 -05:00
EOT3000	c556fa94ea	Fix red sand/regular sand mix	2019-10-09 17:07:56 -04:00
Tim203	15506cf5b4	Edited PlayerInit behavior and updated protocol lib to 2.3.0	2019-10-09 20:39:38 +02:00
EOT3000	d99c285676	Entity interact?	2019-10-07 14:30:08 -04:00
Tim203	a7bd9da644	Bugfixes	2019-10-05 00:29:33 +02:00
Tim203	89550a5ecb	Bugfixes	2019-10-04 19:25:08 +02:00
Tim203	ee97585036	Merge branch 'master' into master	2019-10-03 19:09:59 +02:00
Tim203	5eb7565b0a	Third party capes, rotation fixed, wait for the client and updated protocol lib	2019-10-02 22:45:29 +02:00
Redned	91a80f7dee	Fix crash after first disconnect (#48) (Closes #10) ... Fix crash after first disconnect	2019-10-01 20:08:59 -05:00
AJ Ferguson	4b0d777128	Fix crash after first disconnect	2019-10-01 15:36:33 -08:00
Redned	fe567bb3cc	Merge pull request #47 from LoudSoftware/missing-mobs ... Added some missing mobs	2019-09-30 21:02:42 -05:00
Nicolas Znamenski	0a961fd2f7	Added parameters on dolphin and added support for Drowned, Pandas and Turtles	2019-09-30 20:40:07 -04:00
AJ Ferguson	ac8fd0cde8	Handle digging acknowledgement from server	2019-09-30 14:18:29 -08:00
AJ Ferguson	fe845710b6	Fix for block breaking	2019-09-30 14:17:36 -08:00
EOT3000	da0c59446f	Try fixing block break (didn't work). Also add more metrics	2019-09-30 12:44:25 -04:00
AJ Ferguson	6fa25aa264	Only send release packet if action type is 0 ... Needed for eating to work correctly	2019-09-29 15:39:03 -08:00
AJ Ferguson	1364eb1df7	Add ability to use items ... Now able to use bows, eat food, throw ender pearls, etc.	2019-09-29 15:25:42 -08:00
WesleyVanNeck	c8404d15c1	fix that unknown Configuration crashes geyser	2019-09-29 20:05:41 +02:00
Redned	a18bbaf9ea	Break all the bedrock action switch cases	2019-09-27 18:04:58 -05:00
EOT3000	792adb3447	Block break supported. Ignore the exceptions	2019-09-27 17:38:52 -04:00
EOT3000	3d986c47fa	Block place supported	2019-09-27 16:50:48 -04:00
Tim203	0b193c04e7	Players spawn, player skins, scoreboard, bossbar and updated protocol lib	2019-09-25 23:52:28 +02:00
Nicolas Znamenski	1d4837f5e0	Finished moving thread pool size to config	2019-09-22 18:15:27 -04:00
Nicolas Znamenski	550d94c4c3	Changed the thread pool size to be part of the config.	2019-09-22 18:08:12 -04:00
RednedEpic	0bcf4aa7ec	Fix metrics, remove JSONSimple dependency	2019-09-21 11:00:13 -05:00
Redned	2a0d7eb73b	Don't shade lombok into final jar ... Lombok is just an annotation processor, it doesn't need to be included in the final jar; it just need to be available at compile time.	2019-09-21 10:14:46 -05:00
Tim203	069bb778ac	Merge branch 'master' of https://github.com/GeyserMC/Geyser	2019-09-21 09:59:35 +02:00
Tim203	cbdf4f7633	Made paintings not crash the client, bugfixes and improvements	2019-09-21 09:42:44 +02:00
Redned	2502879bde	Add difficulty translator	2019-09-20 23:11:17 -05:00
RednedEpic	b6d4bf5147	Fix most all metadatable items not showing up (for the most part) ... The actual block data translation (like stair rotation) all needs to be done still, but this is a huge step toward getting that complete.	2019-09-17 21:15:34 -05:00
Tim203	30b9caf5fa	Corrected some stuff	2019-09-17 00:45:39 +02:00
Tim203	1c74a6252a	Some fixes, added playerlist. Entity spawning doesn't work yet	2019-09-17 00:28:29 +02:00
Redned	4b3dfc09f9	Fix gamemode changing	2019-09-15 20:34:57 -05:00
Redned	fac7093bff	Add position checker to prevent false movements ... Sometimes this caused bugs on servers and made anticheats go wild. This should resolve most of the movement issues regarding that.	2019-09-15 20:25:16 -05:00
Redned	ef7800a739	Move block translations to separate class ... This is to be expanded upon further at a later date	2019-09-15 19:04:54 -05:00
Redned	5d87b7ccab	Cleanup startup messages	2019-09-15 18:46:05 -05:00
Redned	7f051bd6bc	Start work on a basic chunk cache and block collision detection	2019-09-15 18:34:14 -05:00
Tim203	0690b30c02	Made logging a bit more useful	2019-09-15 09:57:02 +02:00
Redned	21ddc83da8	Implement multi-block chunk updates	2019-09-14 23:23:14 -05:00
Redned	c606119c1d	Fix entities glitching out and teleporting to the wrong location	2019-09-14 23:19:13 -05:00
EOT3000	3f45b21689	Block changes work (again)	2019-09-14 19:21:55 -04:00
EOT3000	074442aac9	Block changes work (again)	2019-09-14 11:33:58 -04:00
EOT3000	77c8acefdb	Block changes work	2019-09-14 11:26:49 -04:00
EOT3000	eb00721f3d	Merge remote-tracking branch 'origin/chunks' into chunks	2019-09-13 22:53:39 -04:00
EOT3000	26a043fd0a	null is probably solid! Like dirt!	2019-09-13 22:53:16 -04:00
RednedEpic	061642f9ab	Fix bug where player was spawned inside of a block upon joining	2019-09-13 20:22:00 -05:00
RednedEpic	1bf4e5289a	Implement more player actions	2019-09-13 20:12:36 -05:00
RednedEpic	664723a768	Update default movement speed value	2019-09-13 19:38:06 -05:00
RednedEpic	a69aa8ebdb	Implement player movement	2019-09-13 19:37:06 -05:00
RednedEpic	03bf12ee65	Implement more block mappings	2019-09-13 18:49:46 -05:00
SupremeMortal	c9be13d487	Fix AIOOBE and remove PlayerSession usage.	2019-09-13 15:45:55 +01:00
SupremeMortal	ab55050d11	Close remote java connection when bedrock player leaves.	2019-09-13 14:37:31 +01:00
SupremeMortal	9a9f67b45f	Get chunks working to some degree.	2019-09-13 11:49:18 +01:00
SupremeMortal	ed7213d7c7	Remove IntelliJ files @EOT3000 added... and more chunk changes.	2019-09-13 10:39:38 +01:00
SupremeMortal	d8388d0315	Merge remote-tracking branch 'upstream/chunks' into chunks ... # Conflicts: # connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java	2019-09-13 10:15:43 +01:00
SupremeMortal	7a6d3f4604	Various chunk tweaks.	2019-09-13 10:08:48 +01:00
Redned	7bda95cfb2	Set non-air blocks on the block layer	2019-09-11 22:22:46 -05:00
EOT3000	db864b7e51	try more chunk stuff	2019-09-11 18:54:51 -04:00
EOT3000	59e0aff289	Hybrid mode start + try fixing chunks (hashcodes, etc.)	2019-09-11 16:28:48 -04:00
RednedEpic	6cb80dea28	Minor cleanup upon initial block remap	2019-09-10 18:45:46 -05:00
SupremeMortal	72589fabcd	Rename palette to BitArray and fix various chunk issues. ... No idea if this works since I have no Java Edition server to test on.	2019-09-10 22:50:34 +01:00
RednedEpic	383429d71b	Fix a few chunk errors ... This does not fix chunks on its own, they're still very much a work in progress, however this commit should hopefully resolve a few issues. The client might still crash due to some invalid mappings (most likely), but this should bring us one step closer. With hardcoded values for the chunks, the client wouldn't crash (which leads me to the conclusion stated above) and on the occasions that it would not time out, the chunks were empty. Co-authored-by: SupremeMortal <suprememortal@users.noreply.github.com>	2019-09-08 15:46:10 -05:00
RednedEpic	bd8a00b5eb	Merge branch 'master' into chunks	2019-08-30 16:56:34 -05:00
RednedEpic	1c1785ac51	Start work on chunks ... - There are probably many errors and issues with this code (some dumb ones probably). As of right now it crashes the client.	2019-08-30 16:47:33 -05:00
Redned	7aa4457f34	Uncomment disconnect code for downstream disconnect ... - This should hopefully reduce spam in console when a java client is disconnected. The disconnect handler will be rewritten later to address the not being able to reconnect issue.	2019-08-23 22:49:48 -05:00
RednedEpic	b611f8facb	Rewrite remapper	2019-08-09 22:16:34 -05:00
RednedEpic	f1c34a4ca5	Add respawn translator (Closes #23)	2019-08-09 19:15:06 -05:00
RednedEpic	7dae4cbd0f	Fix NPE for items with missing mappings (Closes #24)	2019-08-09 16:09:47 -05:00
EOT3000	33c4c115ab	more fixes	2019-08-08 21:54:02 -04:00
EOT3000	c621ead6d9	fix things	2019-08-08 21:50:29 -04:00
RednedEpic	ba21acc9c8	Cleanup adding/removing players	2019-08-08 20:42:55 -05:00
RednedEpic	295d8d5256	Fix double disconnect bug and minor code cleanups	2019-08-08 18:16:46 -05:00
EOT3000	de78c93b72	chunks. Still don't work, but hey, it doesn't crash or hang!	2019-08-08 18:14:08 -04:00
EOT3000	7c807740a4	even more mappings!	2019-08-07 19:56:44 -04:00
EOT3000	d22861d61b	remap fixes	2019-08-07 19:08:48 -04:00
RednedEpic	cadd779f43	Implement entity attribute support	2019-08-06 01:39:39 -05:00
EOT3000	b66631407b	api stuff	2019-08-05 22:14:41 -04:00
EOT3000	7fccb0d69d	new remapper (:	2019-08-05 22:09:45 -04:00
EOT3000	5318a664b8	Merge remote-tracking branch 'origin/master' ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java	2019-08-05 22:05:56 -04:00
EOT3000	202e3e584c	new remapper (:	2019-08-05 21:59:54 -04:00
RednedEpic	c926c7d8fa	Remove unnecessary duplicate of StartGamePacket	2019-08-05 15:30:56 -05:00
RednedEpic	eaf57550e5	Implement support for changing held item	2019-08-05 15:16:45 -05:00
RednedEpic	9399296908	Fix NBT translations (for the most part)	2019-08-04 17:23:19 -05:00
RednedEpic	5be882b040	Fix wrong EntityType in JavaSpawnPlayerTranslator	2019-08-04 15:53:39 -05:00
RednedEpic	128769dee8	Minor refactors and tweaks, update README	2019-08-03 22:24:53 -05:00
RednedEpic	bfa4abf9c8	Merge remote-tracking branch 'origin/master'	2019-08-03 20:45:01 -05:00
Logicism	fc50242c47	Fix Redudant Gamemode Code	2019-08-03 18:20:15 -07:00
Logicism	ebd1e502f2	Add Gamemode Change and Titles Times Translator w/ Scoreboard Registry	2019-08-03 18:01:16 -07:00
RednedEpic	1d1cdd4f42	Set Ipv4 port for BedrockPong	2019-08-03 01:56:54 -05:00
RednedEpic	c114e4d541	(A lot) more work on entities	2019-08-03 01:51:05 -05:00
RednedEpic	d496d4958e	Start work on entity translations	2019-08-02 22:38:09 -05:00
Blue Kelp	fda221c12c	fixup example xbox username	2019-08-02 14:01:01 -07:00
Blue Kelp	ae9d51c8b7	log user auto-logins and note to improve	2019-08-02 13:55:26 -07:00
Blue Kelp	bf7c74e072	fix cert/handshake error	2019-08-02 13:55:06 -07:00
Blue Kelp	5f93b5bec4	null safety on auth/handshake errors	2019-08-02 13:54:40 -07:00
Blue Kelp	f62aa390d2	support auto-login of configured users ... - fall back to window/form prompt if user is not configured	2019-08-02 13:15:32 -07:00
Blue Kelp	168778026a	refactor file utils for reuse	2019-08-01 21:16:17 -07:00
Blue Kelp	6f5c9a535e	consolidate with existing utils class	2019-08-01 21:15:11 -07:00
Blue Kelp	9bebfd5ded	pull out auth window code into util class	2019-08-01 21:15:11 -07:00
Blue Kelp	491737202d	refactor auth code out	2019-08-01 21:15:11 -07:00
Blue Kelp	909b81275b	fixup default logging base class ... - removed translation of some packets (left over from original source) - all events are handled the same way now and translation is only performed in the subclass	2019-08-01 18:53:35 -07:00
Blue Kelp	e85e16ecfe	move boilerplate event stuff ... - logging performed in single method of base class	2019-08-01 18:38:21 -07:00
RednedEpic	eb28de7857	Temporarily comment out NBT code so inventory doesn't bug out	2019-08-01 15:31:03 -05:00
Redned	3151788cd0	Merge pull request #16 from LogicismDev/master ... Scoreboard	2019-07-31 17:46:00 -05:00
RednedEpic	3784ba7baa	Code cleanups and update ItemTranslator to work with new mappings	2019-07-31 14:59:23 -05:00
EOT3000	8c2897dbec	new remaps	2019-07-30 20:10:27 -04:00
EOT3000	0bb3bc49d9	comment out remap function, because we won't need it for a while!	2019-07-30 08:38:37 -04:00
Logicism	c7869e77e8	Scoreboard Fix	2019-07-29 19:57:43 -07:00
Logicism	fe833edddb	Scoreboard Fix	2019-07-29 19:47:49 -07:00
EOT3000	66bc2753f7	add re-mappings	2019-07-29 22:25:13 -04:00
RednedEpic	8a0c1f7208	Add planks translators	2019-07-29 17:40:38 -05:00
RednedEpic	1e4e729b6b	Add wool/carpet translators	2019-07-29 17:39:51 -05:00
RednedEpic	6ba8614612	Move inventory translators to the proper package	2019-07-29 17:28:01 -05:00
RednedEpic	8220131f7d	Merge branch 'master' into inv	2019-07-29 17:26:15 -05:00
RednedEpic	635a26dd60	Start work on inventory/item translators	2019-07-29 17:20:48 -05:00
RednedEpic	bbacbfdf66	Fix invalid package declarations	2019-07-25 23:26:42 -05:00
Ryan Hecht	39bc9baf16	Added JavaEntityDestoryTranslator and JavaSpawnExpOrbTranslator	2019-07-24 22:03:59 -07:00
Ryan Hecht	2a07e05877	Refactored Java packets to follow package structure of MCProtocolLib, removed redundant 'JavaTimeTranslator'	2019-07-24 21:44:15 -07:00
RednedEpic	77ea4eda60	Encrypt bedrock packets	2019-07-24 17:53:42 -05:00
RednedEpic	dbfbaf47cd	Cleanup and refactor translator code	2019-07-24 15:13:07 -05:00
RednedEpic	df6836e12b	Add authentication/online mode support	2019-07-24 01:29:54 -05:00
RednedEpic	d6aa75b2f7	Bump Java protocol library	2019-07-23 18:44:53 -05:00
RednedEpic	c90784feb7	Bump Bedrock protocol library	2019-07-23 18:44:30 -05:00
RednedEpic	657f12654b	Add form API and other small changes	2019-07-23 18:16:25 -05:00
RednedEpic	ff11a55884	Call the PingEvent	2019-07-23 11:53:39 -05:00
RednedEpic	caebb8e4f4	Add weather packets	2019-07-23 11:47:40 -05:00
RednedEpic	81ad1542ee	Add some entity translators	2019-07-23 11:47:39 -05:00
EOT3000	a2e4aed340	Merge remote-tracking branch 'origin/master' ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java	2019-07-23 08:05:43 -04:00
EOT3000	f0551727ca	First Event!	2019-07-22 10:20:49 -04:00
RednedEpic	ccb52007fc	Allow connected sessions to run Geyser commands	2019-07-21 19:52:20 -05:00
RednedEpic	58819ea9ce	Finish ping-passthrough option	2019-07-21 18:52:39 -05:00
EOT3000	464e9cbd2a	Merge remote-tracking branch 'origin/master' ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java	2019-07-21 19:14:09 -04:00
RednedEpic	a01a07aee3	Add time translator	2019-07-21 17:36:45 -05:00
RednedEpic	82f56a7c34	Code cleanups	2019-07-21 17:22:56 -05:00
RednedEpic	d0347c537d	Add debug option to prevent console spam	2019-07-21 16:18:20 -05:00
RednedEpic	49dc3bbe60	Add translators for title/subtitle/actionbar	2019-07-21 15:53:56 -05:00
RednedEpic	75d38abe1d	Add hand animations	2019-07-21 15:39:03 -05:00
EOT3000	9d9611cbbf	Start chunk conversions	2019-07-21 15:48:36 -04:00
RednedEpic	78438121bd	Add support for commands	2019-07-20 20:21:11 -05:00
RednedEpic	a777add304	Add chat translators	2019-07-20 20:10:30 -05:00
SupremeMortal	b2f366f7b4	Fix crashes.	2019-07-20 23:35:14 +01:00
RednedEpic	2d079b2ddf	More attempts at fixing crash bug	2019-07-20 15:49:58 -05:00
RednedEpic	a369ebccf7	Fix compile errors	2019-07-20 14:56:32 -05:00
RednedEpic	769b6a47fd	Update cached pallete	2019-07-20 14:56:01 -05:00
EOT3000	c2fe6d1066	Merge remote-tracking branch 'origin/master' ... # Conflicts: # connector/src/main/java/org/geysermc/connector/utils/Toolbox.java	2019-07-18 20:13:42 -04:00