output real class name (even if proxied) in craft.to_s
filtering and two modpacks
Items are now comparable
Handle non-pure (proxied) items in optimizer.
work around buggy Counter

Conflicts:
	lib/database.rb
allow passing db to solve

Conflicts:
	techtree.rb
autoload
autoload
Update AE, add ExtraCells
Fixups and remaining recipes
Merge branch 'master' of github.com:k3rni/mctechtree
Merge branch 'extracells'
Aroma1997's portable rechargers.
Clean up remainders of old quartz crystals.
Merge branch 'extracells'
Merge branch 'extracells' into sinatra
Merge branch 'master' into sinatra

Conflicts:
	lib/database.rb
	techtree.rb