00:29:31 03regret-index02 07* 0.32-a0-2121-g385508daed: Add Darby to the credits 10(10 seconds ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/385508daed28 00:30:01 03regret-index02 07* 0.32-a0-2121-g385508daed: Add Darby to the credits 10(39 seconds ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/385508daed28 01:35:35 Unstable branch on crawl.develz.org updated to: 0.32-a0-2121-g385508daed (34) 01:59:05 Windows builds of master branch on crawl.develz.org updated to: 0.32-a0-2121-g385508daed 02:32:58 Unstable branch on cbro.berotato.org updated to: 0.32-a0-2121-g385508daed (34) 02:55:55 Monster database of master branch on crawl.develz.org updated to: 0.32-a0-2121-g385508daed 04:12:42 Lettuce2 (L1 HuIE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:1) 04:13:10 Lettuce2 (L3 KoHu) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:2) 04:13:19 Lettuce2 (L3 KoHu) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:2) 04:13:32 Lettuce2 (L3 KoHu) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:2) 06:33:22 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-5208-geafff8c3b6 08:07:34 Unstable branch on crawl.akrasiac.org updated to: 0.32-a0-2121-g385508d (34) 17:51:53 <03i​mplojin> @regret-⸸nde※ thank you for crediting Darby, i'd thought she was already in there 18:39:03 Unstable branch on underhound.eu updated to: 0.32-a0-2121-g385508daed (34) 19:26:31 03mumra02 07https://github.com/crawl/crawl/pull/3980 * 0.32-a0-2103-gedc4157756: Add a whole new generator for shop names 10(28 hours ago, 13 files, 3111+ 79-) 13https://github.com/crawl/crawl/commit/edc415775618 19:27:58 03mumra02 07https://github.com/crawl/crawl/pull/3980 * 0.32-a0-2103-gedc4157756: Add a whole new generator for shop names 10(28 hours ago, 13 files, 3111+ 79-) 13https://github.com/crawl/crawl/commit/edc415775618 19:28:09 <06m​umra> Any objections to me merging shop names? 19:30:53 <06r​egret-⸸nde※> I left a comment on the Github PR about some of my concerns. 19:31:25 <06r​egret-⸸nde※> (The squashing of those commits also looks like it's left the titles of squashed commits, and a paragraph that wasn't properly linewrapped.) 19:47:58 03mumra02 07https://github.com/crawl/crawl/pull/3980 * 0.32-a0-2122-gd17ffca5fc: Add a whole new generator for shop names 10(29 hours ago, 13 files, 3111+ 79-) 13https://github.com/crawl/crawl/commit/d17ffca5fc93 19:48:20 03mumra02 07https://github.com/crawl/crawl/pull/3980 * 0.32-a0-2122-gd17ffca5fc: Add a whole new generator for shop names 10(29 hours ago, 13 files, 3111+ 79-) 13https://github.com/crawl/crawl/commit/d17ffca5fc93 21:18:03 Lettuce2 (L2 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:1) 21:18:12 Lettuce2 (L2 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:1) 21:18:39 Lettuce2 (L2 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -32,9 in region 2, should be 5,9 in region 3) (D:1) 21:32:44 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 21:32:54 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 21:33:08 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 21:33:19 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 21:33:28 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 21:34:04 Lettuce2 (L3 DEAE) ASSERT(valid_cursor_pos(pos.x, pos.y, region)) in 'libutil.cc' at line 404 failed. (invalid cursor position -33,8 in region 2, should be 4,8 in region 3) (D:2) 22:39:35 03dolorous02 07* 0.32-a0-2122-g88fe4fe15f: Use @objective@ properly in Nergalle's dialogue. 10(3 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/88fe4fe15f65 22:40:38 03dolorous02 07* 0.32-a0-2122-g88fe4fe15f: Use @objective@ properly in Nergalle's dialogue. 10(4 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/88fe4fe15f65 22:56:37 <08n​icolae> etiquette question, i was gonna merge https://github.com/crawl/crawl/pull/3982 cause it's a real simple vault and it looks okay to me, what's the right option for the merge button. is it "squash and merge"? 23:00:42 it has only one commit, so squash is irrelevant. I see no merge commits in a not-so-quick look, so you want "rebase" instead of "merge" probably 23:04:53 (actually if I look far enough back there are merge commits, but they seem to have ended in early 2023) 23:05:00 03Lexi Hattaway02 {nicolae} 07* 0.32-a0-2123-gcc75f2f1da: added my first vault (pentagon) after testing 10(24 hours ago, 1 file, 20+ 0-) 13https://github.com/crawl/crawl/commit/cc75f2f1da39 23:05:15 03Lexi Hattaway02 {nicolae} 07* 0.32-a0-2123-gcc75f2f1da: added my first vault (pentagon) after testing 10(24 hours ago, 1 file, 20+ 0-) 13https://github.com/crawl/crawl/commit/cc75f2f1da39 23:05:36 <08n​icolae> CONSUMMATUM EST 23:07:05 03dolorous02 07* 0.32-a0-2124-g191c959e3d: Tweak food_snacking_frequency documentation. 10(4 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/191c959e3d66 23:07:25 03dolorous02 07* 0.32-a0-2124-g191c959e3d: Tweak food_snacking_frequency documentation. 10(4 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/191c959e3d66 23:10:17 I don't know what the rules are here, but it seems to me that rebase and no squash is normal (and leads to commit storms, but that may be a plus if one of them needs to be reverted you can't do that if you squash) 23:11:02 *reverted; 23:13:59 <03i​mplojin> rebase is typical here, with squash if the commit history needs to be cleaned up, just try to avoid merge commits i think 23:14:36 <03i​mplojin> also probably should ask that contributor how they'd like to be credited if that was their first 23:14:49 ^ 23:14:51 <03i​mplojin> (yes i feel bad about darby) 23:20:04 <08n​icolae> ah, good call 23:24:34 03nicolae02 07* 0.32-a0-2125-g9333e8e020: Tone down the greed value of a Shoals shop 10(69 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/9333e8e02073 23:24:39 03nicolae02 07* 0.32-a0-2125-g9333e8e020: Tone down the greed value of a Shoals shop 10(68 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/9333e8e02073 23:30:30 03dolorous02 07* 0.32-a0-2126-g28ae855c5f: Fix enum name for magnetised dust clouds. 10(7 minutes ago, 3 files, 3+ 3-) 13https://github.com/crawl/crawl/commit/28ae855c5f7e 23:31:02 03dolorous02 07* 0.32-a0-2126-g28ae855c5f: Fix enum name for magnetised dust clouds. 10(7 minutes ago, 3 files, 3+ 3-) 13https://github.com/crawl/crawl/commit/28ae855c5f7e 23:34:04 <04d​racoomega> Oh, oops 23:38:06 <06d​olorous_84348> It happens, and it's an easy enough fix anyway. 23:59:45 <03i​mplojin> @dracoomega https://discord.com/channels/735056636644687913/747522859361894521/1162063437413757009 see this link for some descent discussion from last year