Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added bell pepper #39547

Merged
merged 24 commits into from
May 9, 2020
Merged

Added bell pepper #39547

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
99055a7
added bell pepper seed
TheSalamanderDJ Apr 13, 2020
6826d9a
added bell pepper
TheSalamanderDJ Apr 13, 2020
4fa6d85
added cooked bell pepper
TheSalamanderDJ Apr 13, 2020
e973e8b
added bell pepper
TheSalamanderDJ Apr 13, 2020
03b5f98
added bell pepper seed
TheSalamanderDJ Apr 13, 2020
2408a2d
added cooked bell pepper
TheSalamanderDJ Apr 13, 2020
4fbb599
Update raw_veggy.json
TheSalamanderDJ Apr 14, 2020
c1a35ef
Update seed.json
TheSalamanderDJ Apr 14, 2020
254426d
Update veggy_dishes.json
TheSalamanderDJ Apr 14, 2020
4430312
Merge branch 'master' into master
TheSalamanderDJ Apr 14, 2020
ce64896
Update raw_veggy.json
TheSalamanderDJ Apr 14, 2020
f06903c
Update veggy_dishes.json
TheSalamanderDJ Apr 14, 2020
c1467db
Update raw_veggy.json
TheSalamanderDJ Apr 14, 2020
7cca5f8
Update raw_veggy.json
TheSalamanderDJ Apr 14, 2020
c7b154e
Update veggy_dishes.json
TheSalamanderDJ Apr 14, 2020
36de6c8
Update raw_veggy.json
TheSalamanderDJ Apr 14, 2020
c3aa217
Update seed.json
TheSalamanderDJ Apr 14, 2020
f5597fe
TheSalamanderDJ Apr 14, 2020
b248f4e
TheSalamanderDJ Apr 14, 2020
f8f44ae
Apply suggestions from code review
ZhilkinSerg May 9, 2020
324dcc9
Merge branch 'master' into master
ZhilkinSerg May 9, 2020
a9beef8
Apply suggestions from code review
ZhilkinSerg May 9, 2020
25f40cb
Apply suggestions from code review
ZhilkinSerg May 9, 2020
c536509
Apply suggestions from code review
ZhilkinSerg May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Apply suggestions from code review
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored May 9, 2020
commit c536509bd2ecd24709bd944ea8e9ffbe4fd6b854
2 changes: 1 addition & 1 deletion data/json/items/comestibles/raw_veggy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@
"material": "veggy",
"volume": "250 ml",
"flags": [ "SMOKABLE", "RAW" ],
"smoking_results": "dry_veggy",
"smoking_result": "dry_veggy",
"fun": -5,
"vitamins": [ [ "calcium", 2 ], [ "vitC", 12 ], [ "vitA", 8 ] ]
}
Expand Down