Merge branch 'forestry' of github.com:Voidi/ModTweaker2 into forestry

Browse Source

Conflicts:
src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java

...

This commit is contained in:

Tobias Wohlfarth committed 2015-01-26 21:40:49 +01:00

2 parents 3e070271b1 37e7395682

commit 4544cc84f4

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