00:34:29 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4837-gdd944a72e4 02:08:32 -!- ChaosWitch is now known as aoei 03:22:53 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-4837-gdd944a72e4 05:07:23 Unstable branch on crawl.akrasiac.org updated to: 0.30-a0-279-g4b46bab (34) 10:45:31 <06advil> @gammafunk fyi finally retargeted cao's dgl-config to https://github.com/crawl/dgamelaunch-config/tree/cao (and got it in sync there) 10:46:02 <06advil> wonder what would happen if I try to merge with trunk, it is really out of sync with that 10:47:24 <09gammafunk> oh, great 10:47:40 <06advil> would kind of like to get some of the recent trunk commits in that repo though 10:47:42 <09gammafunk> by the way, did you sync the recent cao config changes to the repo? 10:47:48 <06advil> yeah 10:47:51 <09gammafunk> cool 10:48:26 <09gammafunk> did I do a big checkwhite run on the shell scripts in the cao dgl repo? 10:49:04 <06advil> I saw a commit that looked like that 10:49:27 <09gammafunk> aha 10:49:30 <09gammafunk> yeah I see it I think 10:49:34 <09gammafunk> in the ones you pushed 10:50:26 <09gammafunk> I was going to push my cdi commits with a local rewrite of author so that I could properly be identified as the author 10:50:45 <09gammafunk> but I see you didn't both with any of that, which sort of makes sense in that it's actually somewhat difficult to identify who did what 10:51:46 <06advil> yeah, this one hadn't pushed to a remote in years and most of these are just version commits, so I left it all as-is 10:53:48 <09gammafunk> I will try to get my repo cleaned up locally and pushed to a branch for cdi 10:54:43 <09gammafunk> I was going to try merging relevant general commits myself into trunk, but was thinking I would just do this in a clone, however maybe it's better if I just push my stuff to a cdi branch so you can see some of the commits and decide 10:55:18 <09gammafunk> er, by trunk I guess I just mean the master branch 10:55:54 <09gammafunk> and by cdi branch I mean a branch in the official 10:55:55 <09gammafunk> repo 10:56:01 <06advil> sure, yeah, would like to get more permissions settings on other servers 10:56:31 <06advil> maybe we need a dgamelaunch-config-config package to manage syncing dgamelaunch-config server settings with trunk 🤔 10:57:51 <09gammafunk> heh, yeah, I guess the hope is that if we do get stuff synced and just publish our configs to the official repo 10:58:00 <09gammafunk> it will be easier to merge changes into master 10:58:13 <09gammafunk> instead of letting it sit out of date for very long periods of time 10:58:28 <09gammafunk> I don't really like doing all the commits locally on cdi anyhow 10:58:29 <06advil> man I don't think this cao branch has really merged anything from trunk since 2014 10:58:41 <09gammafunk> yeah, sounds right 11:02:58 <06advil> sigh, also looks like unconditionally merging with trunk would be a mess, since it'd apparently overwrite a lot of the server-specific commits 11:03:06 <06advil> not sure I'd want to try a rebase on this 12:21:08 <06advil> https://github.com/crawl/dgamelaunch-config/commit/3e3d3b1711f989e381eebcc19be84526bd0d9d33#diff-6daee0ee0899f90cddd5704561ab969e006649d8c492d94ae08a2f05f574670fL8 looks wrong, right? (same with the following file) 12:24:38 <09gammafunk> yeah doesn't look right 12:26:40 <09gammafunk> and I guess this doesn't matter in practice if you just always use dgl publish 12:26:52 <09gammafunk> which runs the perl script that does everything on its own 12:35:35 <06advil> looks like https://github.com/crawl/dgamelaunch-config/commit/52ee02b3cca58 does incorrectly hit some of the dgl templates 12:36:20 <06advil> I just ran checkwhite again on both my working branch and trunk to get things to sync better 12:53:55 <09gammafunk> honestly I shouldn't have made that commit live on the server, I just got too annoyed by having to deal with tabs every time I modified the CAO config 12:54:35 <09gammafunk> but that's the sort of thing you'd ideally do locally when syncing branches 13:01:11 <06advil> ok https://github.com/crawl/dgamelaunch-config/tree/cao is now much more in sync with trunk, the only thing to do now is check if it still works 🙃 13:02:07 <06advil> sadly I did it all via cherry-picking, making any hope of an actual merge even more distant 13:02:25 <06advil> but it's close enough that stuff should mostly apply cleanly if it doesn't touch config 13:04:05 <06advil> hm, still whitespace issues 13:07:40 <06advil> I think for running checkwhite it is easier just to run it and then use a sed one-liner to fix the menus, there's one in commit messages there (which is hopefully correct, still needs testing in situ) 13:12:28 <06advil> 124 connections: 53 playing (30 idle), 12 watching (2 anon), 59 in lobby (6 anon) 13:12:43 <06advil> I sometimes wonder: do lobby connections just, like, not time out 13:13:39 not that I've seen 13:14:00 I don't online much but I've inadvertently sat in lobbies for a while 13:17:00 <06advil> mv: invalid option -- 'n' 🙃 13:23:06 <06advil> well, now that I've fixed the version of mv in the chroo that was from 2006, everything seems to be more or less working 13:23:20 <06advil> *chroot 13:26:56 provision the chroot from a busybox 13:28:54 hm, except busybox mv/etc. may not support all the modern gnu options I guess 13:42:30 03hellmonk02 07* 0.30-a0-280-g0a2392f0f4: random round collision damage 10(15 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/0a2392f0f49e 13:42:30 03hellmonk02 07* 0.30-a0-281-g74d67f175d: random round some summon durations 10(5 minutes ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/74d67f175d27 13:50:48 Unstable branch on crawl.kelbi.org updated to: 0.30-a0-281-g74d67f175d (34) 14:02:27 New branch created: pull/2783 (1 commit) 13https://github.com/crawl/crawl/pull/2783 14:02:27 03Nikolai Lavsky02 07https://github.com/crawl/crawl/pull/2783 * 0.30-a0-265-g44b4d7d2ad: fix: make Poisonous Vapours targeter ignore rPois enemies 10(6 minutes ago, 3 files, 19+ 0-) 13https://github.com/crawl/crawl/commit/44b4d7d2ad6a 14:11:55 03hellmonk02 07* 0.30-a0-282-gc09304477a: randomly round lrd damage 10(15 minutes ago, 4 files, 7+ 6-) 13https://github.com/crawl/crawl/commit/c09304477ad9 14:11:55 03hellmonk02 07* 0.30-a0-283-gf371ce1921: random round toxic radiance numbers 10(2 minutes ago, 1 file, 4+ 2-) 13https://github.com/crawl/crawl/commit/f371ce1921b0 14:13:19 <09gammafunk> @advil re a dgl command to sync dgl, it seems that someone had some ambitions in this regard (from the dgamelaunch-config readme) 14:13:19 <09gammafunk> https://cdn.discordapp.com/attachments/747522859361894521/1031313915814092860/unknown.png 14:13:30 <09gammafunk> apparently we'll also support nethack 14:29:06 Unstable branch on crawl.kelbi.org updated to: 0.30-a0-283-gf371ce1921 (34) 15:24:17 Unstable branch on underhound.eu updated to: 0.30-a0-283-gf371ce1921 (34) 16:37:07 <10PleasingFungus> hm, should we let ranged weapons spawn with draining? i can't really think of a reason they shouldn't 16:37:17 <10PleasingFungus> draining brand, that is 21:12:19 03PleasingFungus02 07* 0.30-a0-284-g8a68597c01: Make Gozag block hostile soul binding 10(63 minutes ago, 1 file, 2+ 1-) 13https://github.com/crawl/crawl/commit/8a68597c014a 21:12:19 03PleasingFungus02 07* 0.30-a0-285-g5eb3a25a7d: Make J's jellies immune to player mass hexes (Sergey) 10(46 minutes ago, 1 file, 7+ 0-) 13https://github.com/crawl/crawl/commit/5eb3a25a7dab 21:12:19 03PleasingFungus02 07* 0.30-a0-286-g6f7e019470: Make Ashenzari print messages when blocking malevolence 10(35 minutes ago, 1 file, 17+ 1-) 13https://github.com/crawl/crawl/commit/6f7e01947087 21:12:19 03PleasingFungus02 07* 0.30-a0-287-geff92bb211: Clean up transformations + webs (acrobat) 10(33 minutes ago, 1 file, 13+ 7-) 13https://github.com/crawl/crawl/commit/eff92bb211aa 21:12:19 03PleasingFungus02 07* 0.30-a0-288-g5c880eff19: Don't create wretched spriggan druids (Sergey) 10(15 minutes ago, 1 file, 10+ 3-) 13https://github.com/crawl/crawl/commit/5c880eff19af 21:12:19 03PleasingFungus02 07* 0.30-a0-289-g93faf69470: Don't display damage ratings for darts (Undo) 10(12 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/93faf694707c 21:12:19 03PleasingFungus02 07* 0.30-a0-290-g72a7dafe43: Allow stabbing distracted batty mons (acrobat) 10(7 minutes ago, 1 file, 2+ 1-) 13https://github.com/crawl/crawl/commit/72a7dafe43ee 21:12:19 03PleasingFungus02 07* 0.30-a0-291-g84690aa778: Add extra messages for Armataur potion/scroll muts 10(84 seconds ago, 2 files, 8+ 1-) 13https://github.com/crawl/crawl/commit/84690aa77837 21:20:58 Unstable branch on crawl.kelbi.org updated to: 0.30-a0-291-g84690aa778 (34) 21:21:46 03PleasingFungus02 07* 0.30-a0-292-g0f741e3f8e: Make Fedhas protect trees from harm 10(2 minutes ago, 1 file, 7+ 25-) 13https://github.com/crawl/crawl/commit/0f741e3f8e3a 21:34:13 Unstable branch on crawl.kelbi.org updated to: 0.30-a0-292-g0f741e3f8e (34) 22:34:59 Unstable branch on crawl.develz.org updated to: 0.30-a0-292-g0f741e3f8e (34) 22:56:37 Windows builds of master branch on crawl.develz.org updated to: 0.30-a0-292-g0f741e3f8e 23:22:59 Unstable branch on cbro.berotato.org updated to: 0.30-a0-292-g0f741e3f8e (34) 23:54:11 Monster database of master branch on crawl.develz.org updated to: 0.30-a0-292-g0f741e3f8e