Time  Nick        Message
17:44 Krock       Will merge backport fix #7255 in 10 minutes
17:44 ShadowBot   https://github.com/minetest/minetest/issues/7255 -- "#if undefined_constant < number" is always true by mazocomp
17:54 Krock       merging
17:57 sfan5       noo don't directly put things in there
17:58 Krock       when else will we add the bugfixes?
17:58 Krock       It also seems to be missing a travisCI build script update due 404 errors for one or more packages
17:59 sfan5       the idea is that someone (usually me) goes through all left over commits and cherry picks them in the right order
18:00 sfan5       not that bugfixes are merged into backport inconsistently in a random order
18:00 Krock       i.e. push them to the end of the cherry-pick queue?
18:00 sfan5       basically
18:00 sfan5       unless this is a fix unique to backports, then it's fine
18:01 Krock       it is an unique backport fix
18:01 sfan5       ah
18:01 sfan5       still good to note it in the backport pr so I don't accidentally erase it
18:02 Krock       sure, will do.
18:02 sfan5       (or so I can squash it into the corresponding commit)
18:06 Krock       I guess I'm stupid. 10 hours ago I even wrote down that a few commits may not belong into the backports :/
18:53 paramat     please could someone approve #7244 ? code changes are simple but issue is not trivial
18:53 ShadowBot   https://github.com/minetest/minetest/issues/7244 -- Mgvalleys: Use shared tunnel / cavern code instead of internal by paramat
18:59 paramat     will merge game#2110 in 5mins
18:59 ShadowBot   https://github.com/minetest/minetest_game/issues/2110 -- Rebalance bronze and steel tools, swap ore depths by paramat
19:08 rdococ      /home/rdococ/minetest/backport-0.4/src/content_mapblock.cpp:55:1: error: the type ‘const v3s16 [8] {aka const irr::core::vector3d<short int> [8]}’ of constexpr variable ‘light_dirs’ is not literal
19:08 rdococ      Just compiled as of a few minutes ago
19:08 rdococ      or, well, attempted to compile
19:09 Krock       did it work before?
19:09 nerzhul     hey !
19:10 Krock       hi nerzhul
19:10 nerzhul     how are you ? :)
19:11 paramat     now merging to game ..
19:11 Krock       nerzhul, wrong channel but I'm fine
19:12 nerzhul     maybe i forgot to post on #minetest-coredevnews :D
19:12 nerzhul     when 0.4.17 is planned ?
19:14 Krock       this weekend if we have time
19:14 Krock       0.4.17-dev works fine here but there could be some more documentation problems
19:15 nerzhul     oh ?
19:16 paramat     merged
19:18 rdococ      Krock: I think there was a commit an hour ago
19:19 rdococ      But it didn't touch that file
19:19 paramat     will merge #7256 in 5 mins
19:19 ShadowBot   https://github.com/minetest/minetest/issues/7256 -- Node resolver: Make error on fallback optional, disable for mapgen aliases by paramat
19:20 Krock       rdococ, it touched the build system a little. Did it work before that commit?
19:20 rdococ      Krock: Yes, but I was on a different distro (Mint, I'm running Xubuntu atm)
19:20 rdococ      although I don't think that's the type of error that would be distro-specific
19:21 Krock       well then, git reset --hard HEAD~1  on your backport-0.4 branch and re-compile
19:22 rdococ      should I run cmake again or just the make command?
19:22 Krock       no need for cmake, just make -j<nprocs>
19:23 rdococ      k
19:25 paramat     merging 7256
19:33 rdococ      Krock: previous commit worked, so I think the problem might be the commit
19:37 paramat     merged
19:40 Krock       rdococ, looks like we've found a change more to backport https://github.com/minetest/minetest/commit/a98baef5e4fed#diff-c03ca828c6b8a7695f2cd7e52c316a3cR45
19:41 Krock       rdococ, does it work if you "git pull" and change that line manually?
19:43 rdococ      after "git pull" the line says "constexpr"
19:43 rdococ      I'm gonna change it to "const"
19:53 rdococ      Krock: yes
19:54 rdococ      Hm, FPS cap seems to be 60
20:57 paramat     rubenwardy are you ok with #7244 ? code changes are trivial and my speciality so no need to review
20:57 ShadowBot   https://github.com/minetest/minetest/issues/7244 -- Mgvalleys: Use shared tunnel / cavern code instead of internal by paramat
23:43 Wayward_One #7258
23:43 ShadowBot   https://github.com/minetest/minetest/issues/7258 -- Android build failure
23:44 Wayward_One rubenwardy ^