Commit Graph
100 Commits
Author SHA1 Message Date
Anduin XueandGitHub d2f831fcdb Merge pull request #717 from WLHSDXN/add-newDish
ADD 耗油生菜 To HowToCook
2022-03-19 21:48:23 +08:00
Anduin XueandGitHub 64f497a24f Merge branch 'master' into add-newDish 2022-03-19 21:46:54 +08:00
Anduin Xue 01d26c0c98 Fix lint. 2022-03-19 21:46:26 +08:00
Anduin XueandGitHub 75fa8df266 Update 无骨鸡爪.md 2022-03-18 18:45:28 +08:00
Anduin XueandGitHub 073cfa620b Merge pull request #707 from donghao0210/wugufengzhua
加食谱
2022-03-18 01:30:06 -07:00
Anduin XueandGitHub 2e3bbb9da9 Merge pull request #706 from AstralLing/master
fix typo
2022-03-17 09:47:37 -07:00
Anduin XueandGitHub 3a74fce07b Merge pull request #701 from YuAo/patch-1
Fix typo
2022-03-17 00:46:58 -07:00
Anduin XueandGitHub 02f482c9a9 Merge pull request #700 from RanKKI/fix/typo
fix: typo 蚝油
2022-03-17 00:46:44 -07:00
Anduin Xue 985eafc2be Upgrade to 1.1.0 2022-03-15 13:46:22 +08:00
Anduin Xue 71d5669ef7 lint 勺 2022-03-15 13:44:53 +08:00
Anduin XueandGitHub c88dd812e9 Merge pull request #695 from NickDunnew/食品安全-过敏
食品安全-过敏
2022-03-15 00:55:03 +00:00
Anduin XueandGitHub e9d383e5fd Merge pull request #693 from boababy/mywork
羊排焖面
2022-03-13 14:12:18 +00:00
Anduin Xue ab5122095a Fix more lint. 2022-03-13 14:09:46 +08:00
Anduin XueandGitHub 927544099b Merge pull request #688 from ryuujo1573/patch-1
🌟Update 食品安全.md
2022-03-13 05:54:31 +00:00
Anduin XueandGitHub e243bcb08e Merge pull request #691 from AuroraTea/master
add a picture for semi-finished\炸薯条
2022-03-13 05:54:21 +00:00
Anduin XueandGitHub 0885ab4ede Merge branch 'master' into master 2022-03-13 05:53:49 +00:00
Anduin XueandGitHub 9cd8a7ee91 Merge branch 'master' into patch-1 2022-03-13 05:53:43 +00:00
Anduin XueandGitHub 687cf054c5 Merge pull request #690 from cuohua/master
Update 凉拌黄瓜.md 并 Add 学习凉拌.md
2022-03-13 05:53:34 +00:00
Anduin XueandGitHub 8340d4e99b Merge branch 'master' into master 2022-03-13 05:52:21 +00:00
Anduin XueandGitHub cecf184699 Merge branch 'master' into patch-1 2022-03-13 05:52:18 +00:00
Anduin XueandGitHub f93d070f23 Merge branch 'master' into master 2022-03-13 05:52:10 +00:00
Anduin Xue d164a0a0d2 Fix all manual lints. 2022-03-13 13:51:54 +08:00
Anduin Xue 1f9e50cd5d 修正提拉米苏的格式。 2022-03-12 16:28:58 +08:00
Anduin Xue c911ef0008 修正更多格式不规范。 2022-03-12 16:25:47 +08:00
Anduin XueandGitHub 8009027f49 Merge pull request #684 from hanksRang/master
增加菜谱“炒意大利面”
2022-03-12 05:22:16 +00:00
Anduin XueandGitHub 90406ba87b Update build.sh 2022-03-11 17:45:16 +08:00
Anduin XueandGitHub 0c19f51d7c Update 菠菜炒鸡蛋.md 2022-03-10 18:55:31 +08:00
Anduin XueandGitHub 2a45c2ed1e Update 菠菜炒鸡蛋.md 2022-03-10 18:54:52 +08:00
Anduin XueandGitHub ea768ac73a Fix #677 2022-03-10 18:41:08 +08:00
Anduin XueandGitHub b338cb7b36 Fix #678 2022-03-10 18:40:09 +08:00
Anduin XueandGitHub 59d3863e6b Merge pull request #676 from acyza/master
添加煎饺时饺子铺开提示
2022-03-10 09:25:19 +00:00
Anduin XueandGitHub c87a8cc48b Merge branch 'master' into master 2022-03-10 09:24:31 +00:00
Anduin XueandGitHub c791f587ca Merge pull request #669 from blackfoxsar/patch-1
Update 食品安全.md
2022-03-10 09:23:24 +00:00
Anduin XueandGitHub ce7ec14a11 Merge pull request #644 from Beeta/master
添加快手凉拌菜:凉拌油麦菜
2022-03-09 07:40:38 +00:00
Anduin XueandGitHub 6e38064f78 Merge pull request #480 from MrZhangCSU/master
增加生汆丸子汤
2022-03-09 06:26:09 +00:00
Anduin XueandGitHub 6149ebae71 Merge branch 'master' into master 2022-03-09 06:26:02 +00:00
Anduin XueandGitHub 61c93d23db Merge pull request #656 from cpfy/master
Update 戚风蛋糕.md
2022-03-09 06:24:00 +00:00
Anduin XueandGitHub c12d183f19 Merge pull request #663 from blackfoxsar/patch-1
Update 厨房准备.md
2022-03-09 06:23:30 +00:00
Anduin XueandGitHub 6dcadb22e1 Merge branch 'master' into master 2022-03-09 06:22:28 +00:00
Anduin XueandGitHub 12d68d034b Merge branch 'master' into patch-1 2022-03-09 06:22:07 +00:00
Anduin XueandGitHub 71c29fa559 Merge pull request #664 from blackfoxsar/patch-2
Update 速冻水饺.md
2022-03-09 06:21:43 +00:00
Anduin XueandGitHub 36ff5fcb34 Merge branch 'master' into master 2022-03-07 08:54:37 +00:00
Anduin XueandGitHub f6430c8adc Merge pull request #382 from Aubrey-M-ops/kiwijuice
奇异果菠菜特调
2022-03-07 05:10:02 +00:00
Anduin XueandGitHub 347e21b199 Merge branch 'master' into kiwijuice 2022-03-07 04:47:17 +00:00
Anduin XueandGitHub fe4bd693a4 Merge pull request #647 from luvsta/master
虎皮青椒,速成班做法
2022-03-06 17:47:31 +00:00
Anduin XueandGitHub b4821a9676 Merge pull request #643 from Azimiao/patch-1
Update 烤鱼.md
2022-03-06 10:57:45 +00:00
Anduin XueandGitHub b61b4f93e8 Update 黑椒牛柳.md 2022-03-06 16:00:50 +08:00
Anduin XueandGitHub e375b79fca Merge pull request #642 from Chiccccken/炒滑蛋
新增 素菜 炒滑蛋
2022-03-06 07:59:31 +00:00
Anduin XueandGitHub 20c840c972 Merge pull request #640 from jkkwjk/master
feat: 奥利奥冰淇淋
2022-03-06 07:59:17 +00:00
Anduin XueandGitHub 0b57673eb0 Merge branch 'master' into master 2022-03-06 07:59:11 +00:00
Anduin XueandGitHub 3e30f70a6a Merge branch 'master' into 炒滑蛋 2022-03-06 07:58:59 +00:00
Anduin XueandGitHub 2fad68e12c Merge branch 'master' into 炒滑蛋 2022-03-06 07:58:41 +00:00
Anduin XueandGitHub 9018da5ba4 Merge branch 'master' into master 2022-03-06 07:58:10 +00:00
Anduin XueandGitHub 7053e37844 Merge pull request #641 from lclichen/master
增加菜谱:黑椒牛柳
2022-03-06 07:57:46 +00:00
Anduin XueandGitHub 59c7f836d3 Merge pull request #636 from AuroraTea/master
feat: add 素菜/茄子
2022-03-05 13:48:28 +00:00
Anduin XueandGitHub 9f6be8d030 Fix #592 2022-03-05 01:10:16 +08:00
Anduin XueandGitHub 4c25ae2cf2 #615 明确这些盐不会都被你吃下去的。 2022-03-05 01:04:00 +08:00
Anduin XueandGitHub 79c388e633 #623 单位不精准。 2022-03-05 01:00:44 +08:00
Anduin XueandGitHub b1cc79efcf Merge pull request #628 from luvsta/master
椒盐玉米,程序员速成班做法
2022-03-04 16:46:43 +00:00
Anduin XueandGitHub f0d970302a Merge branch 'master' into master 2022-03-04 16:45:19 +00:00
Anduin XueandGitHub c273e4d6c6 Merge branch 'master' into master 2022-03-04 16:43:27 +00:00
Anduin XueandGitHub e233f41487 Merge branch 'master' into kiwijuice 2022-03-04 16:22:10 +00:00
Anduin XueandGitHub 4a8ba4d36a Update README.md 2022-03-05 00:07:52 +08:00
Anduin XueandGitHub 9bcca243c4 Test PR 2 2022-03-05 00:07:37 +08:00
Anduin XueandGitHub 6409a7d230 Merge pull request #627 from AuroraTea/master
feat: add 半成品加工/薯条
2022-03-04 14:40:06 +00:00
Anduin XueandGitHub cfc3166878 Merge pull request #626 from keidarcy/ci-add-auto-gen-mkdocs-yml
[ci] Auto generation add mkdocs support
2022-03-04 13:34:14 +00:00
Anduin XueandGitHub 54331dac64 Merge pull request #620 from kingwangim/master
增加一道菜谱 鸡蛋三明治
2022-03-04 05:15:25 +00:00
Anduin XueandGitHub 601e0ed1af Merge pull request #617 from yzxu-hzau/patch-1
Update 炒方便面.md
2022-03-04 05:14:42 +00:00
Anduin XueandGitHub 39595b7414 Merge pull request #440 from tuppt/patch-1
Create 通用汤面
2022-03-03 17:12:25 +00:00
Anduin XueandGitHub d67fc0b166 Merge pull request #608 from carrotPeanutButter/master
添加了早餐 *空气炸锅面包片*
2022-03-03 16:18:07 +00:00
Anduin XueandGitHub 094706c3e9 Merge pull request #611 from WakiJi/main
根据action日志抓虫子
2022-03-03 16:17:09 +00:00
Anduin XueandGitHub dacc1a29df Merge pull request #605 from WakiJi/main
错字修复
2022-03-03 12:27:32 +00:00
Anduin XueandGitHub 640ac9180f Merge pull request #606 from imaxct/master
添加凉拌鸡丝制作方法
2022-03-03 09:57:37 +00:00
Anduin XueandGitHub 7e479dce96 Update CODE_OF_CONDUCT.md 2022-03-03 14:07:27 +08:00
Anduin XueandGitHub 44b75c4d98 Merge pull request #575 from WakiJi/main
分类 顺便测试ci机器人能否运行
2022-03-03 04:42:28 +00:00
Anduin XueandGitHub 8681ea23a7 Update CODE_OF_CONDUCT.md 2022-03-03 03:50:29 +08:00
Anduin XueandGitHub 92e9a75bfd Update CONTRIBUTING.md 2022-03-03 03:25:58 +08:00
Anduin XueandGitHub b0e617fbf6 Merge pull request #600 from Anduin2017/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2022-03-02 19:24:07 +00:00
Anduin XueandGitHub f49685dccd Create CODE_OF_CONDUCT.md 2022-03-03 03:23:58 +08:00
Anduin XueandGitHub 285bf8396f #568 改成煮5分钟。煮10分钟确实不合理。 2022-03-03 03:00:36 +08:00
Anduin Xue 63eeccce35 修正百香果橙子中的问题。 2022-03-03 02:53:11 +08:00
Anduin Xue 4cd2e684ce Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-03 02:51:09 +08:00
Anduin Xue c9a5232907 Fix 香菇滑鸡中盐的单位错了 #591 2022-03-03 02:51:02 +08:00
Anduin Xue 5af90c2e56 删除重复的新疆大盘鸡。 2022-03-03 02:31:18 +08:00
Anduin XueandGitHub be3c0ee433 Merge pull request #526 from M-Chase/dev
feat:新增新疆大盘鸡做法
2022-03-02 18:25:44 +00:00
Anduin XueandGitHub edac02e73c Merge branch 'master' into dev 2022-03-02 18:25:34 +00:00
Anduin XueandGitHub 6d20061ec0 Merge pull request #573 from ProjectDimlight/master
增加主食:中式馅饼
2022-03-02 18:23:44 +00:00
Anduin XueandGitHub dea01a6e76 Merge pull request #583 from Tsuj100/master
做菜专业术语
2022-03-02 18:22:13 +00:00
Anduin XueandGitHub 64ee163d32 Merge pull request #585 from tangqz/patch-1
Update 鸡蛋羹.md
2022-03-02 18:21:33 +00:00
Anduin XueandGitHub 886d6faa7a Merge pull request #596 from salmanli/mycook
删除混合烤鱼菜谱原料项重复食用盐内容
2022-03-02 18:20:49 +00:00
Anduin XueandGitHub c98598fda6 Merge pull request #565 from simingy/master
updating index/navigation and optimizing mkdocs view
2022-03-01 15:38:06 +08:00
Anduin XueandGitHub 2d0fae5963 Update build.yml 2022-03-01 15:15:52 +08:00
Anduin XueandGitHub 17e6663010 Delete CNAME 2022-03-01 15:12:35 +08:00
Anduin XueandGitHub 4d4d175f3b Merge pull request #566 from ziofat/master
增加微波炉使用说明和微波葱姜黑鳕鱼菜谱
2022-03-01 15:12:02 +08:00
Anduin XueandGitHub ce61379b9b Merge pull request #563 from xiongyu0523/master
resize姜炒鸡图片
2022-03-01 09:47:22 +08:00
Anduin XueandGitHub 75ee7adaea Merge pull request #561 from simingy/master
adding more mkdocs customization for beautification
2022-03-01 09:20:09 +08:00
Anduin XueandGitHub 91439f4d29 Update 可乐桶.md 2022-03-01 02:36:17 +08:00
Anduin XueandGitHub b7be2cc39a Merge pull request #464 from haoruilee/patch-3
Create 可乐桶.md
2022-03-01 02:35:45 +08:00
Anduin XueandGitHub 36ac689fce Merge pull request #476 from pickerxxr/patch-2
Create 燕麦鸡蛋饼
2022-03-01 02:32:47 +08:00
Anduin Xue a75a46bd42 Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 02:30:41 +08:00