Skip to content

Commit dea40d1

Browse files
TheMeinerLPTheMeinerLP
committed
Merge remote-tracking branch 'origin/feature/folia/1-20-update' into feature/folia/1-20-update
# Conflicts: # build.gradle.kts # worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java
2 parents d7bdaf0 + 946b08e commit dea40d1

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)