Alexander Söderberg e20319f4e1

Merge branch 'v5' into backups ...

# Conflicts:
#	Core/src/main/java/com/plotsquared/core/configuration/Captions.java

2020-05-11 20:15:48 +02:00

..

src

Merge branch 'v5' into backups

2020-05-11 20:15:48 +02:00

build.gradle

Don't relocate json-simple.

2020-04-18 21:14:44 +02:00

pom.xml

Don't dump biome array on /ps reload. Gradle also seems to want to change the Core pom.

2020-04-16 11:43:13 +01:00