Skip to content

Commit 09e773c

Browse files
author
Valandur
committed
Merge branch 'release/v4.0.0'
2 parents 7858196 + 3f25485 commit 09e773c

File tree

191 files changed

+21541
-7925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+21541
-7925
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ run/
44
*.iws
55
out/
66
.idea/
7+
webapi.ipr

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies {
3535
compile group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.8.7"
3636
compile group: "org.reflections", name: "reflections", version: "0.9.10"
3737
compile group: "net.jodah", name: "typetools", version: "0.4.9"
38+
compile group: "org.mindrot", name: "jbcrypt", version: "0.4"
3839
}
3940

4041
jar {
@@ -49,6 +50,7 @@ shadowJar {
4950
relocate "javax.servlet", "valandur.webapi.shadow.javax.servlet"
5051
relocate "org.reflections", "valandur.webapi.shadow.org.reflections"
5152
relocate "net.jodah", "valandur.webapi.shadow.net.jodah"
53+
relocate "org.mindrot", "valandur.webapi.shadow.org.mindrot"
5254

5355
exclude "/about.html"
5456
exclude "/jetty-dir.css"

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
group=valandur.webapi
2-
version=3.5.1
2+
version=4.0.0
33
minecraftVersion=1.11.2
4-
spongeVersion=7.0
4+
spongeVersion=6.1

0 commit comments

Comments
 (0)