Merge branch 'updated_recipes' of github.com:MightyPirates/OpenComputers into updated_recipes

Browse Source

Conflicts:
	src/main/scala/li/cil/oc/integration/gregtech/RecipeRegistry.scala

...

This commit is contained in:

Johannes Lohrer 2015-04-19 20:53:13 +02:00

parent 7a248833b7 f534e1b3b6

commit b78c446c22

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