Skip to content

Commit

Permalink
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput…
Browse files Browse the repository at this point in the history
…ers into OC1.5-MC1.7.10

Conflicts:
	build.properties
fnuecke committed Oct 17, 2015
2 parents 5588de9 + 99f9794 commit ab607f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
minecraft.version=1.7.10
forge.version=10.13.4.1448-1.7.10

oc.version=1.5.18
oc.version=1.5.19
oc.subversion=

ae2.version=rv2-beta-26

0 comments on commit ab607f0

Please sign in to comment.