Merge remote-tracking branch 'origin/master' into fabric/master

Browse Source

# Conflicts:
#	src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java

...

This commit is contained in:

Sebastian Hartte

2020-08-02 15:46:11 +02:00

parent a97ebaf40d 5fca946ef3

commit 7f7b794c0b

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