mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
Merge branch 'main' into block-wraps-update
This commit is contained in:
commit
4417eb7685
1 changed files with 6 additions and 4 deletions
|
|
@ -126,9 +126,7 @@ static std::wstring get_caption_string(
|
|||
langs::get(util::str2wstr_utf8(caption->asString()))
|
||||
);
|
||||
} else {
|
||||
return util::pascal_case(
|
||||
langs::get(util::str2wstr_utf8(item.caption))
|
||||
);
|
||||
return util::pascal_case(langs::get(util::str2wstr_utf8(item.caption)));
|
||||
}
|
||||
}
|
||||
// TODO: Refactor
|
||||
|
|
@ -395,7 +393,11 @@ void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
|
|||
int halfremain = stack.getCount() / 2;
|
||||
grabbed.setCount(stack.getCount() - halfremain);
|
||||
// reset all data in the origin slot
|
||||
stack = ItemStack(stack.getItemId(), halfremain);
|
||||
if (stack.getCount() > 1) {
|
||||
stack = ItemStack(stack.getItemId(), halfremain);
|
||||
} else {
|
||||
stack = ItemStack(0, 0);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue