Updated to 2021-12-28-1204

1 files changed, 7 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index aa59653..a6fcfe6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202112191356
-_pkgver=2021-12-19-1356
-pkgrel=2
+pkgver=202112281204
+_pkgver=2021-12-28-1204
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -52,9 +52,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "mutations-01_nerf-lightstep.patch"
         "mutations-02_fix-evac3-background-visible.patch"
 
-        "recipes-01_fix-brioche-cooking-time.patch"
-        "recipes-02_4570-dragon-can-be-dismantled.patch"
-        "recipes-03_seperate-leather-recipes.patch"
+        "recipes-01_4570-dragon-can-be-dismantled.patch"
 
         "terrain-01_quiverfull-house-correct-stairs.patch"
         "terrain-02_tacoma-barn-door-position.patch"
@@ -95,7 +93,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=('14efdbb916a59346c33da47cc91c1884ea091e7e7081690023f1e732024bbc4494e36298bdd575f12066c34feec20950cc976a59a24d962a48a1385906852d42'
+b2sums=('2c210a107946431d889e52da1606fc5aae08ebd68879e77efe48a668c3b6c07d058f3846c50ad18d4a5c16858644fb9e1c449fb478cd8b3239ff8a95080e8bce'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -114,9 +112,7 @@ b2sums=('14efdbb916a59346c33da47cc91c1884ea091e7e7081690023f1e732024bbc4494e3629
         '8bb71fbec3deece7bd0f9084e20ef5853812e71e2ebcd43011f7779499cbb99c7a8bc5c618d8ef9f55e5ce54c9fc4a5f4d3167bb63f9821a68889f9f3e1386f5'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
-        '8eef73575981d10a6a8734afc0e284ec7125db24bf666ff943938a4df87dedbd9ac622ea51bb71b5aaff7b1cc75627258bcfdc8659b915c09c82d3561fde1f62'
         '71768899e631c5293d5fb8bcb237ca54f880913b6400d445c8a0322cb69801fe85b94b1293306e2f33fac6067cbd892c4665b9563bdc9ff4df5be245c7e7108f'
-        'f5bd9a10f5d1b78a3d3b80c6b374227b6f8e189a0fc83c72bf30ff3f45c25a60cacf3a90cbbde9f2bd2d5dc9ae0943f6cb57d6419d01fd1053487a5f490dd9fd'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -165,7 +161,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-12-19-1356|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-12-28-1204|' Makefile
 
 
   # # # Hotfixes
@@ -252,15 +248,8 @@ prepare() {
 
   # # recipe fixes
   echo "Applying recipe fixes"
-  # Fix brioche bun missing a cooking time:
-  # It was missing a cooking time entirely resulting in instant cooking. Talk about quick rise bread.
-  patch -Np1 -i "$srcdir"/recipes-01_fix-brioche-cooking-time.patch
-
   # Fix reloaded 45-70 rounds and reloaded dragon shot not allowing dismantling when every other non-caseless round does.
-  patch -Np1 -i "$srcdir"/recipes-02_4570-dragon-can-be-dismantled.patch
-
-  # Fix the leather from fur recipe to have a seperate suffix than the leather from cured hide recipe.
-  patch -Np1 -i "$srcdir"/recipes-03_seperate-leather-recipes.patch
+  patch -Np1 -i "$srcdir"/recipes-01_4570-dragon-can-be-dismantled.patch
 
 
   # # terrain and overmap fixes