Time  Nick      Message
10:43 nrz       Sfan5, your answer about submodule is Nice and confirm what i proposed. Merge irrlichtmt in Mt main repo.
10:44 nrz       Wé can merge with keeping history
10:47 Krock     merge as submodule: yes. I don't think you can merge two independent git histories, let alone in a sane manner
11:10 sfan5     you can actually, but I was planning to discard the history anyway
11:10 sfan5     the issue I see like numzero said is that there is still much cleanup to be done on irrlichtmt before (IMO) it should be pulled in
11:11 sfan5     we would also need to think about how the contribution rules apply to irrlicht (need two approvals?)
14:21 nrz       Krock we can merge 2 repos with history in git. Al ready did that dozen of times for dev team merging deps or submodules
14:22 nrz       Sfan5 : if you dont care about history then ez
15:19 Krock     will merge #13439 and #13360 in 10 minutes
15:19 ShadowBot https://github.com/minetest/minetest/issues/13439 -- Use lua codeblocks in `lua_api.md` by AFCMS
15:19 ShadowBot https://github.com/minetest/minetest/issues/13360 -- InventoryManager: Disallow resizing or deleting inventory lists that are in use by SmallJoker
15:22 MTDiscord <luatic> Krock: hold on
15:22 Krock     sure
15:23 MTDiscord <luatic> nevermind, I don't think there's a cleaner solution for commonmark
15:24 MTDiscord <luatic> I think StackOverflow has a feature where you can specify a default language for code blocks in a HTML comment, but I can't find a mention of such a feature for CommonMark or GFM.
15:32 MTDiscord <luatic> Krock: no objection
15:32 MTDiscord <luatic> another (small, I think) inconsistency is the indentation of code blocks in list items, but that can be sorted out later I suppose
15:33 MTDiscord <luatic> (see e.g. https://github.com/minetest/minetest/pull/13439/files#diff-32cda0a7e9cc7c6b7532e8c4c11e3bb2c990cb0fbeef92279999f2a39e8d5d6fR1011 vs https://github.com/minetest/minetest/pull/13439/files#diff-734d6f7c5e37c0f1ac687492709eed138dc481fe632776a9b85179b81ace9889R360)
15:35 Krock     hmm? I noticed those changes but I don't think that makes a difference?
15:36 Krock     ah. it's slightly misaligned
15:37 MTDiscord <luatic> yeah, it probably doesn't make a difference in the rendered output
15:40 Krock     merging the inventory manager PR for now
15:42 Krock     done