Merge both hedge alchemy researches together

src/main/java/com/verdantartifice/thaumicwonders/common/init/InitRecipes.java

@@ -325,37 +325,37 @@ private static void initArcaneRecipes() {
 
     private static void initCrucibleRecipes() {
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_soul_sand"), new CrucibleRecipe(
-                "TWOND_NETHER_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Blocks.SOUL_SAND),
                 new ItemStack(Blocks.SAND),
                 new AspectList().add(Aspect.SOUL, 3).add(Aspect.EARTH, 3).add(Aspect.TRAP, 1)
         ));
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_ghast_tear"), new CrucibleRecipe(
-                "TWOND_NETHER_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Items.GHAST_TEAR, 2),
                 new ItemStack(Items.GHAST_TEAR),
                 new AspectList().add(Aspect.SOUL, 10).add(Aspect.ALCHEMY, 10).add(Aspect.UNDEAD, 5)
         ));
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_wither_skull"), new CrucibleRecipe(
-                "TWOND_NETHER_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Items.SKULL, 1, 1),
                 new ItemStack(Items.SKULL, 1, 0),
                 new AspectList().add(Aspect.UNDEAD, 10).add(Aspect.DEATH, 10).add(Aspect.SOUL, 10).add(Aspect.DARKNESS, 5)
         ));
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_end_stone"), new CrucibleRecipe(
-                "TWOND_END_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Blocks.END_STONE),
                 new ItemStack(Blocks.STONE),
                 new AspectList().add(Aspect.EARTH, 5).add(Aspect.DARKNESS, 5)
         ));
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_chorus_fruit"), new CrucibleRecipe(
-                "TWOND_END_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Items.CHORUS_FRUIT),
                 new ItemStack(Items.APPLE),
                 new AspectList().add(Aspect.ELDRITCH, 5).add(Aspect.SENSES, 5).add(Aspect.PLANT, 5)
         ));
         ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "hedge_ender_pearl"), new CrucibleRecipe(
-                "TWOND_END_HEDGE",
+                "TWOND_DIMENSIONAL_HEDGE",
                 new ItemStack(Items.ENDER_PEARL, 2),
                 new ItemStack(Items.ENDER_PEARL),
                 new AspectList().add(Aspect.MOTION, 15).add(Aspect.ELDRITCH, 10)

src/main/resources/assets/thaumicwonders/lang/en_us.lang

@@ -87,13 +87,9 @@ tc.research_category.THAUMIC_WONDERS=Wonderology
 thaumicwonders.research.base.title=Wonderology
 thaumicwonders.research.base.text.stage.1=While the application of thaumaturgy arts and its rules is close at times to mundane technology, sometimes I wonder what I can do with it when I decide to do something more... exotic? Something, that hardly any mundane devices can make. I must delve deeper into this and see what wonders the arts of thaumaturgy reveal to me.
 
-thaumicwonders.research.nether_hedge.title=Infernal Hedge Alchemy
-thaumicwonders.research.nether_hedge.text.stage.1=It bothers me a little that the principles of hedge alchemy are applicable to so few materials in this world.  Perhaps other worlds contain things that this art can be used to create...
-thaumicwonders.research.nether_hedge.text.stage.2=As I hoped, the Nether does indeed contain materials that my arts can replicate. Strangely, not all of them follow quite the same rules that I've come to expect in this world. I'll need to be mindful of the recipes as I work with them.
-
-thaumicwonders.research.end_hedge.title=Alien Hedge Alchemy
-thaumicwonders.research.end_hedge.text.stage.1=My travels have hinted at yet another world to explore. I'll have to study what I find there.
-thaumicwonders.research.end_hedge.text.stage.2=This "End" is an incredibly dangerous place, but it does contain a few materials that respond well to hedge alchemy. 
+thaumicwonders.research.dimensional_hedge.title=Dimensional Hedge Alchemy
+thaumicwonders.research.dimensional_hedge.text.stage.1=It bothers me a little that the principles of hedge alchemy are applicable to so few materials in this world.<BR>My travels have hinted at more worlds to explore. I'll have to study what I can find to utilize in hedge alchemy through my interdimensional travels.
+thaumicwonders.research.dimensional_hedge.text.stage.2=As I hoped, the Nether and the End do indeed contain materials that my arts can replicate. Strangely, not all of them follow quite the same rules that I've come to expect in normal hedge alchemy. I'll need to be mindful of the recipes as I work with them.
 
 thaumicwonders.research.everburning_urn.title=Everburning Urn
 thaumicwonders.research.everburning_urn.text.stage.1=The Everfull Urn is an incredibly useful device, but I'm convinced that I can do better. Something similar, but for other types of fluids. Fluids like, say... lava?

src/main/resources/assets/thaumicwonders/research/alchemy.json

@@ -1,53 +1,28 @@
 {
     "entries": [
         {
-            "key": "TWOND_NETHER_HEDGE",
-            "name": "thaumicwonders.research.nether_hedge.title",
-            "icons": ["minecraft:soul_sand"],
+            "key": "TWOND_DIMENSIONAL_HEDGE",
+            "name": "thaumicwonders.research.dimensional_hedge.title",
+            "icons": ["minecraft:soul_sand", "minecraft:end_stone"],
             "category": "THAUMIC_WONDERS",
             "parents": ["TWOND_BASE", "~HEDGEALCHEMY"],
             "siblings": [],
             "meta": [],
-            "location": [0, 2],
+            "location": [0, 3],
             "reward_item": [],
             "reward_knowledge": [],
             "stages": [
                 {
-                    "text": "thaumicwonders.research.nether_hedge.text.stage.1",
-                    "required_knowledge": ["OBSERVATION;ALCHEMY;1"],
-                    "required_research": ["m_hellandback"]
+                    "text": "thaumicwonders.research.dimensional_hedge.text.stage.1",
+                    "required_knowledge": ["OBSERVATION;ALCHEMY;2"],
+                    "required_research": ["m_hellandback", "m_endoftheworld"]
                 },
                 {
-                    "text": "thaumicwonders.research.nether_hedge.text.stage.2",
+                    "text": "thaumicwonders.research.dimensional_hedge.text.stage.2",
                     "recipes": [
-                        "thaumicwonders:hedge_soul_sand",
+	                    "thaumicwonders:hedge_soul_sand",
                         "thaumicwonders:hedge_ghast_tear",
-                        "thaumicwonders:hedge_wither_skull"
-                    ]
-                }
-            ],
-            "addenda": []
-        },
-        {
-            "key": "TWOND_END_HEDGE",
-            "name": "thaumicwonders.research.end_hedge.title",
-            "icons": ["minecraft:end_stone"],
-            "category": "THAUMIC_WONDERS",
-            "parents": ["TWOND_NETHER_HEDGE"],
-            "siblings": [],
-            "meta": [],
-            "location": [0, 4],
-            "reward_item": [],
-            "reward_knowledge": [],
-            "stages": [
-                {
-                    "text": "thaumicwonders.research.end_hedge.text.stage.1",
-                    "required_knowledge": ["OBSERVATION;ALCHEMY;1"],
-                    "required_research": ["m_endoftheworld"]
-                },
-                {
-                    "text": "thaumicwonders.research.end_hedge.text.stage.2",
-                    "recipes": [
+                        "thaumicwonders:hedge_wither_skull",
                         "thaumicwonders:hedge_end_stone",
                         "thaumicwonders:hedge_chorus_fruit",
                         "thaumicwonders:hedge_ender_pearl"
@@ -61,7 +36,7 @@
             "name": "thaumicwonders.research.catalyzation_chamber.title",
             "icons": ["thaumicwonders:catalyzation_chamber"],
             "category": "THAUMIC_WONDERS",
-            "parents": ["TWOND_EVERBURNING_URN", "TWOND_END_HEDGE", "~METALPURIFICATION", "~INFERNALFURNACE"],
+            "parents": ["TWOND_EVERBURNING_URN", "TWOND_DIMENSIONAL_HEDGE", "~METALPURIFICATION", "~INFERNALFURNACE"],
             "siblings": [],
             "meta": ["SPIKY"],
             "location": [-2, 6],
@@ -132,7 +107,7 @@
             "name": "thaumicwonders.research.panacea.title",
             "icons": ["thaumicwonders:panacea"],
             "category": "THAUMIC_WONDERS",
-            "parents": ["TWOND_END_HEDGE"],
+            "parents": ["TWOND_DIMENSIONAL_HEDGE"],
             "siblings": [],
             "meta": [],
             "location": [0, 6],
@@ -183,7 +158,7 @@
             "name": "thaumicwonders.research.lethe_water.title",
             "icons": ["thaumicwonders:lethe_water"],
             "category": "THAUMIC_WONDERS",
-            "parents": ["TWOND_BASE"],
+            "parents": ["TWOND_DISJUNCTION_CLOTH"],
             "siblings": [],
             "meta": [],
             "location": [4, 0],

src/main/resources/assets/thaumicwonders/research/infusion.json

@@ -5,7 +5,7 @@
             "name": "thaumicwonders.research.everburning_urn.title",
             "icons": ["thaumicwonders:everburning_urn"],
             "category": "THAUMIC_WONDERS",
-            "parents": ["TWOND_NETHER_HEDGE", "~EVERFULLURN", "~INFUSION"],
+            "parents": ["TWOND_DIMENSIONAL_HEDGE", "~EVERFULLURN", "~INFUSION"],
             "siblings": [],
             "meta": [],
             "location": [-2, 2],