Byron Marohn 2259f7d025 Merge upstream changes through 88f22f2e ... This was not a straightforward merge. A new method was added upstream to: worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java This file has been substantially changed vs upstream worldedit. I merged things as best I could - added the new method to this interface, and then implemented it in: worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java Unfortunately there's no easy way to test that it works - so I left a note... Signed-off-by: Byron Marohn <combustible@live.com>		2018-12-23 19:58:49 -08:00
..
assembly	Switch to Gradle. Use git log --follow for history.	2014-11-14 11:27:39 -08:00
java	Merge upstream changes through 88f22f2e	2018-12-23 19:58:49 -08:00
resources	Merge upstream changes through 7961fa58	2018-12-21 12:13:43 -08:00