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

Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-07-08 20:42:42 +02:00
commit 24fccd0dfe
2 changed files with 3 additions and 1 deletions

View File

@ -1,7 +1,7 @@
minecraft.version=1.7.2
forge.version=10.12.2.1121
oc.version=1.3.0
oc.subversion=rc.1
oc.subversion=
ccc.version=1.0.1.7
ccl.version=1.1.1.80
fmp.version=1.1.0.282

View File

@ -22,3 +22,5 @@ Many component methods have a short documentation - use `=component.componentNam
You can get a list of all attached components using the `components` program.
If you encounter out of memory errors, throw more RAM at your computer.
Have you tried turning it off and on again?
To disable this greeting, install OpenOS to a writeable medium and delete `/etc/motd`.
Change the text size by changing the screen resolution - try using the `resolution` program.