dordsor21 06118b7ae3 Merge branch 'main' into feat/block-connections-updates ... # Conflicts: # 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/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java		2024-06-27 15:20:49 +01:00
..
adapters	Merge branch 'main' into feat/block-connections-updates	2024-06-27 15:20:49 +01:00
src	Merge branch 'main' into feat/block-connections-updates	2024-06-27 15:20:49 +01:00
build.gradle.kts	ref: switch from adventure NBT to LinBus (#2778)	2024-06-26 21:55:47 +02:00