Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
#	version.properties

...

This commit is contained in:

Quarris

2021-09-29 11:01:45 +01:00

parent 18ca1529f8 e71f77d4c7

commit 33837a4c98

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