From 47578aa62511d48ac130450062feb57d4d31b96c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 20 Sep 2021 17:25:12 -0700 Subject: Updated to 2021-09-20-1811 --- 0026-fix-brioche-cooking-time.patch | 9 ++++----- PKGBUILD | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/0026-fix-brioche-cooking-time.patch b/0026-fix-brioche-cooking-time.patch index b8b56bb..3c00e1d 100644 --- a/0026-fix-brioche-cooking-time.patch +++ b/0026-fix-brioche-cooking-time.patch @@ -1,11 +1,10 @@ ---- a/data/json/recipes/food/uncategorized.json -+++ b/data/json/recipes/food/uncategorized.json -@@ -5008,6 +5008,8 @@ +--- a/data/json/recipes/food/bread.json ++++ b/data/json/recipes/food/bread.json +@@ -5008,6 +5008,7 @@ "subcategory": "CSC_FOOD_BREAD", "skill_used": "cooking", "difficulty": 3, + "time": "20 m", -+ "batch_time_factors": [ 50, 4 ], + "batch_time_factors": [ 50, 3 ], "book_learn": [ [ "baking_book", 3 ], [ "cookbook_daintydishes", 5 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], diff --git a/PKGBUILD b/PKGBUILD index 05d87bb..56c2c80 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202109151807 -_pkgver=2021-09-15-1807 +pkgver=202109201811 +_pkgver=2021-09-20-1811 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -77,7 +77,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz" "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz" ) -b2sums=('fc8eec3399a44d5b02d3ddfa5e1091ef9a787808f4819f6e6a00923301cf5e7475c9d9dd156e62b74eb98baefd359ba8f24188cdabf47b464b7fbe9179c379b3' +b2sums=('7bdac26cdf5932c393bef5507246e092cbff80611e991b66317341c037e9f1c80274a8b9746839a09711be24605f3408dd7fc082dadad38af1e2a757f906f58a' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -107,7 +107,7 @@ b2sums=('fc8eec3399a44d5b02d3ddfa5e1091ef9a787808f4819f6e6a00923301cf5e7475c9d9d 'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768' 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' 'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962' - '323c335fe72239bbfe7f7f32f460467dc37a2a07de4ce21f3653bc22a9246afda44cbdb194fa8381c160aef903098ce115448e1307b7a166bb2afeab4892c153' + '8eef73575981d10a6a8734afc0e284ec7125db24bf666ff943938a4df87dedbd9ac622ea51bb71b5aaff7b1cc75627258bcfdc8659b915c09c82d3561fde1f62' '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef' 'e9274d894e94606ba0f15e85c7d5e6dcfdd93922f5361dd988542e63e5f2d434971a5360600869184c490dc34f7104214a71620c577ee0fe217c9636e91b2076' 'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e' @@ -139,7 +139,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-09-15-1807|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2021-09-20-1811|' Makefile # Backports from 0.F -- cgit v1.2.1