From f9f6a9b4b4be45df233719ef3d0221c9afe3514a Mon Sep 17 00:00:00 2001 From: Brach Speicher Date: Mon, 9 Mar 2020 22:06:38 -0400 Subject: [PATCH 1/2] Apply ParacelsusPharmD's fix Apparently, there was only a handful of text changes here needed to make things unlock and progress correctly, so making a patch to these two files and filing a pull request to see what's what. --- .../assets/ea/research/expandedarcanum.json | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/ea/research/expandedarcanum.json b/src/main/resources/assets/ea/research/expandedarcanum.json index dc42ac6..a1b372f 100644 --- a/src/main/resources/assets/ea/research/expandedarcanum.json +++ b/src/main/resources/assets/ea/research/expandedarcanum.json @@ -62,14 +62,14 @@ }] }, { - "key": "METALPURIFICATION", + "key": "EA_METALPURIFICATION", "name": "research.EA_METALPURIFICATION.title", "icons": ["thaumcraft:cluster"], "category": "EXPANDEDARCANUM", "location": [5, -2], - "parents": ["EA_ALCHEMY", "METALPURIFICATION@1"], + "parents": ["EA_ALCHEMY", "~METALPURIFICATION@1"], "siblings": [ - "EA_METALPURIFICATION_IE" + "EA_METAL_PURIFICATION_IE" ], "stages": [{ "text": "research.EA_METALPURIFICATION.desc" @@ -93,6 +93,25 @@ "recipes": ["ea:mimic_fork"] } ] + }, + { + "key": "EA_SEALSHEAR", + "name": "research.EA_SEALSHEAR.title", + "icons": ["ea:textures/items/seals/seal_shear.png"], + "category":"EXPANDEDARCANUM","location": [-2,-2], + "parents": ["EA_GOLEMANCY", "~MINDBIOTHAUMIC"], + "meta": [], + "stages": [ + { + "text": "research.EA_SEALSHEAR.desc.1", + "required_research":["!fabrico"], + "required_knowledge":["THEORY;GOLEMANCY;1"] + }, + { + "text": "research.EA_SEALSHEAR.desc.2", + "recipes": ["ea:seal_shear"] + } + ] } ] -} \ No newline at end of file +} From 92d69af20401485d3315e4e87f5de1e892740985 Mon Sep 17 00:00:00 2001 From: Brach Speicher Date: Mon, 9 Mar 2020 22:07:39 -0400 Subject: [PATCH 2/2] Apply ParacelsusPharmD's fixes And with that, all the text patches are applied. They should match what's in the code now. --- src/main/resources/assets/ea/research/ie_module.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/ea/research/ie_module.json b/src/main/resources/assets/ea/research/ie_module.json index 4d53a62..1e7829a 100644 --- a/src/main/resources/assets/ea/research/ie_module.json +++ b/src/main/resources/assets/ea/research/ie_module.json @@ -1,13 +1,13 @@ { "entries": [ { - "key": "EA_UPGRADEREFINING", + "key": "EA_IEUPGREFINING", "name": "research.EA_UPGRADEREFINING.title", "icons": ["ea:upgrade_refining"], "category": "EXPANDEDARCANUM", "location": [-4,2], - "parents": ["EA_INFUSION","INFUSIONENCHANTMENT"], - "meta": ["HIDDEN"], + "parents": ["EA_INFUSION","~INFUSIONENCHANTMENT"], + "meta": ["ROUND"], "stages":[ { "text": "research.EA_UPGRADEREFINING.desc", @@ -16,12 +16,12 @@ ] }, { - "key": "EA_METALPURIFICATION_IE", + "key": "EA_METAL_PURIFICATION_IE", "name": "research.EA_METALPURIFICATION_IE.title", "icons": ["ea:cluster_uranium"], "category": "EXPANDEDARCANUM", "location": [5,-4], - "parents": ["METALPURIFICATION"], + "parents": ["EA_METALPURIFICATION"], "meta": ["ROUND","HIDDEN"], "stages": [ { @@ -31,4 +31,4 @@ ] } ] -} \ No newline at end of file +}