Merge branch 'main' into dev

This commit is contained in:
ThePython 2024-01-22 07:26:55 -08:00
commit 3fdee1ef9a
1 changed files with 5 additions and 4 deletions

View File

@ -273,9 +273,6 @@ else
["farming:seed_cotton"] = 10,
["farming:seed_wheat"] = 16,
["farming:wheat"] = 24,
["moreores:mithril_ingot"] = 16384,
["moreores:silver_ingot"] = 4000,
}) do
exchangeclone.base_energy_values[itemstring] = exchangeclone.base_energy_values[itemstring] or energy_value
end
@ -287,6 +284,10 @@ end
for itemstring, energy_value in pairs ({
["exchangeclone:alchemical_tome"] = 0,
["moreores:mithril_ingot"] = 16384,
["moreores:silver_ingot"] = 4000,
["moreores:tin_ingot"] = 320,
["technic:chromium_ingot"] = 4096,
["technic:granite"] = 1,
["technic:lead_ingot"] = 256,
@ -306,4 +307,4 @@ table.insert_all(exchangeclone.group_values, {
{"sapling", 32},
{"useless", 0},
{"exchangeclone_dirt", 1},
})
})