Commit Graph
100 Commits
Author SHA1 Message Date
Anduin XueandGitHub e96a82e25e Merge pull request #644 from Beeta/master
添加快手凉拌菜:凉拌油麦菜
2022-03-09 07:40:38 +00:00
Anduin XueandGitHub 469f261fad Merge pull request #480 from MrZhangCSU/master
增加生汆丸子汤
2022-03-09 06:26:09 +00:00
Anduin XueandGitHub a3a3ba43d9 Merge branch 'master' into master 2022-03-09 06:26:02 +00:00
Anduin XueandGitHub c196297a76 Merge pull request #656 from cpfy/master
Update 戚风蛋糕.md
2022-03-09 06:24:00 +00:00
Anduin XueandGitHub 6fb7fce799 Merge pull request #663 from blackfoxsar/patch-1
Update 厨房准备.md
2022-03-09 06:23:30 +00:00
Anduin XueandGitHub ad6b5cfd7f Merge branch 'master' into master 2022-03-09 06:22:28 +00:00
Anduin XueandGitHub 522598b954 Merge branch 'master' into patch-1 2022-03-09 06:22:07 +00:00
Anduin XueandGitHub 6013da9049 Merge pull request #664 from blackfoxsar/patch-2
Update 速冻水饺.md
2022-03-09 06:21:43 +00:00
Anduin XueandGitHub 284768c0fd Merge branch 'master' into master 2022-03-07 08:54:37 +00:00
Anduin XueandGitHub 7fdb5db147 Merge pull request #382 from Aubrey-M-ops/kiwijuice
奇异果菠菜特调
2022-03-07 05:10:02 +00:00
Anduin XueandGitHub d8e4f1571b Merge branch 'master' into kiwijuice 2022-03-07 04:47:17 +00:00
Anduin XueandGitHub 0149d25abe Merge pull request #647 from luvsta/master
虎皮青椒,速成班做法
2022-03-06 17:47:31 +00:00
Anduin XueandGitHub c1cb48f1b6 Merge pull request #643 from Azimiao/patch-1
Update 烤鱼.md
2022-03-06 10:57:45 +00:00
Anduin XueandGitHub 961c8701a6 Update 黑椒牛柳.md 2022-03-06 16:00:50 +08:00
Anduin XueandGitHub 8ae451ab31 Merge pull request #642 from Chiccccken/炒滑蛋
新增 素菜 炒滑蛋
2022-03-06 07:59:31 +00:00
Anduin XueandGitHub 716124f25a Merge pull request #640 from jkkwjk/master
feat: 奥利奥冰淇淋
2022-03-06 07:59:17 +00:00
Anduin XueandGitHub 649c52d5bf Merge branch 'master' into master 2022-03-06 07:59:11 +00:00
Anduin XueandGitHub 455afdda6a Merge branch 'master' into 炒滑蛋 2022-03-06 07:58:59 +00:00
Anduin XueandGitHub f612642dbc Merge branch 'master' into 炒滑蛋 2022-03-06 07:58:41 +00:00
Anduin XueandGitHub e1c6a69ba5 Merge branch 'master' into master 2022-03-06 07:58:10 +00:00
Anduin XueandGitHub f16bd8c63a Merge pull request #641 from lclichen/master
增加菜谱:黑椒牛柳
2022-03-06 07:57:46 +00:00
Anduin XueandGitHub 2e6d371160 Merge pull request #636 from AuroraTea/master
feat: add 素菜/茄子
2022-03-05 13:48:28 +00:00
Anduin XueandGitHub 73d4b66b28 Fix #592 2022-03-05 01:10:16 +08:00
Anduin XueandGitHub 9dc880f01f #615 明确这些盐不会都被你吃下去的。 2022-03-05 01:04:00 +08:00
Anduin XueandGitHub 172ed88c01 #623 单位不精准。 2022-03-05 01:00:44 +08:00
Anduin XueandGitHub c442be3e13 Merge pull request #628 from luvsta/master
椒盐玉米,程序员速成班做法
2022-03-04 16:46:43 +00:00
Anduin XueandGitHub e47997ee9d Merge branch 'master' into master 2022-03-04 16:45:19 +00:00
Anduin XueandGitHub 4aab1a04ac Merge branch 'master' into master 2022-03-04 16:43:27 +00:00
Anduin XueandGitHub 7df89fc78c Merge branch 'master' into kiwijuice 2022-03-04 16:22:10 +00:00
Anduin XueandGitHub b7efb4a7ca Update README.md 2022-03-05 00:07:52 +08:00
Anduin XueandGitHub 5964e52906 Test PR 2 2022-03-05 00:07:37 +08:00
Anduin XueandGitHub 5bfe1fe1f8 Merge pull request #627 from AuroraTea/master
feat: add 半成品加工/薯条
2022-03-04 14:40:06 +00:00
Anduin XueandGitHub 5cb20a153c 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 824e8a9914 Merge pull request #620 from kingwangim/master
增加一道菜谱 鸡蛋三明治
2022-03-04 05:15:25 +00:00
Anduin XueandGitHub 893680b7b3 Merge pull request #617 from yzxu-hzau/patch-1
Update 炒方便面.md
2022-03-04 05:14:42 +00:00
Anduin XueandGitHub 8a76ceb0b0 Merge pull request #440 from tuppt/patch-1
Create 通用汤面
2022-03-03 17:12:25 +00:00
Anduin XueandGitHub eb12e19699 Merge pull request #608 from carrotPeanutButter/master
添加了早餐 *空气炸锅面包片*
2022-03-03 16:18:07 +00:00
Anduin XueandGitHub 7f6cc589a5 Merge pull request #611 from WakiJi/main
根据action日志抓虫子
2022-03-03 16:17:09 +00:00
Anduin XueandGitHub 547c7d10ad Merge pull request #605 from WakiJi/main
错字修复
2022-03-03 12:27:32 +00:00
Anduin XueandGitHub 96da79b126 Merge pull request #606 from imaxct/master
添加凉拌鸡丝制作方法
2022-03-03 09:57:37 +00:00
Anduin XueandGitHub 7d03832dd9 Update CODE_OF_CONDUCT.md 2022-03-03 14:07:27 +08:00
Anduin XueandGitHub 530a1c66ce Merge pull request #575 from WakiJi/main
分类 顺便测试ci机器人能否运行
2022-03-03 04:42:28 +00:00
Anduin XueandGitHub 349259cd1d Update CODE_OF_CONDUCT.md 2022-03-03 03:50:29 +08:00
Anduin XueandGitHub dde41bd737 Update CONTRIBUTING.md 2022-03-03 03:25:58 +08:00
Anduin XueandGitHub 83091eff15 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 e25247b953 Create CODE_OF_CONDUCT.md 2022-03-03 03:23:58 +08:00
Anduin XueandGitHub 4d63d8c065 #568 改成煮5分钟。煮10分钟确实不合理。 2022-03-03 03:00:36 +08:00
Anduin Xue 8e8ee80b36 修正百香果橙子中的问题。 2022-03-03 02:53:11 +08:00
Anduin Xue a2da9cc43f Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-03 02:51:09 +08:00
Anduin Xue 6b85496a71 Fix 香菇滑鸡中盐的单位错了 #591 2022-03-03 02:51:02 +08:00
Anduin Xue 51eae6a6a3 删除重复的新疆大盘鸡。 2022-03-03 02:31:18 +08:00
Anduin XueandGitHub c360755381 Merge pull request #526 from M-Chase/dev
feat:新增新疆大盘鸡做法
2022-03-02 18:25:44 +00:00
Anduin XueandGitHub ec16c65296 Merge branch 'master' into dev 2022-03-02 18:25:34 +00:00
Anduin XueandGitHub 6ca54b71ee Merge pull request #573 from ProjectDimlight/master
增加主食:中式馅饼
2022-03-02 18:23:44 +00:00
Anduin XueandGitHub 8b914716a9 Merge pull request #583 from Tsuj100/master
做菜专业术语
2022-03-02 18:22:13 +00:00
Anduin XueandGitHub 5344e3df77 Merge pull request #585 from tangqz/patch-1
Update 鸡蛋羹.md
2022-03-02 18:21:33 +00:00
Anduin XueandGitHub 301c8f8fdb Merge pull request #596 from salmanli/mycook
删除混合烤鱼菜谱原料项重复食用盐内容
2022-03-02 18:20:49 +00:00
Anduin XueandGitHub 0f02a2bfd6 Merge pull request #565 from simingy/master
updating index/navigation and optimizing mkdocs view
2022-03-01 15:38:06 +08:00
Anduin XueandGitHub 0c2894f03c Update build.yml 2022-03-01 15:15:52 +08:00
Anduin XueandGitHub 7bff69d2ab Delete CNAME 2022-03-01 15:12:35 +08:00
Anduin XueandGitHub 20636687e0 Merge pull request #566 from ziofat/master
增加微波炉使用说明和微波葱姜黑鳕鱼菜谱
2022-03-01 15:12:02 +08:00
Anduin XueandGitHub 502df82938 Merge pull request #563 from xiongyu0523/master
resize姜炒鸡图片
2022-03-01 09:47:22 +08:00
Anduin XueandGitHub 5990ec407e Merge pull request #561 from simingy/master
adding more mkdocs customization for beautification
2022-03-01 09:20:09 +08:00
Anduin XueandGitHub df9838552f Update 可乐桶.md 2022-03-01 02:36:17 +08:00
Anduin XueandGitHub 3da7c1f323 Merge pull request #464 from haoruilee/patch-3
Create 可乐桶.md
2022-03-01 02:35:45 +08:00
Anduin XueandGitHub 3b9e33bba3 Merge pull request #476 from pickerxxr/patch-2
Create 燕麦鸡蛋饼
2022-03-01 02:32:47 +08:00
Anduin Xue eefb0ca568 Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 02:30:41 +08:00
Anduin Xue c616eab951 修正煎饺带来的不精准的问题。 2022-03-01 02:30:35 +08:00
Anduin XueandGitHub c62dbddc45 Merge pull request #535 from Wy620/master
新增煎饺的做法
2022-03-01 02:27:57 +08:00
Anduin Xue 4d475b42b8 修正烤茄子中的问题。 2022-03-01 02:23:57 +08:00
Anduin XueandGitHub b914ee394a Merge pull request #543 from timeance/master
增加烤茄子
2022-03-01 02:21:18 +08:00
Anduin Xue 978e58b863 Try to mitigate a build issue. 2022-03-01 02:16:57 +08:00
Anduin Xue f9754bc67c Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 02:12:04 +08:00
Anduin Xue 7d878de97e Better built doc. 2022-03-01 02:11:59 +08:00
Anduin XueandGitHub 67d0097aae Merge pull request #558 from simingy/master
updating contributions.md
2022-03-01 02:10:49 +08:00
Anduin Xue ab192ad905 Delete docs. 2022-03-01 02:10:00 +08:00
Anduin XueandGitHub d092e1a151 Delete _config.yml 2022-03-01 02:06:10 +08:00
Anduin Xue e4e5ad84ce Refactor mkdocs publish. 2022-03-01 01:45:53 +08:00
Anduin Xue ddea4912ad Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 01:42:19 +08:00
Anduin Xue cd7fc42114 Unify steps. 2022-03-01 01:42:13 +08:00
Anduin Xue 3967d84e3f Fix a yml issue. 2022-03-01 01:36:11 +08:00
Anduin Xue 3399877ba4 Try to auto build pages. 2022-03-01 01:33:48 +08:00
Anduin Xue c59b0d55f8 Text lint add half and full width bracket. 2022-03-01 01:19:31 +08:00
Anduin Xue ed0b6ba517 Fix lint. 2022-03-01 01:10:17 +08:00
Anduin Xue 79b455f37f Fix lint. 2022-03-01 01:08:09 +08:00
Anduin Xue 7030bced3a Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 01:04:13 +08:00
Anduin Xue ce63e712ce Unify jobs as build 2022-03-01 01:04:07 +08:00
Anduin Xue e7c73c0eb1 Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 00:59:53 +08:00
Anduin Xue 3ad7bf6f16 修正一些markdown排版。 2022-03-01 00:59:17 +08:00
Anduin XueandGitHub 5b4a7edb5e Merge pull request #556 from simingy/master
从新添加mkdocs-material支持
2022-03-01 00:56:30 +08:00
Anduin XueandGitHub 81ed5d179d Merge pull request #511 from hacker-jerry/master
增加芋泥雪媚娘做法
2022-03-01 00:53:31 +08:00
Anduin XueandGitHub fc0c3a6b68 Merge branch 'master' into master 2022-03-01 00:53:25 +08:00
Anduin XueandGitHub 1fca398817 Update 炒青菜.md 2022-03-01 00:52:33 +08:00
Anduin XueandGitHub f38420696b Merge pull request #488 from Zhoushunshun541/PR-improve-menu
PR 改善油泼辣子的配方
2022-03-01 00:46:58 +08:00
Anduin Xue cb05f0f977 Merge branch 'master' of github.com:Anduin2017/HowToCook 2022-03-01 00:46:08 +08:00
Anduin Xue e3b97edf0b 修正草莓酱的lint。 2022-03-01 00:46:01 +08:00
Anduin XueandGitHub eaa88b7ec5 Merge pull request #431 from tokyo2006/caomei_jam
Add Strawberry jam
2022-03-01 00:44:13 +08:00
Anduin Xue 14323d1aef 修正姜炒鸡里的不精准。 2022-03-01 00:42:07 +08:00
Anduin XueandGitHub 2fd0200141 Merge pull request #550 from xiongyu0523/master
增加姜炒鸡
2022-03-01 00:38:25 +08:00
Anduin XueandGitHub 6caebfeda3 Merge pull request #552 from ziofat/master
更新压力锅的原理、优点和注意事项
2022-03-01 00:37:31 +08:00