From 6782d8f90c030f89ccc1777c8c480731754b73c5 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Wed, 6 Nov 2024 19:35:23 -0600 Subject: [PATCH 1/3] Remove upstream shock collar migration --- Resources/Migrations/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 54c071f541c..9b6259c2d14 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -402,7 +402,7 @@ FoodMeatFiestaKebab: FoodKebabSkewer ClothingBeltSuspenders: ClothingBeltSuspendersRed # 2024-08-19 -ClothingNeckShockCollar: ClothingBackpackElectropack +#ClothingNeckShockCollar: ClothingBackpackElectropack #DeltaV We keep shock collar and have out own migration # 2024-08-22 ComputerShuttleSalvage: null From 9adbfbc93e99db12feeb2cd279f3d7fd6d5cd851 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Wed, 6 Nov 2024 19:46:48 -0600 Subject: [PATCH 2/3] kay --- Resources/Migrations/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 9b6259c2d14..3800b6721d4 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -402,7 +402,7 @@ FoodMeatFiestaKebab: FoodKebabSkewer ClothingBeltSuspenders: ClothingBeltSuspendersRed # 2024-08-19 -#ClothingNeckShockCollar: ClothingBackpackElectropack #DeltaV We keep shock collar and have out own migration +# ClothingNeckShockCollar: ClothingBackpackElectropack # DeltaV We keep shock collar and have our own migration # 2024-08-22 ComputerShuttleSalvage: null From 561914ce978f01e4a7d85daafc986d3c29d5aaa5 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Wed, 6 Nov 2024 19:47:38 -0600 Subject: [PATCH 3/3] dash too, whatever --- Resources/Migrations/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 3800b6721d4..57636eae33b 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -402,7 +402,7 @@ FoodMeatFiestaKebab: FoodKebabSkewer ClothingBeltSuspenders: ClothingBeltSuspendersRed # 2024-08-19 -# ClothingNeckShockCollar: ClothingBackpackElectropack # DeltaV We keep shock collar and have our own migration +# ClothingNeckShockCollar: ClothingBackpackElectropack # DeltaV - We keep shock collar and have our own migration # 2024-08-22 ComputerShuttleSalvage: null