update to upstream

scripts/customJEItabs/EctoplasmJEI.zs

@@ -7,9 +7,9 @@ import mods.randomtweaker.jei.IJeiPanel;
 import mods.randomtweaker.jei.IJeiUtils;
 
 var spiritectoplasmJEI as IJeiPanel = JEI.createJei("spirit_ectoplasm", "灵魂掉落");
-spiritectoplasmJEI.setModid("Draconic Alchemy");
-spiritectoplasmJEI.setIcon(<draconicevolution:reactor_core>);
-spiritectoplasmJEI.addRecipeCatalyst(<draconicevolution:reactor_core>);
+spiritectoplasmJEI.setModid("Random Things");
+spiritectoplasmJEI.setIcon(<randomthings:ingredient:2>);
+spiritectoplasmJEI.addRecipeCatalyst(<randomthings:ingredient:2>);
 spiritectoplasmJEI.setBackground(IJeiUtils.createBackground(150, 55));
 spiritectoplasmJEI.addSlot(IJeiUtils.createItemSlot(40, 25, true)); // input
 spiritectoplasmJEI.addSlot(IJeiUtils.createItemSlot(95, 25, false)); // output

scripts/customJEItabs/InfernalFurnaceJEI.zs

@@ -114,3 +114,28 @@ infernalfurnace15.addInput(<divinerpg:arksiane_lump>);
 infernalfurnace15.setOutputs([<enderio:item_material:20>,
   <contenttweaker:tennessine_gem>]);
 infernalfurnace15.build();
+
+
+val infernalfurnace16 = JEI.createJeiRecipe("infernal_furnace");
+infernalfurnace16.addInput(<divinerpg:dirty_pearls>);
+infernalfurnace16.setOutputs([<minecraft:ender_pearl>,
+  <thaumcraft:chunk:1>*4]);
+infernalfurnace16.build();
+
+val infernalfurnace17 = JEI.createJeiRecipe("infernal_furnace");
+infernalfurnace17.addInput(<divinerpg:clean_pearls>);
+infernalfurnace17.setOutputs([<minecraft:ender_pearl>,
+  <thaumcraft:chunk:1>*8]);
+infernalfurnace17.build();
+
+val infernalfurnace18 = JEI.createJeiRecipe("infernal_furnace");
+infernalfurnace18.addInput(<divinerpg:polished_pearls>);
+infernalfurnace18.setOutputs([<minecraft:ender_pearl>,
+  <thaumcraft:chunk:1>*16]);
+infernalfurnace18.build();
+
+val infernalfurnace19 = JEI.createJeiRecipe("infernal_furnace");
+infernalfurnace19.addInput(<divinerpg:shiny_pearls>);
+infernalfurnace19.setOutputs([<minecraft:ender_pearl>,
+  <thaumcraft:chunk:1>*32]);
+infernalfurnace19.build();

scripts/customJEItabs/PuzzleJEI.zs

@@ -22,7 +22,7 @@ modpackpuzzleJEI.onTooltip(function(mouseX, mouseY) as string[]{
     return ["开动大脑！"];
   }  
   else if (mouseX <= 85 && mouseX >= 64 && mouseY <= 35 && mouseY >= 25) {
-    return ["获得左侧物品后即可完成谜题"];
+    return ["获得左侧物品后即可着手完成谜题"];
   }
   return [];
 });
@@ -359,6 +359,14 @@ undeadsoil.addInput(<contenttweaker:summons_to_the_meatball_man>);
 undeadsoil.setOutputs([<contenttweaker:undead_soil>]);
 undeadsoil.build();
 
-
+val recursionfocusing = JEI.createJeiRecipe("meatball_puzzle");
+recursionfocusing.addInput(<contenttweaker:call_to_mission>);
+recursionfocusing.setOutputs([<contenttweaker:recursion_focusing_fabrial>]);
+recursionfocusing.build();
+
+val gemdimensionalascension = JEI.createJeiRecipe("meatball_puzzle");
+gemdimensionalascension.addInput(<contenttweaker:stone_of_dimensional_ascension>);
+gemdimensionalascension.setOutputs([<contenttweaker:gem_of_dimensional_ascension>]);
+gemdimensionalascension.build();
 
 

scripts/customJEItabs/QuartzKnifeJEI.zs

@@ -0,0 +1,32 @@
+#modloaded randomtweaker
+#priority -10
+#reloadable
+
+import mods.jei.JEI;
+import mods.randomtweaker.jei.IJeiPanel;
+import mods.randomtweaker.jei.IJeiUtils;
+
+var quartzcuttingJEI as IJeiPanel = JEI.createJei("quartz_cutting_meatball", "石英切割刀");
+quartzcuttingJEI.setModid("Applied Energistics 2: Meatball Box");
+quartzcuttingJEI.setIcon(<appliedenergistics2:certus_quartz_cutting_knife>);
+quartzcuttingJEI.addRecipeCatalyst(<appliedenergistics2:certus_quartz_cutting_knife>);
+quartzcuttingJEI.addRecipeCatalyst(<appliedenergistics2:nether_quartz_cutting_knife>);
+quartzcuttingJEI.setBackground(IJeiUtils.createBackground(150, 55));
+quartzcuttingJEI.addSlot(IJeiUtils.createItemSlot(40, 25, true)); // input
+quartzcuttingJEI.addSlot(IJeiUtils.createItemSlot(95, 25, false)); // output
+quartzcuttingJEI.addElement(IJeiUtils.createArrowElement(64, 25, 0));
+quartzcuttingJEI.addElement(IJeiUtils.createImageElement("mouseLeft", 68, 6, 13, 14, 0, 0, "contenttweaker:textures/gui/mouse_right.png", 16, 16));
+quartzcuttingJEI.onTooltip(function(mouseX, mouseY) as string[]{
+  if (mouseX <= 81 && mouseX >= 68 && mouseY <= 22 && mouseY >= 6) {
+    return ["右击"];
+  }  
+  return [];
+});
+quartzcuttingJEI.register();
+
+
+val rightclick1 = JEI.createJeiRecipe("right_click_meatball");
+rightclick1.addInput(<minecraft:iron_ingot>);
+rightclick1.setOutputs([<appliedenergistics2:material:21>]);
+rightclick1.build();
+