From ae8f7cdd6518cd3db348a2d35d1c7bb181b064dc Mon Sep 17 00:00:00 2001
From: Sam Kirby <sk5112@ic.ac.uk>
Date: Tue, 12 Mar 2019 22:49:22 +0000
Subject: [PATCH] fix: Remove references to astikorcarts old modid (#3607)

---
 src/config/carryon.cfg                             | 6 +++---
 src/config/cyclicmagic.cfg                         | 2 +-
 src/config/defaultoptions/keybindings.txt          | 2 +-
 src/config/skillable.cfg                           | 4 ++--
 src/config/triumph/script/triumph/stage0/wheel.txt | 4 ++--
 src/config/triumph/script/triumph/stage1/cart.txt  | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/config/carryon.cfg b/src/config/carryon.cfg
index 61e705af3..a5472a6e6 100644
--- a/src/config/carryon.cfg
+++ b/src/config/carryon.cfg
@@ -93,8 +93,8 @@ general {
     blacklist {
         # Entities that cannot be picked up
         S:forbiddenEntities <
-            astikoor:cargocart
-            astikoor:plowcart
+            astikorcarts:cargocart
+            astikorcarts:plowcart
             farmingforblockheads:merchant
             minecraft:ender_crystal
             minecraft:ender_dragon
@@ -118,7 +118,7 @@ general {
             abyssalcraft:tieredenergypedestal:*
             advancedmortars:*
             appliedenergistics2:*
-            astikoor:*
+            astikorcarts:*
             astralsorcery:*
             betterwithaddons:inverted_gearbox
             betterwithmods:bellows:*
diff --git a/src/config/cyclicmagic.cfg b/src/config/cyclicmagic.cfg
index 4df5c0139..641f8d8ce 100644
--- a/src/config/cyclicmagic.cfg
+++ b/src/config/cyclicmagic.cfg
@@ -1748,7 +1748,7 @@ modpacks {
             animalium
             antiqueatlas
             appliedenergistics2
-            astikoor
+            astikorcarts
             astralsorcery
             base
             baubles
diff --git a/src/config/defaultoptions/keybindings.txt b/src/config/defaultoptions/keybindings.txt
index 572c7bb62..9350ada33 100644
--- a/src/config/defaultoptions/keybindings.txt
+++ b/src/config/defaultoptions/keybindings.txt
@@ -96,7 +96,7 @@ key_Mekanism Item Mode Switch:50:NONE
 key_Mekanism Armor Mode Switch:34:NONE
 key_Mekanism Feet Mode Switch:35:NONE
 key_Mekanism Voice:22:NONE
-key_key.astikoor.desc:19:NONE
+key_key.astikorcarts.desc:19:NONE
 key_bbw.key.mode:50:NONE
 key_bbw.key.fluidmode:33:NONE
 key_key.columnshiftup:21:NONE
diff --git a/src/config/skillable.cfg b/src/config/skillable.cfg
index f3d779089..c4108edd5 100644
--- a/src/config/skillable.cfg
+++ b/src/config/skillable.cfg
@@ -246,8 +246,8 @@ general {
         
         minecraft:lever=adv|triumph:stage2/root
         
-        astikoor:wheel=adv|triumph:stage1/saddle
-        astikoor:cargocart=adv|triumph:stage1/saddle
+        astikorcarts:wheel=adv|triumph:stage1/saddle
+        astikorcarts:cargocart=adv|triumph:stage1/saddle
         
         betterwithmods:single_machine=adv|triumph:stage0/gear
         betterwithmods:hand_crank=adv|triumph:stage0/gear
diff --git a/src/config/triumph/script/triumph/stage0/wheel.txt b/src/config/triumph/script/triumph/stage0/wheel.txt
index 7e956c245..ee925bcbe 100644
--- a/src/config/triumph/script/triumph/stage0/wheel.txt
+++ b/src/config/triumph/script/triumph/stage0/wheel.txt
@@ -1,6 +1,6 @@
 setTranslatedTitle("advancements.stage0.wheel.title")
 
-setIcon("astikoor:wheel")
+setIcon("astikorcarts:wheel")
 
 setTranslatedDescription("advancements.stage0.wheel.description")
 
@@ -9,7 +9,7 @@ setRequiresParents()
 
 //Criteria
 criteria = addCriteria("hasRock", "minecraft:inventory_changed")
-criteria.setItem("astikoor:wheel", 0)
+criteria.setItem("astikorcarts:wheel", 0)
 
 //Rewards
 setRewardExperience(4)
diff --git a/src/config/triumph/script/triumph/stage1/cart.txt b/src/config/triumph/script/triumph/stage1/cart.txt
index 6e727e617..d1cae0d66 100644
--- a/src/config/triumph/script/triumph/stage1/cart.txt
+++ b/src/config/triumph/script/triumph/stage1/cart.txt
@@ -1,6 +1,6 @@
 setTranslatedTitle("advancements.stage1.cart.title")
 
-setIcon("astikoor:cargocart")
+setIcon("astikorcarts:cargocart")
 
 setTranslatedDescription("advancements.stage1.cart.description")
 
@@ -9,7 +9,7 @@ setRequiresParents()
 
 //Criteria
 criteria = addCriteria("hasRock", "minecraft:inventory_changed")
-criteria.setItem("astikoor:cargocart")
+criteria.setItem("astikorcarts:cargocart")
 
 //Rewards
 setRewardExperience(4)