Merge branch 'master-MC1.10' into master-MC1.11

Browse Source

# Conflicts:
#	src/main/resources/assets/opencomputers/recipes/default.recipes

...

This commit is contained in:

payonel 2018-11-06 20:16:37 -08:00

parent 538419e375 731b125d72

commit ad050fde4b

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