Time Nick Message 16:55 Krock will merge #10160 in 15 minutes 16:55 ShadowBot https://github.com/minetest/minetest/issues/10160 -- Cleanup ClientLauncher by SmallJoker 16:57 Krock #9523 too 16:57 ShadowBot https://github.com/minetest/minetest/issues/9523 -- Add object crosshair and disable entity selectionboxes by default by LoneWolfHT 17:09 Krock MERGING 17:12 Krock oh no 17:14 Krock Force push 94619d8b4...88ffd6412 -> post-corrected the commit message 17:15 Krock github ignored the input boxes 17:16 Lone_Wolf heh 17:16 Lone_Wolf Can I rebase properly without a force-push? 17:17 sfan5 rebasing rewrites the history, so no 17:17 Krock Lone_Wolf: no, that would be a merge 17:17 Krock and the "merge rebase" what GitHub offers, is a fake rebase where you just merge your branch with master 17:18 Lone_Wolf Ah, ok. Guess I'll just start squashing when I rebase 17:18 sfan5 "merge rebase" is an oxymoron 17:19 Krock hence " 17:19 Krock Lone_Wolf: highly recommended for your own sake. Use what works best for you 17:21 Lone_Wolf It'll probably work fine, I'm still learning git so wasn't aware of how to do it 17:22 Krock feel free to ask if you're running into a tiring situation - there might be easy solutions ;) 20:25 sfan5 merging #9888 + #10128 in 10 minutes 20:25 ShadowBot https://github.com/minetest/minetest/issues/9888 -- Implement grouped mode for find_nodes_in_area by sfan5 20:25 ShadowBot https://github.com/minetest/minetest/issues/10128 -- Formspecs: volume and key settings windows can now be closed by doubleclicking/tapping by Zughy