Updated to 0.5.1

Removed obsolete mods.
Revert removal of Alonso.
Revert biodiesel working in petrol engines.
Revert hard skill caps.
Revert three more broken limb changesets.
Revert another ammo rebalance changeset.
Revert craftable smokeless gunpowder changeset.
Revised book chapters revert patch.
Fix some bad terrain in the godco patch.
Fix some bad terrain in the prison island patch.

1 files changed, 68 insertions, 131 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b562c74..bf37641 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,10 +17,10 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn
-pkgver=0.4
+pkgver=0.5.1
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=12
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -37,20 +37,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
-        "backport-01_fix-content-NON_FOULING-flag-not-working-due-to-typo.patch"
-        "backport-02_fix-mass_grave-map-extras-3680.patch"
-        "backport-03_feat-balance-power-armor-updates-3625.patch"
-        "backport-03-2_fix-bugfixes-Fix-light-and-helmet-power-helms-having.patch"
-        "backport-03-3_feat-balance-HEAVY_WEAPON_SUPPORT-flag-for-large-mut.patch"
-        "backport-04_feat-content-port-game-store-3469.patch"
-        "backport-04-2_Add-street-lights-to-remaining-shops-port-change-to-.patch"
-        "backport-05_fix-farm-mapgen-3715.patch"
-        "backport-06_fix-campground-mapgen-3702.patch"
-        "backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch"
-        "External_Tileset_DP_Normal.png"
-        "backport-08_feat-Convert-non-pistol-only-energy-weapon-mods-to-b.patch"
-        "backport-09_feat-balance-MILITARY_MECH-flag-affects-ID-card-need.patch"
-
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -62,12 +48,19 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch"
         "revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch"
         "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch"
-        "revert-14_Removed-unrelated-references-2738.patch"
         "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch"
         "revert-17_Rivtech-mainline-3092.patch"
         "revert-18-Simplify-broken-limb-mending-3054.patch"
         "revert-19_Fix-Repair-Nanobots-3308.patch"
         "revert-20_Fix-tidy-warnings-3310.patch"
+        "revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch"
+        "revert-22_feat-content-Biodiesel-Fuel-for-Gasoline-Engines-371.patch"
+        "revert-23_fix-balance-no-more-EXP-gain-when-a-skill-is-maxed-o.patch"
+        "revert-24_fix-repair-nanobots-not-working-at-all-on-broken-lim.patch"
+        "revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch"
+        "revert-26_fix-npc-splints-and-clean-up-iterator-errors-3592.patch"
+        "revert-27_fix-NPCs-keep-their-splints-on-3589.patch"
+        "revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch"
 
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volume-40mm.patch"
@@ -98,7 +91,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "meds-01_antibiotics-unhealthy.patch"
 
         "migration-01_remove-ucp.patch"
-        #"migration-02_remove-8mm-fmj.patch"
 
         "mission-01_typos.patch"
         "mission-02_reorder-gunslinger-quest.patch"
@@ -107,7 +99,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
 
         "mutations-01_nerf-lightstep.patch"
         "mutations-02_fix-evac3-background-visible.patch"
-        "mutations-03_eye-colours.patch"
 
         "npc-01_isherwood-update.patch"
         "npc-02_tacoma-update.patch"
@@ -128,17 +119,14 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "terrain-02_fix-doors-for-npcs.patch"
         "terrain-03_tacoma-clinic-add-missing-floor.patch"
         "terrain-04_lumbermill-gasoline-not-spilled.patch"
-        "terrain-05_community-garden-fertilizer-not-spilled.patch"
         "terrain-07_rehide-redacted.patch"
         "terrain-09_make-firestation-shelter-wells-npc-drinkable.patch"
         "terrain-10_fix-milbase_minefield.patch"
         "terrain-11_clean-up-map-extras.patch"
-        "terrain-12_add_fmc_stairs.patch"
         "terrain-13_fix-mapgen-palettes.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
         "tools-03_shears-use-light-battery.patch"
-        "tools-04_normalize-drone-volume.patch"
 
         "vehicles-01_portable-generator-engine.patch"
         "vehicles-02_fix-fbi-car-name.patch"
@@ -146,7 +134,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
 
         "weapon-02_Fix-usp45-load-order.patch"
 
-        "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
         "etc-03_fix-abstracts.patch"
 
