Merge branch 'master' of github.com:ProjectEdenGG/Parchment

Browse Source

# Conflicts:
#	patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch

...

This commit is contained in:

Blast-MC

2024-01-25 20:05:33 -05:00

parent 794a665f20 711c006e16

commit b7cfec3d53

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available