3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-19 09:20:08 +01:00
FastAsyncWorldEdit/worldedit-bukkit/adapters
dordsor21 3e847d05a7
Merge branch 'main' into feat/feature-placement
# Conflicts:
#	worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java
#	worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java
#	worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
#	worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
2024-06-27 15:17:37 +01:00
..
adapter-1_19_4 Merge branch 'main' into feat/feature-placement 2024-06-27 15:17:37 +01:00
adapter-1_20 Merge branch 'main' into feat/feature-placement 2024-06-27 15:17:37 +01:00
adapter-1_20_2 Merge branch 'main' into feat/feature-placement 2024-06-27 15:17:37 +01:00
adapter-1_20_4 Merge branch 'main' into feat/feature-placement 2024-06-27 15:17:37 +01:00
adapter-1_20_5 Merge branch 'main' into feat/feature-placement 2024-06-27 15:17:37 +01:00