3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-19 17:30:08 +01:00
FastAsyncWorldEdit/worldedit-bukkit/adapters/adapter-1_20_5
dordsor21 2a79b602e2
Merge branch 'main' into feat/block-connections-updates
# Conflicts:
#	worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightGetBlocks.java
#	worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightGetBlocks.java
#	worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
#	worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java
#	worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java
2024-06-21 08:17:19 +01:00
..
src/main/java/com/sk89q/worldedit/bukkit/adapter Merge branch 'main' into feat/block-connections-updates 2024-06-21 08:17:19 +01:00
build.gradle.kts Update dependency paperweight-userdev to v1.20.6-R0.1-20240615.211816-120 (#2794) 2024-06-17 01:44:06 +00:00