Merge branch 'master' into universal-wires

This commit is contained in:
Calclavia 2013-12-01 14:01:49 +08:00
commit 138038e7f1

View file

@ -23,12 +23,12 @@
<fileset dir="../Minecraft Forge Latest/"/>
</copy>
<get src="http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/NotEnoughItems-dev%201.6.1.5_d1.jar"
dest="${dir.mcp}/lib/NEI-dev.jar"/>
<get src="http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/CodeChickenCore-dev%200.9.0.7.jar"
<get src="https://www.dropbox.com/s/kq64jh9y6v27gc9/CodeChickenCore-dev-latest.jar?dl=1"
dest = "${dir.mcp}/lib/CCC-dev.jar"/>
<get src="https://www.dropbox.com/s/k87amrbzcglbpnd/NotEnoughItems-dev-latest.jar?dl=1"
dest="${dir.mcp}/lib/NEI-dev.jar"/>
<copy todir="${dir.mcp}/src/minecraft">
<fileset dir="${dir.development}common">