Merge branch 'master' into breaking

2019-04-05 15:47:04 +11:00
parent 140809c903 6f3888a963
commit 94d5d8df8e
43 changed files with 985 additions and 919 deletions
--- a/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java
+++ b/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java
@@ -33,8 +33,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;

-import static org.junit.Assert.*;
-
 public class CommandContextTest {

    private static final Logger log = LoggerFactory.getLogger(CommandContextTest.class);