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
Syntax fix
Solve merge conflicts

Conflicts:
	data/raw/items/melee.json
3l glass jars
Sealing kompot
Spawn glass 0.5l and 3l jars more.
fix SIGSEGV in windows
Merge branch 'pr/2207'
- colorpair array changed from 50 to 100 elements to fit new color values
SmallFix: skill rust description