summaryrefslogtreecommitdiff
path: root/revert-09_undo-yet-more-ammo-balancing.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-14 09:27:05 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-14 09:27:05 -0700
commitae9e6f02d85f619bf83a70a0972c23f9aad419dc (patch)
tree3922dd188911ace09f1d5c4f2f466d8dbc934730 /revert-09_undo-yet-more-ammo-balancing.patch
parentUpdated to 2023-02-26-0055 (diff)
downloadcataclysm-bn-ae9e6f02d85f619bf83a70a0972c23f9aad419dc.tar.xz
Updated to 2023-03-13-1611.
Fix PKGBUILD sed indenting.
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
-rw-r--r--revert-09_undo-yet-more-ammo-balancing.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 5fdff85..f071311 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -542,9 +542,9 @@ index 1d6da22013b..937239328dd 100644
"effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index ed67da394f0..31158a8187c 100644
---- a/data/json/items/migration.json
-+++ b/data/json/items/migration.json
-@@ -1740,5 +1740,20 @@
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
+@@ -1740,6 +1740,21 @@
"id": "rubber_armor_horse",
"type": "MIGRATION",
"replace": "rubber_armor_medium_quadruped"
@@ -563,8 +563,9 @@ index ed67da394f0..31158a8187c 100644
+ "id": "8mm_fmj",
+ "type": "MIGRATION",
+ "replace": "8mm_caseless"
- }
- ]
+ },
+ {
+ "id": "chem_zinc_powder",
diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
index c0c56cead36..8e1335380e2 100644
--- a/data/json/obsoletion/recipes.json