Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/production'
# Conflicts: # bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/RestoreAdapter.java # resetadapter_aswm/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/AdvancedSlimeAdapter.java # resetadapter_slime/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/SlimeAdapter.java # resetadapter_slimepaper/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/SlimePaperAdapter.java # versionsupport_v1_19_R3/pom.xml # versionsupport_v1_20_R1/pom.xml # versionsupport_v1_20_R2/pom.xml
- Loading branch information