summaryrefslogtreecommitdiff
path: root/revert-09_undo-yet-more-ammo-balancing.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
-rw-r--r--revert-09_undo-yet-more-ammo-balancing.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index c7c7940..b8a7555 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -35,7 +35,6 @@ Doi
data/json/obsoletion/recipes.json | 10 ++++
data/json/professions.json | 4 +-
data/json/recipes/ammo/shot.json | 4 +-
- .../blacklists/item_blacklist.json | 1 -
.../Generic_Guns/ammo/gg_ammo_migration.json | 3 -
.../Generic_Guns/recipes/recipe_obsolete.json | 7 +--
data/mods/No_Rivtech_Guns/modinfo.json | 1 -
@@ -623,18 +622,6 @@ index 80a7881ea64..27b7bb17832 100644
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_SHOT",
-diff --git a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-index b3c43dcce30..5f4a73db8fa 100644
---- a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-+++ b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-@@ -26,7 +26,6 @@
- "8mm_bootleg",
- "8mm_caseless",
- "8mm_civilian",
-- "8mm_fmj",
- "8mm_inc",
- "8mm_jhp",
- "8x40_10_mag",
diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
index 675f5ba932d..8e61d596190 100644
--- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json