diff options
| author | heav-4 <heavpoot@gmail.com> | 2022-02-12 07:54:10 +0000 |
|---|---|---|
| committer | heav-4 <heavpoot@gmail.com> | 2022-02-12 07:54:10 +0000 |
| commit | 7ab7b74e43aff61dae21c4e65d85b4c697d3db25 (patch) | |
| tree | 8942f9ddfba1a4817a9933b8a6d413580e610a20 | |
| parent | 104a921c94fd85471a01fffe496534c353c1f9a7 (diff) | |
| parent | 9b13c852c4621f76e206c9a88844e67595dcf3a9 (diff) | |
Merge branch 'master' of citrons.xyz:vzxv
| -rw-r--r-- | mods/vzxv_itemstacks/container.lua | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mods/vzxv_itemstacks/container.lua b/mods/vzxv_itemstacks/container.lua index be6d7d9..a3ff770 100644 --- a/mods/vzxv_itemstacks/container.lua +++ b/mods/vzxv_itemstacks/container.lua @@ -8,7 +8,11 @@ local function update_container_entity(entity, stack) collide_with_objects = false, visual = "wielditem", visual_size = {x = 0.4, y = 0.4}, +<<<<<<< HEAD wield_item = stack:get_name(), +======= + wield_item = stack.name, +>>>>>>> 9b13c852c4621f76e206c9a88844e67595dcf3a9 static_save = false, } end |