@@ -171,55 +158,49 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "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=('4d47457c12a539ed6fa1c5b1351f473e43aecfe1e4f2aafd37e7068fc166d95c7f729806dd6c12472e13073a9e35ffb7552deb9f3decc5f56dedcb8a2d257b6a'
+b2sums=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995cf31363e110b58bafac3de8cbf3ba383719686f43962dde93faf656aaa'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        '54d896d8f9273ecb8b8643cf560fdad652c52db9733ebebd6944fd9a112ebdcbfa237d90251abcb2a71c9eb3433297bf8c3febaddc055bed6ad47daf898e163b'
-        'f49e5fc7f275de2ed80380c169e22d7dd966d147f7a65d86f958172b25baf3da1aa5eaed0b6ad36756a4ca0ddd467d1e85d8abc6298756582c2d2e7ba45fc4e5'
-        'c7d5c65d71f87439ffece8f230257c03b066f90a9b94194a21a3d7a59057d12e2fbf4378d485623c635d3e077ab864a6e90b1173c899e31004c5315d6a2145fe'
-        '20e5409086ab1927df3eab494d804d31d0544cd5444c166b760f7a7d574ea2975ad74d4d974d2e263f557f6a1e9757422dfee95b08f39db94a916372e1a1a2b1'
-        'fd7a7e216e3adda177a19747b5275a7222238c939e0d815e555665adbae18665db46e04691b95022aba14cf133110607dc10f6baf7540517314ebeb1b6bf2d69'
-        'c5368de53a75e45f074acfc062cddcd07fc5615ecef77fe16b37ba7cec1ee7cea6ff1bd3b8fae66d51aab5f6ea43e39c372814064b2de5f4e0774531ace07290'
-        '67e6dccd3f6ed1b8ffddb631b8f81a4d1162349f96b7cf6eac2f73f43a2f076c2a9fcdf328c1f130461a14d308deaf19cf9c147eee41313afa823e9d2b5c51e1'
-        'd48d017ccf864d9cfd30051cc3bd94ca53c9a5982cc2d65ece9da487e3c6fcded2b83f95062227d8e778085aa578bfd0ab3c7f5cde095a5def3f7e52973bc5d1'
-        '2561b1ee8dac83b1b26049004fb6c5719441977d89af4e56458d464acf315ee1adddb8420ee077a6ab7fb014761540bcd3aef0451452d66b72b4efc6838cf48a'
-        'c7321241e4bbe4bff078eb308a044568adcf57104284446c9f24399b37ac7693ac2203beff0a1e072d3db71380516ec5bdaac7338220886bd45f1cc670b5f2bb'
-        'ba9a966dc826e5190adca3439da8e98eb493072e7df0ea5383e8d3eed7e22041c74368dfff9c8666cd800a552d156b11838aa961db73a485686d8939794189f4'
-        '03562be8187854c02003cbb40d021e2457bd6ba346ed0b106c40ad4fe4d700f83f463041c11da1076c2ec4440f2b03c013089c451491598f47ab64750e408205'
-        '7bc0e4907e069b40fdf06be91155f6bc99beeed425e20072d7dfa591977504c0959ad42f497cc0f33545c205028e823ef5c9cf568e51180a1fc65c3442812f86'
         'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
-        'c2d6d7f74ada2ef54079fdf3759d9875552e2894dc8b753435acc692e705a9b297674eddb4e5a01a9269a84be7a82a8fef7e5762724b4d0f065976e877a05b00'
+        '2b42190f1d7189a38b3424efe64fd1b3921919a4f6fc872462ef684587de94b900e93f159597ab3e6f576268fed3e6966cddc3fa7250e1b746095fd7a2cbf6e9'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
-        '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
+        '5b0e957a5f80ea878c554711dab2fe6759deb3371532cd0f149cfc7a54ec914f445a4aeeff4263df58c947f03fe7be30f2ef175b9a81708e668fd037f9b8ccf8'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        '9ec37dae38c6d2591e84e8c714452b1634c42291a9ca98ff3044fa9c8753331f746528816a04d918a96a733cb2240f1e78387c467a0c47103d4b25316dca380a'
-        'e2b0718a30a96c2189036be28eb04a0a964cd513f71f323fddbf37fbd80c22eabea6dd6189080ee88d7d3a1f795b86eb10d92bce31c053905df3cfd71d0186e8'
+        'f418feaa3ce18c97cb05694687726d38a5ed49dc5277bbcd49f8f4e12498743b1561207a8cdb509034f8aed48d456ee58fc30da45cd42e2e4fee8e4dd7eb3dac'
+        '8ed59f0237d4becee71c5f79dd434972eda3a02c56c29642f69c8ac7e638d866df633e0e087b4392bb74017b6ea3641fd6155d86f0c71fc188be19e7a81cc23b'
         '00b4020df6c0e306b3d16d3caf6abad7357343dfde3c5c901bc8fdc823554f4ae73d46ec47357678da5f3aa18a549dee742df023f37b0f8948a822e712e376b5'
