AJ Ferguson 8061e2d76d Merge remote-tracking branch 'remotes/upstream/master' into inventory ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java # connector/src/main/java/org/geysermc/connector/utils/Toolbox.java		2019-12-23 16:58:59 -09:00
..
skin	Players spawn, player skins, scoreboard, bossbar and updated protocol lib	2019-09-25 23:52:28 +02:00
biome_definitions.dat	new remapper (:	2019-08-05 21:59:54 -04:00
creative_items.json	Exclude Edu items from creative	2019-12-21 01:35:34 -09:00
entity_identifiers.dat	new remapper (:	2019-08-05 21:59:54 -04:00
items.json	Update bedrock assets	2019-12-10 21:01:56 -06:00
legacy_block_ids.json	new remapper (:	2019-08-05 21:59:54 -04:00
legacy_item_ids.json	new remapper (:	2019-08-05 21:59:54 -04:00
runtime_block_states.dat	Block states and fix waterlogged blocks	2019-12-20 20:05:20 -09:00