stuff you can craft should come up first
changed casing adding to add_item_or_charges
code is one } poorer
changed to _or_charges in veh_interact.cpp
changed the folding bike to use add_item_or_charges
change ranged.cpp to add_item_or_charges
player.cpp
npctalk.cpp
npcmove
npc
Add Umbrella item
Add umbrella effects
Reformat professions.json

File was hard to read due to messed up indentation.
Syntax fix
Solve merge conflicts

Conflicts:
	data/raw/items/melee.json
Adds the bride profession.

- Adds the wedding dress item.
- Adds the ability to specify flags for professions.
- Adds a profession::can_pick(player, points) function that allows more conditions for professions than just points.
Added cross-dresser negative trait.

You will take a morale penalty as cross-dresser if you're not wearing an item marked as typical for the opposite gender.
More MALE_TYPICAL/FEMALE_TYPICAL flags for clothing.
3l glass jars
Sealing kompot