Merging upstream changes

Browse Source

...

This commit is contained in:

matt

2019-03-26 13:27:09 -04:00

parent 85bfd16d7c

commit 0d88a6bce2

23 changed files with 1708 additions and 1768 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

1610

worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java

File diff suppressed because it is too large Load Diff