-        '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
-        'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff'
-        '63d334661bfe5270910de1c9689892aadfabbc5ee1a14508caccfd0639404f337900906fe91dab453ee5036290e485231d9072b977970d438c938ce55f8d2bf3'
-        '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
+        '1588c497a7f324cc96ed7aa194a9d99cd5f0ed9dd5db03321f03afcda381b7b2262bbc386f01cb756dd4cd53f73c244012339bb66315ef374a95afcfc2301085'
+        '406130adb1be38e25bf750e10166ea55bd8e5c5e500ea81d8af547131a2eea04ce1e4b415f3fe87f4825aa515186b23e612a4961d2b44f538466044d7ec49624'
+        'c6854d23ec8eec198e3ee1ca9a7cdb2c8c6f2c20a4e670d6752eb09ec99713dd52d659690e4dce935b11954f7d435d5ea35b4eda23bee3ee5759ef395c18b6ff'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8'
-        '5442e78f06883134c34d17d08853d86d0574e0a92e083c47b60a6755de957ba23e8fd994fad4356ea13bacdfce9912eab3ccbc45135d78cd3c4fa1c1bd35a753'
+        '9c8c49c7c70a40a195e4cafcb22b7e1fab1e276bc59c186e9b09fd77c525dc63fc64719e0f87083f2761172761c9a6dfaf8ff11b405976502e7f55e9606c42c0'
         'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751'
         'b4ca2cb0e7c6c908277b178dae1b946ecdc2b88a8b0b4930450758e03c1f280b3740118cee274886693c158cd4604dc8487211b9185538eaa72852b18f0c67f2'
-        'eed0a3489e58a497c5941c182a83fb16d92c708a702da6365b39c81428b6cec1bff8fe78749f9f510cb880166a6851d61195e3066b8c19e2d3d763dd6ef38cfa'
-        '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
+        '677c476df28e0f5d0ddf789bf2b26f2dc49a9d1523ba07f2a0607bb47d00b17c9f7ae86737d5a69f7fb8c7bfc82231a8a1d5b756ae49934adf1eff315c7a9a5b'
+        '80d5920380282ba1c9bd81e8e7055af3c88ff2ecfb1d375ad9f1ddc29b3f61760119b9ec27c14266a020a32d8bdc6f1eb1bce35e847ed87faea0c7623f8b906e'
+        '84b9d7d78ad2ab43f24aed79f6843e7fb8f600bb8edea384fa446f0a70bbbd5bdcc391de8bfa25667d3906df8ae8e9154701bb582e058d77e9326a08de3fc00e'
+        'bdc83eecf20d82bd314ea6c053c19a990ab25aa067cdec8dab479d59b5169563bf7f368776ca18749918b5ce4a8df4e2a2e700dbbc3a36b38ee61f1b57cd416a'
+        '37c09dab5b6006794023713906e0d5a03824254d156169bc4a0643169b35958821e8d220020dfdb5fb0a587365382a1fcc08ceea6963c974a680901ed91708ba'
+        '6735377f8611451333c8d7f009001aa652af9edeeddfcd0cd163d03ea84607803d260eb1338fa35f688954c3cb75bb7bdc41a5ad0497771815dd16afa86d54b3'
+        '13e61e9144f4d7325c409553c72ea1fca07009939b53491ea24d208fba7539e7f09063911c76e7d45f7e6bda12a61bbde17a75c319a0b79518e6639d520fa4ef'
+        'c4ee693418d394e3b946aa2b9a5f11c04bb0ff11234f830056963f4a755357552f9a769688a086f56f492ed479cf1a44032cfde45c03627adc5fb55f88f806e6'
+        'df26a597afe46a35e07f02c32839e2f7f57cf4d4d9bf0e62eb645d1b720f601fe2e9787462a0ab0ba8b788c727b846272a4ca6ecf81f96bb058d070b53633dcc'
+        'ba2964e64df20167c722e71951db28d039e637397a6be2e7f5312da10ab3c57a1982ec1ae1c37dd361317292b8c519f678472eb06360d4368294e0b636704c15'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '6f79418343f29e3758e826417e475d957e0c372fab8c06855f5a86b4636ce6e8c68a770a4a3ec327361ec69d042d627062b2c2db23e5e437cef855683242545e'
-        '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
+        'bf952e4c5e8ad3851f2ab5a812fdf65e0a6e7e1726150d7fa6cb582f4408eed85edc7b8cf9dabc07fab62217d14fa7ee5493b45bddb282da44247291e84c990d'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7'
-        '1666b768d139753acf10539d992774dadfe0d57e587232c983a972c9f5b85f865c823bf4c9f3f240b4755bcd753c7a3b9ee452d480a49d240989479aefd13054'
+        '554bc4acb13f2eb70b14dad095c609cd1515bf462a147511fefb935ad64a4dbffe6aa2a89db7342728a212e4e87f7def120c136d87202dc754700ed62449fa12'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0'
         'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9'
