Jesse Boyd 64a134a9ee Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system ... # Conflicts: # build.gradle # worldedit-core/build.gradle # worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java		2019-04-01 23:50:16 +11:00
..
src	Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system	2019-04-01 23:50:16 +11:00
build.gradle	Make master build (probably)	2019-03-24 20:58:05 +01:00