Merge branch 'feature/magic_item' into develop
fixing menu for magic items

still only potions, removed the builder since it wasn't even close to functional
Merge branch 'feature/magic_item' into develop

close enough
fixing bug with effect name display
Simple planet generator and builder
refactored menus to take up less space
tweaked shapes to make more sense
scrolls are now ready
oops.

removing debug statement
Adding a nifty potion icon
first round of deity data
deity data is formatted, wooo
Update scroll.data
first phase

Still don't know what to do with the Deity/NPC relationship...
Merge pull request #4 from deadshot15/patch-1

Update scroll.data... AWESOME.
Making great headway on formatting for deities
deity generator most done, except sects
adding menu entry for deity
Merge branch 'feature/deitygenerator' into develop

man that looks nice
Merge branch 'develop' of github.com:CityGenerator/Megacosm-Generator into develop