diff --git a/README.md b/README.md index fb74a3d..bdb19a9 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ Dependencies: Minetest Game or MineClone. * Test everything in MTG, MCL2, and MCLA (and 5.7) * Finish changelog * Finish wiki +* Improve covalence formspec ### v6.0 (The Compatibility Update) @@ -85,7 +86,7 @@ Dependencies: Minetest Game or MineClone. * New Features: * Automatically generated energy values! Based on crafting and cooking recipes. * Depending on the number of crafting recipes you have, this could increase load times. This is definitely a bit of an issue in MineClone2, probably due to the number of banner/dye recipes. Eventually (hopefully), loom functionality will be added and this will improve quite a bit. - * Technic recipe types (grinding, alloying, etc.) will also work, as long as their `output_size` is 1 (meaning they only output one item at a time, so not the centrifuge or separator). + * Technic support coming as soon as possible (Technic needs to change some things first). Technic recipe types (grinding, alloying, etc.) WILL eventually work, as long as their `output_size` is 1 (meaning they only output one item at a time, so not the centrifuge or separator). * Also supports Mineclonia's stonecutter recipes, Netherite upgrades, and more. * Added various ways of adding custom energy values or energy recipes (`exchangeclone.register_alias`, `exchangeclone.register_craft_type`, and `exchangeclone.register_craft`) * Support for Pipeworks and Hopper mods! (MCL hoppers already worked) diff --git a/exchangeclone/alchemical_chests.lua b/exchangeclone/alchemical_chests.lua index acfe990..c646b06 100644 --- a/exchangeclone/alchemical_chests.lua +++ b/exchangeclone/alchemical_chests.lua @@ -140,7 +140,7 @@ for color, color_data in pairs(exchangeclone.colors) do description = S("@1 Advanced Alchemical Chest", S(color_data.name)).."\n"..S("Shift+right-click with an alchemical bag to change the color."), _mcl_hardness = 3, _mcl_blast_resistance = 6, - groups = {container = 1, advanced_alchemical_chest = 1}, + groups = {container = 1, advanced_alchemical_chest = 1, cracky = 2, pickaxey = 2}, paramtype2 = "4dir", tiles = { "exchangeclone_advanced_alchemical_chest_top.png"..chest_modifier, diff --git a/exchangeclone/infinite_food.lua b/exchangeclone/infinite_food.lua index 76bccd3..b5bcc63 100644 --- a/exchangeclone/infinite_food.lua +++ b/exchangeclone/infinite_food.lua @@ -11,8 +11,10 @@ local function infinite_food_function(itemstack, player, pointed_thing) end local player_energy = exchangeclone.get_player_energy(player) if player_energy >= 64 then - if stamina_exists and stamina.get_saturation(player) >= stamina_max then - return nil + if stamina_exists then + if stamina.get_saturation(player) >= stamina_max then + return nil + end elseif not exchangeclone.mcl and player:get_hp() >= player:get_properties().hp_max then return nil end diff --git a/exchangeclone/philosophers_stone.lua b/exchangeclone/philosophers_stone.lua index 420e470..21c70f7 100644 --- a/exchangeclone/philosophers_stone.lua +++ b/exchangeclone/philosophers_stone.lua @@ -14,7 +14,7 @@ local width = (exchangeclone.mcl and 9) or 8 local repairing_formspec = "size["..tostring(width)..", 7]".. "label[0.5,0.5;Repairing]".. - "label["..tostring(width/3-0.5)..",0.5;Covalence Dust]".. + "label["..tostring(width/3-0.5)..",0.5;Dust]".. "list[current_player;exchangeclone_covalence_dust;"..tostring(width/3-0.5)..",1;1,1]".. "label["..tostring(width/2-0.5)..",0.5;Gear]".. "list[current_player;exchangeclone_covalence_gear;"..tostring(width/2-0.5)..",1;1,1]".. @@ -22,11 +22,11 @@ local repairing_formspec = "list[current_player;exchangeclone_covalence_output;"..tostring(2*width/3-0.5)..",1;1,1]".. exchangeclone.inventory_formspec(0,2.75).. "listring[current_player;main]".. - "listring[context;src]".. + "listring[current_player;exchangeclone_covalence_gear]".. "listring[current_player;main]".. - "listring[context;fuel]".. + "listring[current_player;exchangeclone_covalence_dust]".. "listring[current_player;main]".. - "listring[context;dst]".. + "listring[current_player;exchangeclone_covalence_output]".. "listring[current_player;main]" if exchangeclone.mcl then