Krutoy242 · Krutoy242 · Jan 22, 2025 · Jan 18, 2025 · Jan 18, 2025 · Jan 18, 2025
diff --git a/config/tcresearchpatcher.cfg b/config/tcresearchpatcher.cfg
@@ -5,6 +5,8 @@ general {
     # Note that categories are not automatically deleted (even when having no entries) due to addon incompatibilities.
     S:CategoriesToRemove <
         THAUMADDITIONS
+        WARPTHEORY
+        TCONEVO
      >
 }
 

diff --git a/config/tcresearchpatcher/entries/auromancy_entries.json b/config/tcresearchpatcher/entries/auromancy_entries.json
@@ -15,8 +15,7 @@
         },
         {
           "text": "research.ancient_focus.2",
-          "recipes": ["thaumcraft:focus_ancient"],
-          "warp": 1
+          "recipes": ["thaumcraft:focus_ancient"]
         }
       ]
     },

diff --git a/config/tcresearchpatcher/entries/eldritch_entries.json b/config/tcresearchpatcher/entries/eldritch_entries.json
@@ -10,8 +10,7 @@
       "stages": [
         {
           "text": "research_stage.thaumadditions:void_elemental_pickaxe.1",
-          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 2
+          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"]
         },
         {
           "text": "research_stage.thaumadditions:void_elemental_pickaxe.2",
@@ -29,8 +28,7 @@
       "stages": [
         {
           "text": "research_stage.thaumadditions:void_elemental_axe.1",
-          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 2
+          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"]
         },
         {
           "text": "research_stage.thaumadditions:void_elemental_axe.2",
@@ -48,8 +46,7 @@
       "stages": [
         {
           "text": "research_stage.thaumadditions:void_elemental_shovel.1",
-          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 2
+          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"]
         },
         {
           "text": "research_stage.thaumadditions:void_elemental_shovel.2",
@@ -67,8 +64,7 @@
       "stages": [
         {
           "text": "research_stage.thaumadditions:void_elemental_hoe.1",
-          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 2
+          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"]
         },
         {
           "text": "research_stage.thaumadditions:void_elemental_hoe.2",
@@ -86,8 +82,7 @@
       "stages": [
         {
           "text": "research_stage.thaumadditions:void_thaumometer.1",
-          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 1
+          "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"]
         },
         {
           "text": "research_stage.thaumadditions:void_thaumometer.2",
@@ -107,7 +102,7 @@
           "text": "research_stage.thaumadditions:void_crop.1",
           "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
           "required_item": ["thaumcraft:void_seed;13"],
-          "warp": 4
+          "warp": 2
         },
         {
           "text": "research_stage.thaumadditions:void_crop.2",
@@ -127,7 +122,7 @@
           "text": "research_stage.thaumadditions:void_anvil.1",
           "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
           "required_craft": ["cyclicmagic:block_anvil_magma"],
-          "warp": 3
+          "warp": 1
         },
         {
           "text": "research_stage.thaumadditions:void_anvil.2",
@@ -147,7 +142,7 @@
           "text": "research_stage.thaumadditions:wormhole_mirror.1",
           "required_knowledge": ["OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
           "required_craft": ["thaumcraft:mirrored_glass"],
-          "warp": 2
+          "warp": 1
         },
         {
           "text": "research_stage.thaumadditions:wormhole_mirror.2",
@@ -184,7 +179,7 @@
         {
           "text": "research_stage.thaumadditions:adaminite.1",
           "required_knowledge": ["OBSERVATION;ELDRITCH;3", "THEORY;ELDRITCH;3"],
-          "warp": 5
+          "warp": 10
         },
         {
           "text": "research_stage.thaumadditions:adaminite.2",
@@ -203,7 +198,7 @@
         {
           "text": "research_stage.thaumadditions:mithminite.1",
           "required_knowledge": ["OBSERVATION;ELDRITCH;4", "THEORY;ELDRITCH;4"],
-          "warp": 10
+          "warp": 0
         },
         {
           "text": "research_stage.thaumadditions:mithminite.2",
@@ -525,7 +520,7 @@
         },
         {
           "text": "research_stage.flux_strike.5",
-          "warp": 5
+          "warp": 2
         }
       ]
     },

diff --git a/config/tcresearchpatcher/entries/infusion_entries.json b/config/tcresearchpatcher/entries/infusion_entries.json
@@ -47,7 +47,7 @@
         {
           "text": "research_stage.thaumadditions:meteor_belt.1",
           "required_knowledge": ["OBSERVATION;INFUSION;1", "THEORY;INFUSION;1", "OBSERVATION;ELDRITCH;1", "THEORY;ELDRITCH;1"],
-          "warp": 2
+          "warp": 1
         },
         {
           "text": "research_stage.thaumadditions:meteor_belt.2",

diff --git a/config/tcresearchpatcher/patches/manual_changes.json b/config/tcresearchpatcher/patches/manual_changes.json
@@ -553,12 +553,18 @@
 ,{"key":"FOCUSCURSE","ops":[
   {"op":"replace",
   "path":"meta",
-  "value": ["REVERSE"]}
+  "value": ["REVERSE"]},
+  {"op":"replace",
+  "path":"stages/1/warp",
+  "value": 1}
 ]}
 
 ,{"key":"FOCUSRIFT","ops":[
   {"op":"remove",
-  "path":"meta"}
+  "path":"meta"},
+  {"op":"replace",
+  "path":"stages/0/warp",
+  "value": 1}
 ]}
 
 ,{"key":"FOCUSSCATTER","ops":[
@@ -572,6 +578,12 @@
   "path":"meta"}
 ]}
 
+,{"key":"FOCUSSPELLBAT","ops":[
+  {"op":"replace",
+  "path":"stages/1/warp",
+  "value": 1}
+]}
+
 ,{"key":"MATSTUDWOOD","ops":[
   {"op":"replace",
   "path":"meta",
@@ -791,4 +803,146 @@
   "value": ["thaumcraft:TT_kami_boots"]}
 ]}
 
+,{"key":"LIQUIDDEATH","ops":[
+  {"op":"replace",
+  "path":"stages/0/warp",
+  "value": 1}
+]}
+
+,{"key":"BOTTLETAINT","ops":[
+  {"op":"remove",
+  "path":"stages/0/warp"}
+]}
+
+,{"key":"FORTRESSMASK","ops":[
+  {"op":"remove",
+  "path":"stages/1/warp"}
+]}
+
+,{"key":"JARBRAIN","ops":[
+  {"op":"replace",
+  "path":"stages/1/warp",
+  "value": 2}
+]}
+
+,{"key":"MINDBIOTHAUMIC","ops":[
+  {"op":"replace",
+  "path":"stages/1/warp",
+  "value": 1}
+]}
+
+,{"key":"SEALGUARD","ops":[
+  {"op":"remove",
+  "path":"stages/1/warp"}
+]}
+
+,{"key":"SEALBUTCHER","ops":[
+  {"op":"remove",
+  "path":"stages/1/warp"}
+]}
+
+,{"key":"INFUSIONPROVIDER","ops":[
+  {"op":"remove",
+  "path":"stages/1/warp"}
+]}
+
+,{"key":"KNOWLEDGECORE","ops":[
+  {"op":"remove",
+  "path":"stages/0/warp"}
+]}
+
+,{"key":"TAINT_MEAT","ops":[
+  {"op":"replace",
+  "path":"stages/0/warp",
+  "value": 2}
+]}
+
+,{"key":"TT_ICHORIUMTOOLS","ops":[
+  {"op":"remove",
+  "path":"stages/0/warp"}
+]}
+
+,{"key":"VOID_STONE_USAGE","ops":[
+  {"op":"remove",
+  "path":"stages/0/warp"}
+]}
+
+,{"key":"TT_ICHOR","ops":[
+  {"op":"remove",
+  "path":"stages/0/warp"},
+  {"op":"replace",
+  "path":"stages/1/warp",
+  "value": 3}
+]}
+
+,{"key":"WARP_PAPER","ops":[
+  {"op":"replace",
+  "path":"category",
+  "value": "BASICS"},
+  {"op":"replace",
+  "path":"parents",
+  "value": ["WARP"]},
+  {"op":"replace",
+  "path":"location",
+  "value": [2,-4]}
+]}
+
+,{"key":"PURE_TEAR","ops":[
+  {"op":"replace",
+  "path":"category",
+  "value": "BASICS"},
+  {"op":"replace",
+  "path":"parents",
+  "value": ["WARP_PAPER", "INFUSION"]},
+  {"op":"replace",
+  "path":"location",
+  "value": [3,-5]}
+]}
+
+,{"key":"CLEANSING_AMULET","ops":[
+  {"op":"replace",
+  "path":"category",
+  "value": "INFUSION"},
+  {"op":"replace",
+  "path":"parents",
+  "value": ["PURE_TEAR", "CURIOSITYBAND"]},
+  {"op":"replace",
+  "path":"location",
+  "value": [6,1]}
+]}
+
+,{"key":"TAINT_MEAT","ops":[
+  {"op":"replace",
+  "path":"category",
+  "value": "ALCHEMY"},
+  {"op":"replace",
+  "path":"parents",
+  "value": ["WARP_PAPER","LIQUIDDEATH"]},
+  {"op":"replace",
+  "path":"location",
+  "value": [-4,4]}
+]}
+
+,{"key":"TCONEVO_PRIMALMETAL","ops":[
+  {"op":"replace",
+  "path":"category",
+  "value": "BASICS"},
+  {"op":"replace",
+  "path":"parents",
+  "value": ["PRIMPEARL", "INFUSION"]},
+  {"op":"replace",
+  "path":"location",
+  "value": [-2,7]}
+]}
+
+,{"key":"TCONEVO_BASE","ops":[
+  {"op":"remove",
+  "path":"key"}
+]}
+
+,{"key":"TCONEVO_TCONINFUSIONENCH","ops":[
+  {"op":"remove",
+  "path":"key"}
+]}
+
 ]
diff --git a/resources/ftbquests/lang/en_us.lang b/resources/ftbquests/lang/en_us.lang
@@ -1136,7 +1136,7 @@ q.botania.echinacenko.name=Echinacenko
 q.botania.echinacenko.desc=This flower provides nutritious sustenance to nearby players.
 q.botania.amuileria_kaerunea.name=Amuileria Kaerunea
 q.botania.amuileria_kaerunea.desc=This flower activates only during thunder weather. When it detects items nearby that can be charged, it will summon a lightning strike to energize them.
-q.botania.shulk_me_not.name=Shule Me Not
+q.botania.shulk_me_not.name=Shulk Me Not
 q.botania.shulk_me_not.desc=§dShulk Me Not§r is a powerful mana-generating flower. When a shulker strikes another mob near it, both mobs are killed, producing a large amount of mana.
 q.botania.campanimia.name=Campanimia
 q.botania.campanimia.desc=This flower efficiently utilizes leftover §dessentia§r from a Thaumcraft cauldron. Each second, it §dsiphons§r essentia from directly attached crucibles, provided there’s space in its §3mana§r buffer.\n\nThe more §dessentia§r it consumes, the greater the §3mana§r output, but it only counts unique aspects. If a single aspect is present in multiple cauldrons, it is still considered one, and will be consumed from all cauldrons. \n\nRemember, the cauldron must be heated to function.
@@ -1238,7 +1238,7 @@ q.botania.gaia_guardian_ii.desc=When §3Guardian of Gaia§r killed by a player w
 q.botania.dice_of_fate.desc=Dropped from the Gaia Guardian II - contains a variety of powerful trinkets.\n\nConsult the Lexica Botania for additional information.
 q.botania.elven_mana_spreader.desc=A faster Mana Spreader.\n\nConsult the Lexica Botania for additional information.
 q.botania.band_of_aura.name=Band of aura
-q.botania.band_of_aura.desc=This ring, at the cost of §1mana§r, will simply apply the Haste effect to its wielder.
+q.botania.band_of_aura.desc=This ring will generate small amount of §1mana§r to its wielder mana containers.
 q.botania.elementium_helmet.desc=Grants additional set bonuses.\nAfter completing this quest, mobs will spawn with this armor set sometimes.
 q.botania.terrasteel_helmet.desc=Grants additional set bonuses.\nAfter completing this quest, mobs will spawn with this armor set sometimes.
 q.botania.gaia_mana_spreader.desc=The absolute fastest Mana Spreader.\n\nConsult the Lexica Botania for additional information.

diff --git a/resources/ftbquests/lang/ru_ru.lang b/resources/ftbquests/lang/ru_ru.lang
@@ -1236,7 +1236,7 @@ q.botania.gaia_guardian_ii.desc=Когда §3Защитника Гайи§r у
 q.botania.dice_of_fate.desc=Выпадает из Gaia Guardian II - Что может быть внутри?\n\n За дополнительной информацией обращайтесь в Lexica Botania.
 q.botania.elven_mana_spreader.desc=Более быстрый распределитель маны.\n\n За дополнительной информацией обращайтесь в Lexica Botania.
 q.botania.band_of_aura.name=Повязка Ауры
-q.botania.band_of_aura.desc=Этот кольцо, за стоимость §1мана§r, просто применяет эффект Ускорения к своему владельцу.
+q.botania.band_of_aura.desc=Это кольцо будет генерировать небольшое количество §1маны§r в контейнеры маны своего владельца.
 q.botania.elementium_helmet.desc=Предоставляет дополнительные бонусы комплекта.\nПосле завершения этого квеста иногда будут появляться мобы с этим комплектом брони.
 q.botania.terrasteel_helmet.desc=Предоставляет дополнительные бонусы комплекта.\nПосле завершения этого квеста иногда будут появляться мобы с этим комплектом брони.
 q.botania.gaia_mana_spreader.desc=Абсолютно самый быстрый распределитель маны.\n\n За дополнительной информацией обращайтесь в Lexica Botania.

diff --git a/resources/ftbquests/lang/zh_cn.lang b/resources/ftbquests/lang/zh_cn.lang
@@ -1236,7 +1236,7 @@ q.botania.gaia_guardian_ii.desc=§3盖亚守护者§r被玩家用源质钢斧杀
 q.botania.dice_of_fate.desc=盖亚守护者II掉落。里面有什么？\n\n查阅植物魔法辞典获取更多细节。
 q.botania.elven_mana_spreader.desc=更快的魔力发射器。\n\n查阅植物魔法辞典获取更多细节。
 q.botania.band_of_aura.name=气场之环
-q.botania.band_of_aura.desc=这枚戒指，花费§1法力§r，将简单地为持有者施加急速效果。
+q.botania.band_of_aura.desc=这枚戒指会为佩戴者的法力容器生成少量§1法力§r。
 q.botania.elementium_helmet.desc=能提供额外的套装效果。\n在完成该任务后，怪物生成时偶尔会穿着该套装。
 q.botania.terrasteel_helmet.desc=能提供额外的套装效果。\n在完成该任务后，怪物生成时偶尔会穿着该套装。
 q.botania.gaia_mana_spreader.desc=最快的魔力发射器。\n\n查阅植物魔法辞典获取更多细节。