Merge remote-tracking branch 'architectury/1.16' into 1.17

# Conflicts:
#	.github/workflows/push.yml
This commit is contained in:
shedaniel
2021-05-20 22:25:25 +08:00
2 changed files with 4 additions and 3 deletions

2
.github/FUNDING.yml vendored
View File

@@ -1,2 +1,2 @@
patreon: shedaniel
github: [ shedaniel, MaxNeedsSnacks ]
github: MaxNeedsSnacks