Merge branch 'OC1.5-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

This commit is contained in:
Florian Nücke 2015-02-20 01:45:46 +01:00
commit cab8085c2b
10 changed files with 1 additions and 1 deletions

View File

@ -2,7 +2,7 @@ minecraft.version=1.8
forge.version=11.14.1.1313
oc.version=1.5.0
oc.subversion=dev
oc.subversion=
ae2.version=rv1-stable-1
bc.version=6.2.6