EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-03 02:33:43 +01:00
Code Issues Projects Releases Wiki Activity
Files
74c6fc954e8916f9cec4b2fe616941c691f23f94
PlotSquared/Bukkit
History
dordsor21 74c6fc954e Merge branch 'v6' into feature/v6/pipeline-queue 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
#	Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java
2020-07-17 17:16:49 +01:00
..
src/main
Merge branch 'v6' into feature/v6/pipeline-queue
2020-07-17 17:16:49 +01:00
build.gradle
Add wna block setting, use WorldEdit worlds rather than Strings.
2020-07-17 14:38:50 +01:00
pom.xml
Merge branch 'v6' into feature/v6/platform
2020-07-14 19:05:05 +02:00