Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers

Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-07-14 14:10:45 +02:00
commit 19d1edfbe7

View File

@ -1,6 +1,6 @@
minecraft.version=1.6.4 minecraft.version=1.6.4
forge.version=9.11.1.964 forge.version=9.11.1.964
oc.version=1.3.1 oc.version=1.3.2
oc.subversion=dev oc.subversion=dev
ccl.version=1.0.0.62 ccl.version=1.0.0.62
fmp.version=1.0.0.250 fmp.version=1.0.0.250