Merge branch 'main' of github.com:brevven/tungsten into main

compatibility/crafting-efficiency.lua

@@ -8,16 +8,22 @@ if mods["crafting-efficiency-2"] then
   for i, recipe in pairs(util.me.recipes) do
     -- add remaining recipes with direct items to find the icons
     if data.raw.recipe[recipe] and (data.raw.item[recipe] or data.raw.fluid[recipe])
-    and not eff_data[recipe] and 
+    and not eff_data[recipe] then 
-    recipe ~= "alumina" and -- for some reason this does not work, despite having a main_product
+      local research_level = 1
-    recipe ~= "phenol" and -- for some reason this does not work, despite having a main_product
+      if not data.raw.recipe[recipe].enabled then
-    "enriched-" ~= string.sub(recipe, 1, string.len("enriched-")) and
+        for tech, tbl in pairs(data.raw.technology) do
-    (data.raw.recipe[recipe].main_product or util.get_result_count(recipe) == 1) then
+          for _, effect in pairs(tbl.effects or {}) do
+            if effect.type == "unlock-recipe" and effect.recipe == recipe then
+              research_level = math.min(#tbl.unit.ingredients, 6)
+            end
+          end
+        end
+      end
       eff_data[recipe] = {
         max = 15,
         icon = util.get_item_or_fluid_icon(recipe),
         crafting = { efficiency = 10 },
-        research = { level = 6 },
+        research = { level = research_level },
       }
     end
   end

tungsten-enriched.lua

@@ -30,6 +30,7 @@ data:extend({
     always_show_made_in = true,
     always_show_products = true,
     allow_productivity = true,
+	subgroup = "raw-material",
     ingredients =
     {
       {type = "fluid", name = "ammonia", amount = 10},