Merge remote-tracking branch 'origin/1.7' into 1.7 · Foxikle/CustomNPCs@ad57a54 · GitHub

Commit

Merge remote-tracking branch 'origin/1.7' into 1.7

Browse files

# Conflicts:
#	v1_20_R1/build.gradle.kts
#	v1_20_R2/build.gradle.kts
#	v1_20_R3/build.gradle.kts
#	v1_21_R1/src/main/java/dev/foxikle/customnpcs/versions/NPC_v1_21_R1.java

Loading branch information

Foxikle committed Nov 17, 2024

2 parents c86dd22 + beebb57 commit ad57a54