Time Nick Message 01:27 MTDiscord Class prefixed by I 01:27 MTDiscord IDropAction 01:29 MTDiscord If it is just an abstract base class... the prefix is wrong 18:02 Krock will merge #16731 #17010 #17015 #17017 #17019 in 15 minutes 18:02 ShadowBot https://github.com/luanti-org/luanti/issues/16731 -- HUD: support float values for text `size` property by Zughy 18:02 ShadowBot https://github.com/luanti-org/luanti/issues/17010 -- Use UTF-8 in item metadata and JSON serialization by ryvnf 18:02 ShadowBot https://github.com/luanti-org/luanti/issues/17015 -- Fix bug with missing scrollbar in world mod selection dialog by sfence 18:02 ShadowBot https://github.com/luanti-org/luanti/issues/17017 -- IrrlichtMt: Implement Ctrl+Del/Backspace text manipulation by SmallJoker 18:02 ShadowBot https://github.com/luanti-org/luanti/issues/17019 -- Fix dev build version hash fallback when git is unavailable by kromka-chleba 18:04 sfan5 add #17024 18:04 ShadowBot https://github.com/luanti-org/luanti/issues/17024 -- [no sq] Revert broken on_drop semantics & tests by sfan5 18:07 Krock and 17024 18:22 Krock attempting to merge #16731 manually 18:22 ShadowBot https://github.com/luanti-org/luanti/issues/16731 -- HUD: support float values for text `size` property by Zughy 18:24 Krock the heck. the conflict is not even within the diff 18:26 [MatrxMT]_ Do you want me yo hit "squash and merge"? 18:26 [MatrxMT]_ *to 18:26 Krock Well.. can you? 18:26 sfan5 yeah it only shows a conflict if you try to rebase merge 18:26 Krock If so: then yes. But give it a good title and description 18:27 Krock oh. there was a popup that accidentally prevented me from selecting the Squash & Merge button 18:27 [MatrxMT]_ Go for it then 18:27 Krock so when clicking the down triangle, the popup would flash up right when I wanted to click the other dropdown option 18:27 Krock great design, thank you github. 18:29 Krock - done -