diff options
| author | BadToad2000 <jameson.miller@outlook.com> | 2016-07-17 02:05:29 -0500 |
|---|---|---|
| committer | BadToad2000 <jameson.miller@outlook.com> | 2016-07-17 02:05:29 -0500 |
| commit | 5da8914da9e2ff749dd3a3584e4e721656d1a312 (patch) | |
| tree | eda897a637ec961284cf9d6391bff0efab859e4b | |
| parent | 3cdfdd14a5ac1de36f41981a6ed69b0f9f2fd90d (diff) | |
| parent | ea5ffafb9c012d436ac209be32e3d82e35eb21a5 (diff) | |
Merge remote-tracking branch 'main/master' into use_smaller_bag
Merging at VenessaE's request to potentially get this change marged into Unified Inventory.
| -rw-r--r-- | api.lua | 3 | ||||
| -rw-r--r-- | callbacks.lua | 8 | ||||
| -rw-r--r-- | description.txt | 1 | ||||
| -rw-r--r-- | mod.conf | 1 | ||||
| -rw-r--r-- | screenshot.png | bin | 0 -> 137234 bytes | |||
| -rw-r--r-- | textures/bags_large.png | bin | 13705 -> 13428 bytes | |||
| -rw-r--r-- | textures/bags_medium.png | bin | 13084 -> 12362 bytes | |||
| -rw-r--r-- | textures/bags_small.png | bin | 10937 -> 10295 bytes | |||
| -rw-r--r-- | textures/ui_1_icon.png | bin | 688 -> 546 bytes | |||
| -rw-r--r-- | textures/ui_2_icon.png | bin | 1386 -> 1225 bytes | |||
| -rw-r--r-- | textures/ui_3_icon.png | bin | 1839 -> 1457 bytes | |||
| -rw-r--r-- | textures/ui_4_icon.png | bin | 1111 -> 777 bytes | |||
| -rw-r--r-- | textures/ui_5_icon.png | bin | 1464 -> 1154 bytes | |||
| -rw-r--r-- | textures/ui_bags_icon.png | bin | 13705 -> 13428 bytes | |||
| -rw-r--r-- | textures/ui_bags_lg_form.png | bin | 13920 -> 13171 bytes | |||
| -rw-r--r-- | textures/ui_bags_main_form.png | bin | 10390 -> 9948 bytes | |||
| -rw-r--r-- | textures/ui_bags_med_form.png | bin | 12230 -> 11567 bytes | |||
| -rw-r--r-- | textures/ui_bags_sm_form.png | bin | 10885 -> 10356 bytes | |||
| -rw-r--r-- | textures/ui_blank_image.png | bin | 143 -> 81 bytes | |||
| -rw-r--r-- | textures/ui_blue_icon_background.png | bin | 4592 -> 3840 bytes | |||
| -rw-r--r-- | textures/ui_circular_arrows_icon.png | bin | 10771 -> 10512 bytes | |||
| -rw-r--r-- | textures/ui_craft_icon.png | bin | 17517 -> 16352 bytes | |||
| -rw-r--r-- | textures/ui_craftgrid_icon.png | bin | 680 -> 488 bytes | |||
| -rw-r--r-- | textures/ui_craftguide_form.png | bin | 13755 -> 11903 bytes | |||
| -rw-r--r-- | textures/ui_craftguide_icon.png | bin | 17803 -> 17118 bytes | |||
| -rw-r--r-- | textures/ui_crafting_form.png | bin | 4356 -> 2658 bytes | |||
| -rw-r--r-- | textures/ui_doubleleft_icon.png | bin | 11010 -> 10492 bytes | |||
| -rw-r--r-- | textures/ui_doubleright_icon.png | bin | 11239 -> 10531 bytes | |||
| -rw-r--r-- | textures/ui_form_bg.png | bin | 6404 -> 1656 bytes | |||
| -rw-r--r-- | textures/ui_gohome_icon.png | bin | 17098 -> 16087 bytes | |||
| -rw-r--r-- | textures/ui_green_icon_background.png | bin | 5052 -> 4317 bytes | |||
| -rw-r--r-- | textures/ui_group.png | bin | 23875 -> 23701 bytes | |||
| -rw-r--r-- | textures/ui_home_icon.png | bin | 16114 -> 14717 bytes | |||
| -rw-r--r-- | textures/ui_left_icon.png | bin | 7828 -> 7172 bytes | |||
| -rw-r--r-- | textures/ui_main_inventory.png | bin | 7646 -> 4682 bytes | |||
| -rw-r--r-- | textures/ui_misc_form.png | bin | 9354 -> 8941 bytes | |||
| -rw-r--r-- | textures/ui_moon_icon.png | bin | 15255 -> 13900 bytes | |||
| -rw-r--r-- | textures/ui_no.png | bin | 7525 -> 6373 bytes | |||
| -rw-r--r-- | textures/ui_off_icon.png | bin | 7081 -> 5979 bytes | |||
| -rw-r--r-- | textures/ui_ok_icon.png | bin | 4685 -> 3878 bytes | |||
| -rw-r--r-- | textures/ui_on_icon.png | bin | 6838 -> 6064 bytes | |||
| -rw-r--r-- | textures/ui_pencil_icon.png | bin | 7890 -> 6494 bytes | |||
| -rw-r--r-- | textures/ui_red_icon_background.png | bin | 4584 -> 3896 bytes | |||
| -rw-r--r-- | textures/ui_right_icon.png | bin | 7946 -> 7232 bytes | |||
| -rw-r--r-- | textures/ui_search_icon.png | bin | 11830 -> 11242 bytes | |||
| -rw-r--r-- | textures/ui_sethome_icon.png | bin | 15395 -> 14430 bytes | |||
| -rw-r--r-- | textures/ui_skip_backward_icon.png | bin | 9858 -> 9533 bytes | |||
| -rw-r--r-- | textures/ui_skip_forward_icon.png | bin | 9844 -> 9433 bytes | |||
| -rw-r--r-- | textures/ui_sun_icon.png | bin | 19783 -> 19453 bytes | |||
| -rw-r--r-- | textures/ui_trash_icon.png | bin | 15536 -> 14491 bytes | |||
| -rw-r--r-- | textures/ui_waypoint_set_icon.png | bin | 4842 -> 4599 bytes | |||
| -rw-r--r-- | textures/ui_waypoints_icon.png | bin | 15935 -> 15818 bytes | |||
| -rw-r--r-- | textures/ui_xyz_icon.png | bin | 2650 -> 2454 bytes | |||
| -rw-r--r-- | textures/ui_xyz_off_icon.png | bin | 10245 -> 8606 bytes | |||
| -rw-r--r-- | textures/ui_xyz_on_icon.png | bin | 2650 -> 2454 bytes |
55 files changed, 12 insertions, 1 deletions
@@ -25,7 +25,8 @@ minetest.after(0.01, function() for _,chk in pairs(recipe.items) do local groupchk = string.find(chk, "group:") if (not groupchk and not minetest.registered_items[chk]) - or (groupchk and not unified_inventory.get_group_item(string.gsub(chk, "group:", "")).item) then + or (groupchk and not unified_inventory.get_group_item(string.gsub(chk, "group:", "")).item) + or minetest.get_item_group(chk, "exclude_from_craft_guide") ~= 0 then unknowns = true end end diff --git a/callbacks.lua b/callbacks.lua index 392e855..9387154 100644 --- a/callbacks.lua +++ b/callbacks.lua @@ -187,3 +187,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) unified_inventory.current_page[player_name]) end) +if minetest.delete_detached_inventory then + minetest.register_on_leaveplayer(function(player) + local player_name = player:get_player_name() + minetest.delete_detached_inventory(player_name.."_bags") + minetest.delete_detached_inventory(player_name.."craftrecipe") + minetest.delete_detached_inventory(player_name.."refill") + end) +end diff --git a/description.txt b/description.txt new file mode 100644 index 0000000..b541fdf --- /dev/null +++ b/description.txt @@ -0,0 +1 @@ +Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide. diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..26a8af6 --- /dev/null +++ b/mod.conf @@ -0,0 +1 @@ +name = unified_inventory diff --git a/screenshot.png b/screenshot.png Binary files differnew file mode 100644 index 0000000..972cbb4 --- /dev/null +++ b/screenshot.png diff --git a/textures/bags_large.png b/textures/bags_large.png Binary files differindex 38cf6bc..6d56299 100644 --- a/textures/bags_large.png +++ b/textures/bags_large.png diff --git a/textures/bags_medium.png b/textures/bags_medium.png Binary files differindex f048690..59ba11d 100644 --- a/textures/bags_medium.png +++ b/textures/bags_medium.png diff --git a/textures/bags_small.png b/textures/bags_small.png Binary files differindex bf6fe6a..d48ffcb 100644 --- a/textures/bags_small.png +++ b/textures/bags_small.png diff --git a/textures/ui_1_icon.png b/textures/ui_1_icon.png Binary files differindex 43605e0..f4e85a0 100644 --- a/textures/ui_1_icon.png +++ b/textures/ui_1_icon.png diff --git a/textures/ui_2_icon.png b/textures/ui_2_icon.png Binary files differindex dd64510..96175a6 100644 --- a/textures/ui_2_icon.png +++ b/textures/ui_2_icon.png diff --git a/textures/ui_3_icon.png b/textures/ui_3_icon.png Binary files differindex 132dc3a..1db2916 100644 --- a/textures/ui_3_icon.png +++ b/textures/ui_3_icon.png diff --git a/textures/ui_4_icon.png b/textures/ui_4_icon.png Binary files differindex 9b7e430..f344af4 100644 --- a/textures/ui_4_icon.png +++ b/textures/ui_4_icon.png diff --git a/textures/ui_5_icon.png b/textures/ui_5_icon.png Binary files differindex 699e08b..e5dc4b0 100644 --- a/textures/ui_5_icon.png +++ b/textures/ui_5_icon.png diff --git a/textures/ui_bags_icon.png b/textures/ui_bags_icon.png Binary files differindex 38cf6bc..6d56299 100644 --- a/textures/ui_bags_icon.png +++ b/textures/ui_bags_icon.png diff --git a/textures/ui_bags_lg_form.png b/textures/ui_bags_lg_form.png Binary files differindex 15f511d..713cacc 100644 --- a/textures/ui_bags_lg_form.png +++ b/textures/ui_bags_lg_form.png diff --git a/textures/ui_bags_main_form.png b/textures/ui_bags_main_form.png Binary files differindex 26e6938..37450f3 100644 --- a/textures/ui_bags_main_form.png +++ b/textures/ui_bags_main_form.png diff --git a/textures/ui_bags_med_form.png b/textures/ui_bags_med_form.png Binary files differindex f786806..33e922e 100644 --- a/textures/ui_bags_med_form.png +++ b/textures/ui_bags_med_form.png diff --git a/textures/ui_bags_sm_form.png b/textures/ui_bags_sm_form.png Binary files differindex c77ff7c..b3b66bb 100644 --- a/textures/ui_bags_sm_form.png +++ b/textures/ui_bags_sm_form.png diff --git a/textures/ui_blank_image.png b/textures/ui_blank_image.png Binary files differindex f9bcda2..a8735b8 100644 --- a/textures/ui_blank_image.png +++ b/textures/ui_blank_image.png diff --git a/textures/ui_blue_icon_background.png b/textures/ui_blue_icon_background.png Binary files differindex b4fa356..9434217 100644 --- a/textures/ui_blue_icon_background.png +++ b/textures/ui_blue_icon_background.png diff --git a/textures/ui_circular_arrows_icon.png b/textures/ui_circular_arrows_icon.png Binary files differindex 968e404..d687bbf 100644 --- a/textures/ui_circular_arrows_icon.png +++ b/textures/ui_circular_arrows_icon.png diff --git a/textures/ui_craft_icon.png b/textures/ui_craft_icon.png Binary files differindex 8884c61..fbe4cc7 100644 --- a/textures/ui_craft_icon.png +++ b/textures/ui_craft_icon.png diff --git a/textures/ui_craftgrid_icon.png b/textures/ui_craftgrid_icon.png Binary files differindex 5b8025a..b6831a9 100644 --- a/textures/ui_craftgrid_icon.png +++ b/textures/ui_craftgrid_icon.png diff --git a/textures/ui_craftguide_form.png b/textures/ui_craftguide_form.png Binary files differindex 72572b5..3cd8643 100644 --- a/textures/ui_craftguide_form.png +++ b/textures/ui_craftguide_form.png diff --git a/textures/ui_craftguide_icon.png b/textures/ui_craftguide_icon.png Binary files differindex d5b76d2..5866b7b 100644 --- a/textures/ui_craftguide_icon.png +++ b/textures/ui_craftguide_icon.png diff --git a/textures/ui_crafting_form.png b/textures/ui_crafting_form.png Binary files differindex 420323c..02d337d 100644 --- a/textures/ui_crafting_form.png +++ b/textures/ui_crafting_form.png diff --git a/textures/ui_doubleleft_icon.png b/textures/ui_doubleleft_icon.png Binary files differindex ca1f66f..587bb25 100644 --- a/textures/ui_doubleleft_icon.png +++ b/textures/ui_doubleleft_icon.png diff --git a/textures/ui_doubleright_icon.png b/textures/ui_doubleright_icon.png Binary files differindex 995b565..f552acc 100644 --- a/textures/ui_doubleright_icon.png +++ b/textures/ui_doubleright_icon.png diff --git a/textures/ui_form_bg.png b/textures/ui_form_bg.png Binary files differindex 37683f0..74a6a3b 100644 --- a/textures/ui_form_bg.png +++ b/textures/ui_form_bg.png diff --git a/textures/ui_gohome_icon.png b/textures/ui_gohome_icon.png Binary files differindex 1141055..b3397ef 100644 --- a/textures/ui_gohome_icon.png +++ b/textures/ui_gohome_icon.png diff --git a/textures/ui_green_icon_background.png b/textures/ui_green_icon_background.png Binary files differindex 21b4f41..b06c29c 100644 --- a/textures/ui_green_icon_background.png +++ b/textures/ui_green_icon_background.png diff --git a/textures/ui_group.png b/textures/ui_group.png Binary files differindex d7f5dce..2e4714a 100644 --- a/textures/ui_group.png +++ b/textures/ui_group.png diff --git a/textures/ui_home_icon.png b/textures/ui_home_icon.png Binary files differindex eeb4e04..e44419d 100644 --- a/textures/ui_home_icon.png +++ b/textures/ui_home_icon.png diff --git a/textures/ui_left_icon.png b/textures/ui_left_icon.png Binary files differindex 14ad064..68cffb8 100644 --- a/textures/ui_left_icon.png +++ b/textures/ui_left_icon.png diff --git a/textures/ui_main_inventory.png b/textures/ui_main_inventory.png Binary files differindex b65dabb..3d380de 100644 --- a/textures/ui_main_inventory.png +++ b/textures/ui_main_inventory.png diff --git a/textures/ui_misc_form.png b/textures/ui_misc_form.png Binary files differindex d34d326..e74a605 100644 --- a/textures/ui_misc_form.png +++ b/textures/ui_misc_form.png diff --git a/textures/ui_moon_icon.png b/textures/ui_moon_icon.png Binary files differindex 0595a6c..b2d7b44 100644 --- a/textures/ui_moon_icon.png +++ b/textures/ui_moon_icon.png diff --git a/textures/ui_no.png b/textures/ui_no.png Binary files differindex ad9470b..aa98ed6 100644 --- a/textures/ui_no.png +++ b/textures/ui_no.png diff --git a/textures/ui_off_icon.png b/textures/ui_off_icon.png Binary files differindex 1933742..319fc6e 100644 --- a/textures/ui_off_icon.png +++ b/textures/ui_off_icon.png diff --git a/textures/ui_ok_icon.png b/textures/ui_ok_icon.png Binary files differindex e22b2bc..dcbda1d 100644 --- a/textures/ui_ok_icon.png +++ b/textures/ui_ok_icon.png diff --git a/textures/ui_on_icon.png b/textures/ui_on_icon.png Binary files differindex bb34ceb..a9884cf 100644 --- a/textures/ui_on_icon.png +++ b/textures/ui_on_icon.png diff --git a/textures/ui_pencil_icon.png b/textures/ui_pencil_icon.png Binary files differindex ab5ed5e..a73b740 100644 --- a/textures/ui_pencil_icon.png +++ b/textures/ui_pencil_icon.png diff --git a/textures/ui_red_icon_background.png b/textures/ui_red_icon_background.png Binary files differindex c925689..67f5dcc 100644 --- a/textures/ui_red_icon_background.png +++ b/textures/ui_red_icon_background.png diff --git a/textures/ui_right_icon.png b/textures/ui_right_icon.png Binary files differindex ab0195c..1f11868 100644 --- a/textures/ui_right_icon.png +++ b/textures/ui_right_icon.png diff --git a/textures/ui_search_icon.png b/textures/ui_search_icon.png Binary files differindex c64900e..b529e43 100644 --- a/textures/ui_search_icon.png +++ b/textures/ui_search_icon.png diff --git a/textures/ui_sethome_icon.png b/textures/ui_sethome_icon.png Binary files differindex b047102..5c56d64 100644 --- a/textures/ui_sethome_icon.png +++ b/textures/ui_sethome_icon.png diff --git a/textures/ui_skip_backward_icon.png b/textures/ui_skip_backward_icon.png Binary files differindex 92e9e8c..fde4fea 100644 --- a/textures/ui_skip_backward_icon.png +++ b/textures/ui_skip_backward_icon.png diff --git a/textures/ui_skip_forward_icon.png b/textures/ui_skip_forward_icon.png Binary files differindex f046b4f..182e7ed 100644 --- a/textures/ui_skip_forward_icon.png +++ b/textures/ui_skip_forward_icon.png diff --git a/textures/ui_sun_icon.png b/textures/ui_sun_icon.png Binary files differindex 5bd24fb..262b1f3 100644 --- a/textures/ui_sun_icon.png +++ b/textures/ui_sun_icon.png diff --git a/textures/ui_trash_icon.png b/textures/ui_trash_icon.png Binary files differindex 412573c..081bac7 100644 --- a/textures/ui_trash_icon.png +++ b/textures/ui_trash_icon.png diff --git a/textures/ui_waypoint_set_icon.png b/textures/ui_waypoint_set_icon.png Binary files differindex ee44c4c..6eb9d19 100644 --- a/textures/ui_waypoint_set_icon.png +++ b/textures/ui_waypoint_set_icon.png diff --git a/textures/ui_waypoints_icon.png b/textures/ui_waypoints_icon.png Binary files differindex e0281af..530c1d7 100644 --- a/textures/ui_waypoints_icon.png +++ b/textures/ui_waypoints_icon.png diff --git a/textures/ui_xyz_icon.png b/textures/ui_xyz_icon.png Binary files differindex dabea81..9b48acb 100644 --- a/textures/ui_xyz_icon.png +++ b/textures/ui_xyz_icon.png diff --git a/textures/ui_xyz_off_icon.png b/textures/ui_xyz_off_icon.png Binary files differindex 8e45946..3c1836e 100644 --- a/textures/ui_xyz_off_icon.png +++ b/textures/ui_xyz_off_icon.png diff --git a/textures/ui_xyz_on_icon.png b/textures/ui_xyz_on_icon.png Binary files differindex dabea81..9b48acb 100644 --- a/textures/ui_xyz_on_icon.png +++ b/textures/ui_xyz_on_icon.png |
