Commit graph

4 commits

Author SHA1 Message Date
IThundxr
eccf2de123
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
2025-02-28 19:21:14 -05:00
IThundxr
783bc714b2
Update jenkins file 2025-02-28 19:20:17 -05:00
zelophed
40e1a30d83 maven prep 2025-02-27 18:03:05 +01:00
zelophed
8fdb2326d0 maven prep 2025-02-27 17:45:25 +01:00