Upstream Merge

Browse Source

...

This commit is contained in:

MattBDev

2020-01-10 22:32:12 -05:00

parent b2be1ea9fb

commit 0d2fff2cd2

81 changed files with 2528 additions and 23695 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

17003

worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.115.json

File diff suppressed because one or more lines are too long

6191

worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.115.json

File diff suppressed because one or more lines are too long