-        'd0a2fcd9b3e88d15f817204c7799b0a2b7cd7f9bb830efc97970e9da466a2f458a414be8de93049078c1e5568238e6ee9c8ec22a296401f6dc569dfcc299b289'
+        'e85003201457633ab56789aef908ad4e8f9ed4728fc2bceb0344b851bf65f13264dfe9459afd4c1ba69c0d89f83e841f4829dcf6b0f8fb456bc9f2176c66ca87'
         '7b4369a2535029e214af7f51f7d6292d91989249374c9969a140f8954dedca2a2c04f626ac0bcf33f9ea8ab1710fadcc79034156405249b885b01e5c53be2188'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
@@ -229,65 +210,62 @@ b2sums=('4d47457c12a539ed6fa1c5b1351f473e43aecfe1e4f2aafd37e7068fc166d95c7f72980
         '536c59b274923d36fbfc6dc39ef373a0d1e497422dea6fcdc16cfacb6b9ba421f14c5d7c4db31bab083199d859ff57ae5b19842f95367cfa39059e7156e96093'
         '69891c188f233e5174c2ddabce9371e84fdffdb105345686d71a9d823422969f77f9c44bc6571c6e5a72dbc9b9bdb6abf8c72cf9480bb87dca6f998f62f3de02'
         'e466392190e0aa58c02acda287bc8ac6fef30160207d08805ca9acd42b7f024d0680c0a76fcb4f29a7d7ca884920bba3a6714b5ad40f64dd1b40bcf0e2621d26'
-        '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
+        'f2ad02ac73e7ab5c26f986b640b88ed10ad30b103d98ede377b3868a3d0f84cabbc4c06f5f6b2e05c18c672370d1c25a7bfe3b3ea5d057ac7f3d7ef35b814c7e'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
-        '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b'
         '75877d9c6090a4e75529b1840f875ef04941a643c2c3b0c2e2a605c0d43d6b7ac23abf7f0316885441b8310f8a39339f2e12c7763b2d9875ee772949e6dcfcaa'
         '761938b9d05430a72ff1102671d963e44d647ddb63b9a6e78979f365c6cd1e98b6a3763a4b9667ca75fbf23ee3812b4f09838061e8ba101d89d6f4dbd1104dc0'
-        'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e'
-        '863676b5168dc2a63ad89a5c9de6f52b65a681954c7a646c2e9a9ca4decad871ab6674df7b8e6d4fa08e90ec0696771a2c5afce358e5e9b729adbd2fc7360aef'
-        '6478e17056a909a6674721d496047e5b3abe2deaf355d4a90461daf702281f5c21acc5e4ccee394917f07e6f2065daf9405384061d80cc2e528ddd3369765b98'
+        '3bc768194ae94a95eb8a5f7e1536e81bbb885d9d2f6dd799350d272d2f87d4bfb4ebb5dbd215157b000f29821ce43fc7b0ed45a142329a5ffc207463b054d9fd'
+        'fa3f9c021097115fd180c83a6640a696240783b165add09b48f624f3b91546aa75bdb05b12a0edfaa009f69f5aaeabb20e2e52267c7d4be4c1d4d8567d8f4eca'
+        '09ad88d1eebdb6433c2429cea4b775384b65d6cd52945e0de536dbac9fb6d9c345bec9bb49ede6fc6ce01a73e8297d3c8901c4e91d1b5a12eebc36ffd8c21ac4'
         '49d39404138e5e45fdb05b772636388eb7aada9dab6e549904e4b87053329d9df506ad6f390d73fb25c518299459df657ca6e02142fed9d29f4cd1c5f89734d7'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
         '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140'
         'f7a9c6d083f73c780be2f7ebf4e5e8deb4001aaca39b73ec9c6a5ef69f0621b45f9c384f32bc1c86cf238052ad77cf4703cc07886ede8bc62f19433d838b282a'
-        '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
-        '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
+        '88ea84a5affa0d59a613d3806b01912f2728f7f995ee957754a77d8ad3b44033e1bec452d2bb9ac7a79fc6aba1aaee1d452d2ca3fecdd2d1c953d334cbd3beb3'
+        '0449ffab9ecf7183253cfb56c7bf489ca6f0a2002f96caa37f2cdb9c77e51e7f8561589e5179496cfb6760b1e8c34a5aefcce4fe0790cab81db3409582a2c835'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
         'a7449cb77ce47e09177290ffbb99c29c6695177464eb4c8902b605c9edc2bd6288c8dc741b3c772274c2e204c55380b3c37204419c6341c2aaaa30ccb776e2f3'
         '8eba2f66280defcc930424d695baff297cff32e91e73f01210bb3f26389ea9e93b4b4d9e2c5a5a048756eff219d51c3fbf3f05690c3c984afcc32c3928df91aa'
         '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
-        '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
-        'f87e28d0b11fb19477a4d91d9d761e03293561a04543e405894cd6c1e63c0353626cb91a781410d299dc3ebcb290be6ceb822cb65c9530c356ac9d4787b322b7'
-        '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
+        '6ce1b6808b48ba0e64a07d2ff84f0283a7b172e470c8b934ab8824afe2eaf6322927807a985f4a333544f20743f39d75f7b83591ae885fcabb344f6f2476ef74'
         '257a9600c893dcba966007b17dffe58f507b52eb8282e624dfe441e5a78bf45210b866b7a5e2ebd6fe8e86a6ac55f427100c52396bb7c05d6e979c9f41a0059a'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
-        '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
-        'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
-        'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        'e6044d7238be1cba2a083b6eb17335e10be3c8116234c67f006c7b6e5a9e25e107412ae2f5a636b01efa70cb54032f5c3da46ec7f0e92917334e72a492f739f8'
+        '83d5a89f14ff8d79f90e677def2f58b1a8a0430ec16bbe3865315b63b3702e699bae157235e70a4c613e84f05b0f7ecf8de4ecef789cb8146edfbe92020c89f0'
+        '60fac0fd3c098c8a38f634372b889c4ac7d2d61f1e08fd79b6216ee6a7116cadc06b974ab2ea5efc74801a9f4a8ad029dde973d1494f6467c57ac860be64acad'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
-        '4a78c71ddc8a7d0a59475427bb0982336338f6328b90e07fb3c131f579f437eb57b43db860e907b12fbf3fa6708689ca3bdd3fdb2430eec1384650bd79944e17'
+        'ccf74105e4268eaa35ba2a79b21c89ea5ce22f5d23c297688f5731681926536cfe0f430347fb6e6e70cac8110c7c64ca944b696b0248796434cf667db171e058'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
-        '9fb6d2945184347e5b4f56f022d9b1b40559c1210edd91cb984d2c69e711dd297eab2a06d1e7d4008052fad658a9574ebd933083e7f8f3b3600b271593cbde15'
+        '1d54ef96ff6875878ac6a6992de7e23a7b98cb5b68d7e444c4f02a6628f657ad26efc757fbeaff34fc89d41fa440d8b57bd0eb437a9d04ad1e06a31ba148061c'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
         '0cb9f39fd0b87e40bbce50ec7e834803bd0d28ff3c5ad25d2542498cfc5b625e7fc20880e34d325e05c51f411cf91721fe6b5a03565686be6cd6fe88772f80d0'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
-        'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
+        '6f78478f642c18101e9cd24a0c693abaa1348bb5c730c9d29b8f80d6309aa4bf16f6672dbc36161875db81a071256a0a388769c96810a7c67e3687ec750605d8'
         'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764'
         'a5e8bca3ccec2990098e8cf1c504ce6bec03cecef03b0450a4396d5b1e0ffc4e91592f40c3e389eea74fc53114cce0f2c1d2237a779e5ec7e6c12b2863d6c731'
-        'dd5aeab5755c68ce7c72a76369b982e8ccabcd103acb46bb992ce96719db36338f8e0b5105b4627659f90ea9a4d8b9b21e2cd734cd08e723c45bcd54209b02be'
-        '5247f058961ef5f366774a1dbc80cb2c158d9c1eee18e4523470fe84ec40a7237cd1687d64cffad7e2ac8f572f85da456024119b656295756672e4ae4214dbbe'
+        'a408f468a4a0b0fea78b3c1cc31be22fc913c0a27052b08e9dde523135ed473008bba6a0245d64ed9863431c3905f6e7663d19e3aa9ba769053a160bcb8bcbfa'
+        '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40'
         '08323e5a95bc755bec6cc7103f82cdad798e1040d04564c26ad3d1b66252afb950f8c92e444bec638ff01b5f592e374948092f2e890b9b031729f9dda774f8cc'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '22cb1ef62d955d4a734434563a278057f91f32c948966d4ba606158c11d86bb3491b06387a5f5eae3640c2210a7ea7dde06f8553c50f4d5144349623434b68e3'
+        '14abb9d0da562fea8a8654e6ca2b12bc948b326e049f1870ba63d76e3753b25e29f42144a222953260ac5375f71dbf524d741e590082c478b3ca555624fb6871'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
 #  cd "${_pkgname}-${_pkgver}"
   cd "${_pkgname}-${pkgver}"
+
+  # Assorted workarounds
   sed \
     -e 's/-Werror//' \
     -e 's/ncursesw5-config/ncursesw6-config/' \
@@ -318,7 +296,7 @@ prepare() {
 
   # Fix version
 #  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-04-0030"|' Makefile
-  sed -i 's|VERSION = unstable|VERSION = "0.4"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.5.1"|' Makefile
 
 
   # # # Hotfixes
@@ -326,56 +304,37 @@ prepare() {
   # # Adjust default mods
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_fix-default-mods.patch
 
-  # Backport fix for non-fouling weapons accumulating fouling
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-01_fix-content-NON_FOULING-flag-not-working-due-to-typo.patch
-
-  # Backport fix for mass grave map extra not generating the corpse pit
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-02_fix-mass_grave-map-extras-3680.patch
-
-  # Backport the power armor rebalance
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-03_feat-balance-power-armor-updates-3625.patch
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-03-2_fix-bugfixes-Fix-light-and-helmet-power-helms-having.patch
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-03-3_feat-balance-HEAVY_WEAPON_SUPPORT-flag-for-large-mut.patch
-
-  # Backport streetlights and the game store required for it
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-04_feat-content-port-game-store-3469.patch
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-04-2_Add-street-lights-to-remaining-shops-port-change-to-.patch
 
-  # Backport some farm fixes
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-05_fix-farm-mapgen-3715.patch
-
-  # Backport some campground fixes
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-06_fix-campground-mapgen-3702.patch
+  # # # Reverts
+  echo "Applying revert patches"
 
-  # Backport some external tileset changes
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch
-  cp -f "$srcdir"/External_Tileset_DP_Normal.png data/json/external_tileset/External_Tileset_DP_Normal.png
+  # Revert craftable smokeless gunpowder. Not realistic and makes black powder obsolete.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch
 
-  # Backport energy weapon mod fixes
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-08_feat-Convert-non-pistol-only-energy-weapon-mods-to-b.patch
+  # Revert hard capping skills at level 10 for now
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-23_fix-balance-no-more-EXP-gain-when-a-skill-is-maxed-o.patch
 
-  # Backport industrial mech incorrectly requiring a military ID card
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-09_feat-balance-MILITARY_MECH-flag-affects-ID-card-need.patch
+  # # Nope, no biodiesel in petrol engines. Altered patch to allow ethanol instead.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-22_feat-content-Biodiesel-Fuel-for-Gasoline-Engines-371.patch
 
-
-  # # # Reverts
-  echo "Applying revert patches"
+  # # I don't get why people are so upset about this guy.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch
 
   # # Revert easy-mode limb mending and related commits
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-27_fix-NPCs-keep-their-splints-on-3589.patch
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-26_fix-npc-splints-and-clean-up-iterator-errors-3592.patch
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-24_fix-repair-nanobots-not-working-at-all-on-broken-lim.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-20_Fix-tidy-warnings-3310.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-19_Fix-Repair-Nanobots-3308.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-18-Simplify-broken-limb-mending-3054.patch
 
   # # Revert mainline craftable rivtech ammo
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-17_Rivtech-mainline-3092.patch
 
   # # More reverts for generic night vision
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch
 
-  # # More reverts for changes to books
-  # Upstream seems to have as serious dislike of in game books.
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-14_Removed-unrelated-references-2738.patch
-
   # # Yet more bad ammo ideas
   # This prevents sorting 223 and 556 ammo into different piles as sorting is assumed wildcard.
   # And a second for 308 and 762.
@@ -398,9 +357,10 @@ prepare() {
 
   # Revert Hub 01 basement removal.
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch
-  
-  # Revert the book changes for now.
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-02_revert-book-revamp.patch
+
+  # Revert the removal of book chapters and the generic overhaul of them.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/revert-02_revert-book-revamp.patch
+  rm -f data/json/items/book/bloat.json
 
   # Revert generic night vision.
   patch -NRp1 --no-backup-if-mismatch -i "$srcdir"/revert-03_generic-nv.patch
@@ -531,10 +491,6 @@ prepare() {
   # Removing item migrations with mods does not seem to work, so here this is.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/migration-01_remove-ucp.patch
 
-  # Remove 8mm FMJ from migration list:
-  # Removing item migrations with mods does not seem to work, so here this is.
-  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/migration-02_remove-8mm-fmj.patch
-
 
   # # missions fixes
   echo "Applying mission fixes"
@@ -565,9 +521,6 @@ prepare() {
   # It was missing "player_display": false
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mutations-02_fix-evac3-background-visible.patch
 
-  # Port in DDA's eye colours
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/mutations-03_eye-colours.patch
-
 
   # # npc fixes
   echo "Applying NPC fixes"
@@ -645,10 +598,6 @@ prepare() {
   # The gas pump was placed on top of a tile that didn't allow items inside, causing the gasoline to be shunted to the next valid one.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-04_lumbermill-gasoline-not-spilled.patch
 
-  # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks:
-  # I'm pretty sure that having it all dumped in a pit was not intentional.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-05_community-garden-fertilizer-not-spilled.patch
-
   # Re-hide something that feels like spoilers.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-07_rehide-redacted.patch
 
@@ -664,10 +613,6 @@ prepare() {
   # More choice is better than less. You can disable undesired map notes in the map notes settings menu.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-11_clean-up-map-extras.patch
 
-  # Add missing stairs to the free merchant center:
-  # The roof has stairs down, but the main floor lacked a matching stairs up.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-12_add_fmc_stairs.patch
-
   # Fix mismatched mapgen palettes:
   # Fixes light machinery incorrectly appearing under various lab furniture
   # All said items define C as the tile in question, but C is already in lab_palette as t_machinery_electronic.
@@ -686,11 +631,6 @@ prepare() {
   # Item was unusable without this patch.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-03_shears-use-light-battery.patch
 
-  # Normalize the manhack volumes to that of the base grenade/explosive:
-  # I don't see how a c-4 manhack could be 1/4 the volume of a stick of c-4.
-  # Grenade hacks were also thrice as big as the base grenade.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-04_normalize-drone-volume.patch
-
 
   # # vehicle fixes
   echo "Applying vehicle fixes"
@@ -716,9 +656,6 @@ prepare() {
 
   # # Uncategorized for now
   echo "Applying uncategorized fixes"
-  # Fix rubber items dismantling into 10x item volume of rubber:
-  # 2023-09-23-0910 attempts to address this, but does not fix a pair of rubber boots exploding into a 156L pile of rubber chunks.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch
 
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-02_add-missing-price-postapoc.patch