Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/client/java/de/cscherr/mcpht/mixin/client/BlockMixin.java

...

This commit is contained in:

Christoph J. Scherr 2023-11-11 00:50:41 +01:00

parent 1f625f795c bddabd405c

commit 57f90824a2

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

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

Diff Content Not Available