Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-03-30 18:01:38 +02:00
commit 3605970ce1

View File

@ -1,6 +1,6 @@
minecraft.version=1.7.2
forge.version=10.12.0.1046
oc.version=1.2.4
oc.version=1.2.5
ccl.version=1.0.0.62
fmp.version=1.0.0.250
maven.url=file:///var/www/users/fnuecke/maven.cil.li