From 50d689a7934c34d131369cba3b0606a18db3dc41 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Mon, 4 Nov 2024 18:42:23 +0000 Subject: [PATCH 1/3] fix master --- Resources/Migrations/N14Migrations.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Migrations/N14Migrations.yml b/Resources/Migrations/N14Migrations.yml index 5a8d24e2232..2d5ee98b602 100644 --- a/Resources/Migrations/N14Migrations.yml +++ b/Resources/Migrations/N14Migrations.yml @@ -17,6 +17,8 @@ N14ClothingOuterNCRVest: N14ClothingOuterNCRVestSnow N14BedrollItem: N14Bedroll N14JunkStackedTires: N14JunkTire1 N14JunkGroundTires: N14JunkTire2 +FoodCrackerCSlice: N14FoodCrackerCSlice +N14FloraWildJalapenoClippingSeed: N14FloraWildGlowpepperClippingSeed # Materials PR 28/09/2024 IngotLead1: N14IngotLead1 IngotAluminum1: N14IngotAluminum1 From b5fb8ab26d8a3620e1e6394e508aa5d4f7a3ad92 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Fri, 15 Nov 2024 17:55:18 +0000 Subject: [PATCH 2/3] update patrons --- Resources/Credits/Patrons.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml index f3f480fb894..7d29bdb02fd 100644 --- a/Resources/Credits/Patrons.yml +++ b/Resources/Credits/Patrons.yml @@ -7,8 +7,10 @@ - Name: "TheTrueRatKing" Tier: Nuclear - Name: "maxxorion" - Tier: Silver + Tier: Nuclear - Name: "Baron216" Tier: Silver - Name: "Gruinspace" - Tier: Gold \ No newline at end of file + Tier: Gold +- Name: "DeadManWalking97" # jado + Tier: Silver \ No newline at end of file From 640392b88673f6cdfdeb1276cf324906f5d35511 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Fri, 15 Nov 2024 17:56:01 +0000 Subject: [PATCH 3/3] remove door migrations --- Resources/Migrations/N14Migrations.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Resources/Migrations/N14Migrations.yml b/Resources/Migrations/N14Migrations.yml index ba033fcc956..4e1bc1ffee0 100644 --- a/Resources/Migrations/N14Migrations.yml +++ b/Resources/Migrations/N14Migrations.yml @@ -86,13 +86,6 @@ N14SpawnPointBoSWashingtonRecruit: N14SpawnPointBoSWashingtonInitiate N14SpawnPointBoSWashingtonResearcher: N14SpawnPointBoSWashingtonScribe N14SpawnPointBoSWashingtonSoldier: N14SpawnPointBoSWashingtonKnight N14SpawnPointBoSWashingtonCaptain: N14SpawnPointBoSWashingtonPaladin -N14DoorBunkerGlassLockedBoSMidwestElder: N14DoorBunkerGlassLockedBoSWashingtonElder -N14DoorBunkerGlassLockedBoSMidwestPaladin: N14DoorBunkerGlassLockedBoSWashingtonPaladin -N14DoorBunkerGlassLockedBoSMidwestInitiate: N14DoorBunkerGlassLockedBoSWashingtonInitiate -N14DoorBunkerGlassLockedBoSPaladin: N14DoorBunkerGlassLockedBoSMidwestPaladin -N14DoorBunkerLockedBoSPaladin: N14DoorBunkerLockedBoSMidwestPaladin -N14DoorBunkerGlassLockedBoSCommander: N14DoorBunkerGlassLockedBoSMidwestCommander -N14DoorBunkerLockedBoSCommander: N14DoorBunkerLockedBoSMidwestCommander # NCR Renamed Spawner Fixes N14SpawnPointNCRMP: null