Merge remote-tracking branch 'upstream/master'

Browse Source

Conflicts:
	src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java

...

This commit is contained in:

Nick committed 2015-10-09 17:27:00 -07:00

2 parents 2099826500 d259783ead

commit 185e461f13

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