Commit Graph

329 Commits

Author SHA1 Message Date
bri cassa 942d6eafba Merge remote-tracking branch 'upstream/master' 2021-07-26 22:13:26 +02:00
tenplus1 2e2cd77184 simplify water recipes 2021-07-24 20:37:18 +01:00
bri cassa 9b6a055534 Merge remote-tracking branch 'upstream/master' 2021-07-24 13:06:40 +02:00
tenplus1 2277932cd4 add grape and cotton bush to lucky block chest 2021-07-21 16:27:58 +01:00
tenplus1 328e8b3223 fix cocoa drops 2021-07-18 14:39:26 +01:00
bri cassa 361e006b56 Merge remote-tracking branch 'upstream/master' 2021-07-17 20:45:17 +02:00
tenplus1 a30d889e4d update license.txt 2021-07-17 14:03:33 +01:00
bri cassa 48951090c0 Merge remote-tracking branch 'upstream/master' 2021-07-16 23:37:53 +02:00
tenplus1 f5a82f1478 translation update (thanks Snowyu and Nordal) 2021-07-11 17:27:12 +01:00
tenplus1 36838a8acc fix grain drops 2021-07-11 09:08:50 +01:00
tenplus1 95ba853872 add glass of water and recipe to filter sea water into river 2021-07-10 19:36:21 +01:00
bri cassa 3246f11594 Merge remote-tracking branch 'upstream/master' 2021-07-05 22:09:01 +02:00
tenplus1 a5ea92bdd3 fix cocoa drops 2021-07-03 17:53:43 +01:00
tenplus1 e6994235c5 add popcorn 2021-06-26 20:31:06 +01:00
bri cassa 756b4417ea Merge remote-tracking branch 'upstream/master' 2021-06-20 17:08:12 +02:00
tenplus1 70803f8aef add pumpkin bottom texture, redo melon node, fix typo in scythe, make pumpkin/melon rotatable 2021-06-09 07:41:11 +01:00
tenplus1 dc392e8adc remove mushroom override now that it's in default 2021-06-07 09:12:30 +01:00
tenplus1 9a08e2978a river water check for soy sauce recipe 2021-05-26 20:31:26 +01:00
bri cassa 787b7b3396 Merge remote-tracking branch 'upstream/master' 2021-05-09 21:36:27 +02:00
tenplus1 9440fe2e5a update mint textures (thanks sirrobzeroone) 2021-05-08 20:38:32 +01:00
tenplus1 dedc33cc46 added new gyoza and pineapple ring texture (thanks sirrobzeroone) 2021-05-07 20:29:45 +01:00
tenplus1 ebb5f98fae simplify recipes 2021-05-04 09:06:08 +01:00
tenplus1 275214ea62 no shapeless craft for tomato soup 2021-05-03 18:14:21 +01:00
tenplus1 4c6b062f98 added tomato soup 2021-05-03 18:08:40 +01:00
tenplus1 4b033fed83 add new melon textures (thanks 7eventy7) 2021-04-25 13:51:52 +01:00
bri cassa 847a9a4527 Merge remote-tracking branch 'upstream/master' 2021-04-17 13:47:05 +02:00
tenplus1 f1d52b4aef reduce shapeless crafts 2021-04-13 20:50:19 +01:00
tenplus1 9866b219bc tweak mochi texture and recipe 2021-04-09 19:33:53 +01:00
tenplus1 5b9bd1e6d6 add mochi 2021-04-09 19:26:20 +01:00
bri cassa 9fa818c1aa Merge remote-tracking branch 'upstream/master' 2021-04-04 20:57:42 +02:00
tenplus1 113fac2647 added soy sauce 2021-04-03 11:02:36 +01:00
tenplus1 06a92e93c0 rename textures, fix alpha texture warning 2021-04-02 19:51:10 +01:00
tenplus1 81293a2f94 added onigiri and gyoza to food items 2021-03-27 11:39:21 +00:00
bri cassa 13df43deeb Merge remote-tracking branch 'upstream/master' 2021-03-25 21:38:38 +01:00
tenplus1 ea59a8acdb fix replacement for cucina veganas soy bucket 2021-03-25 20:27:10 +00:00
tenplus1 2c758348e3 cornstarch added to gelatin group 2021-03-18 08:46:41 +00:00
tenplus1 c75be65326 fix flan recipe 2021-03-17 21:03:37 +00:00
bri cassa e0340ce2cf Merge remote-tracking branch 'upstream/master' 2021-03-12 12:19:42 +01:00
tenplus1 584ab76fb5 add vegan cheese and recipe 2021-03-11 12:07:53 +00:00
tenplus1 47985d7dd2 add parsley, artichoke and new foods 2021-03-11 09:49:52 +00:00
tenplus1 cd30901b68 normal/dry soil turns into correct base when no water nearby 2021-02-24 16:47:12 +00:00
Sys Quatre 8f2c41abe9 Merge remote-tracking branch 'upstream/master' 2021-02-23 21:15:00 +01:00
tenplus1 675b30dc76 fix string translation 2021-02-21 08:26:42 +00:00
tenplus1 7a99786e6d remove mobs_animal check for certain recipes to be used with other mods 2021-02-19 12:12:13 +00:00
tenplus1 3cbc4fe48e added salt crystal and recipes (thanks gorlock) 2021-02-17 10:14:20 +00:00
Sys Quatre 59743d747f Merge remote-tracking branch 'upstream/master' 2021-02-07 13:06:50 +01:00
tenplus1 79035d0473 added extra compatibility for crops spawning on older v6 maps 2021-01-31 10:14:19 +00:00
Sys Quatre c8284b6410 Merge remote-tracking branch 'upstream/master' 2021-01-15 21:09:25 +01:00
tenplus1 41356a32e2 updated german translation (thanks rti) 2021-01-13 10:29:28 +00:00
Sys Quatre 62b83f71a4 Merge remote-tracking branch 'upstream/master' 2021-01-02 14:23:48 +01:00