Resolve conflict with master
Adjust defaults
Fix oregen code for 1.7
Add optional craftable uranium
Add optional craftable uranium