accomplish tombstone(...) rendering
update todo list
todo list..
retrdoor rail
rendering...
amend
Re-added industrial diamond recipe

Industrial diamond -> diamond
Stupid Greg...
AO rendering(wip)
Merge remote-tracking branch 'origin/master'
fix diamond recipe
...
am..
Merge branch 'airtransporter'

Conflicts:
	cyb/6.png
	cyb/cyb1.java
	cyb/item_retrdoor.java
	cyb/recipe.java
Fixed a stupid mistake
Merge branch 'master' into airtransporter

Conflicts:
	cyb/cyb1.java