Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/stable' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@dries-c
dries-c committed Jan 24, 2020
2 parents d990056 + 8184a6b commit a223101
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/pocketmine/resources/vanilla
Submodule vanilla updated 11 files
+35 −20 README.md
+ − biome_definitions.nbt
+11 −2 block_id_map.json
+59 −14 creativeitems.json
+6 −3 entity_id_map.json
+ − entity_identifiers.nbt
+14 −1 item_id_map.json
+ − r12_to_current_block_map.nbt
+1,585 −461 recipes.json
+0 −4,235 required_block_states.json
+ − required_block_states.nbt

0 comments on commit a223101

Please sign in to comment.