Time  Nick      Message
15:48 sfan5     merging #9797 in 5 minutes
15:49 ShadowBot https://github.com/minetest/minetest/issues/9797 -- ItemEntity: Add message to moveresult assertion by rubenwardy
16:57 Krock     #9860   > There should be no way for the peer to just disappear that point.
16:57 ShadowBot https://github.com/minetest/minetest/issues/9860 -- network: Replace a fatal_error with just error logging by sfan5
16:57 Krock     So if this is a structural issue, then it might make sense to display this properly?
16:57 Krock     LOG() only hides the bug, if it's an important one
16:59 sfan5     printing it to errorstream should be plenty visible
17:01 Krock     well yes. in debug builds
17:01 Krock     meh whatever
17:02 sfan5     it also logs in release builds, my comment was a bit ambigous
17:03 Krock     ah yes. connection.cpp L44 etc
17:16 Krock     will merge #9223 and #9764 in 10 minutes
17:16 ShadowBot https://github.com/minetest/minetest/issues/9223 -- Add chat_log_level setting by SmallJoker
17:16 ShadowBot https://github.com/minetest/minetest/issues/9764 -- Collision detection - #9343 follow-up by TheTermos
17:25 Krock     merging...
17:28 Krock     done
19:05 sfan5     merging #9858 and #9860 in 10 minutes
19:05 ShadowBot https://github.com/minetest/minetest/issues/9858 -- CSM: Bugfixes to camera:get_pos() and camera:get_fov() by sfan5
19:05 ShadowBot https://github.com/minetest/minetest/issues/9860 -- network: Replace a fatal_error with just error logging by sfan5
21:23 paramat   merging #9296
21:23 ShadowBot https://github.com/minetest/minetest/issues/9296 -- Add new Mapgen V7 floatland implementation by paramat
21:33 paramat   +1 for game#2680 , merging
21:33 ShadowBot https://github.com/minetest/minetest_game/issues/2680 -- Add new dry shrub texture by Extex101 by sfan5
21:34 sfan5     thanks
22:48 paramat   merging game#2617
22:48 ShadowBot https://github.com/minetest/minetest_game/issues/2617 -- Add wild cotton plant in savanna as a source of cotton seeds by paramat