00:32:58 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4926-gc5d0056c4d 03:20:55 New branch created: pull/3179 (11 commits) 13https://github.com/crawl/crawl/pull/3179 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-220-g058e65a177: Update spells.txt 10(2 hours ago, 1 file, 16+ 12-) 13https://github.com/crawl/crawl/commit/058e65a17746 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-221-g998ea05afa: Update unrand.txt 10(66 minutes ago, 1 file, 12+ 9-) 13https://github.com/crawl/crawl/commit/998ea05afa0d 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-222-g4c67e558bb: Update items.txt 10(21 minutes ago, 1 file, 30+ 24-) 13https://github.com/crawl/crawl/commit/4c67e558bbcd 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-223-g215343461c: Update monsters.txt 10(14 minutes ago, 1 file, 6+ 0-) 13https://github.com/crawl/crawl/commit/215343461cb3 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-224-gff6c3a9e3b: Update status.txt 10(11 minutes ago, 1 file, 14+ 1-) 13https://github.com/crawl/crawl/commit/ff6c3a9e3bd5 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-225-g669c5abb33: Update mutations.txt 10(10 minutes ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/669c5abb3344 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-226-geaf8d677da: Update features.txt 10(9 minutes ago, 1 file, 5+ 0-) 13https://github.com/crawl/crawl/commit/eaf8d677daa8 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-227-g06de941a8a: Update cards.txt 10(8 minutes ago, 1 file, 1+ 7-) 13https://github.com/crawl/crawl/commit/06de941a8a37 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-228-g8afa831a47: Update backgrounds.txt 10(7 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/8afa831a47b8 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-229-g1eaa545470: Update help.txt 10(6 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/1eaa545470ec 03:20:56 03Zhang Kai02 {GitHub} 07https://github.com/crawl/crawl/pull/3179 * 0.31-a0-230-gb5be26f571: Update FAQ.txt 10(5 minutes ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/b5be26f571e0 03:22:59 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-4926-gc5d0056c4d 05:06:34 Unstable branch on crawl.akrasiac.org updated to: 0.31-a0-219-g8d62b2e (34) 09:17:52 03nicolae02 07[slime_crime_prime_time] * 0.31-a0-179-ge510a54657: Remove slime_pit_nicolae_block_by_block 10(6 minutes ago, 1 file, 0+ 70-) 13https://github.com/crawl/crawl/commit/e510a546573e 09:17:52 Branch pull/3088 updated to be equal with slime_crime_prime_time: 13https://github.com/crawl/crawl/pull/3088 09:20:37 <08nicolae> @gammafunk i think slime endings are good to merge, is the "squash and merge" button sufficient or should i do something with my local git repository first 09:40:52 <06pleasingfungus> squash and merge probably gets you a bad commit message 09:42:05 <06pleasingfungus> i’d do it locally if possible. git fetch, git reset origin/master, git commit -a, git push -f 09:42:20 <06pleasingfungus> something like that 09:46:26 04Build failed for 08slime_crime_prime_time @ e510a546 06https://github.com/crawl/crawl/actions/runs/5446610086 09:47:16 <08nicolae> ugh. i don't remember all this git stuff 09:47:41 <09gammafunk> Yeah I'd recommend you squash locally to make a single commit message like pf says. Make sure you're on the branch and not master! 09:47:59 <09gammafunk> I could merge tonight if you prefer 09:49:07 <09gammafunk> Not sure if squash and merge button lets you make a final commit message 09:49:28 <09gammafunk> Otherwise that would be easier for you 09:50:19 <09gammafunk> But if it's a hassle I can merge and make sure commit message is right, or maybe pf has time to before I do 09:50:48 <09gammafunk> If he's not banished to Toddler:27 09:51:56 <08nicolae> i think i got it 09:52:45 <08nicolae> ...hopefully 09:53:22 03nicolae02 07[slime_crime_prime_time] * 0.31-a0-177-g4ddc15b090: Add some new Slime Pit endings 10(3 months ago, 1 file, 542+ 124-) 13https://github.com/crawl/crawl/commit/4ddc15b090ea 09:53:22 Branch pull/3088 updated to be equal with slime_crime_prime_time: 13https://github.com/crawl/crawl/pull/3088 09:53:34 -!- Dondy64 is now known as dondy 09:58:43 <09gammafunk> Incoming repository deletion 10:03:32 <08nicolae> no! 10:03:42 <09gammafunk> Why not 10:04:07 <09gammafunk> We'd all have time for other hobbies then 10:04:19 <08nicolae> but those other hobbies are for nerds 10:04:58 <08nicolae> anyway, assuming that i've got the PR in a reasonable state, what's the right button to merge. squash and merge? 10:05:48 <09gammafunk> It's all squashed on branch right? 10:06:05 <08nicolae> should be, the PR only shows one commit with the updated commit message 10:07:00 <09gammafunk> Yeah so rebase and merge 10:07:27 <09gammafunk> No need for squash when the squash is squashed 10:07:59 03nicolae02 07* 0.31-a0-220-gc2f4f3cf83: Add some new Slime Pit endings 10(3 months ago, 1 file, 542+ 124-) 13https://github.com/crawl/crawl/commit/c2f4f3cf8337 10:08:35 <09gammafunk> Sadly no merge commit for us to complain about 10:08:42 <08nicolae> 8) 10:14:42 04Build failed for 08master @ c2f4f3cf 06https://github.com/crawl/crawl/actions/runs/5446984308 10:16:21 <08nicolae> aw fuck 10:19:55 Unstable branch on crawl.kelbi.org updated to: 0.31-a0-220-gc2f4f3cf83 (34) 10:22:48 <09gammafunk> Your slime vaults broke MacOS console. I hope you're happy with yourself 10:26:19 <08nicolae> i am :satisfacsun: 10:33:04 03nicolae02 {GitHub} 07[nicolae-0423-just-some-stuff] * 0.31-a0-224-ga203a2339c: Merge branch 'master' into nicolae-0423-just-some-stuff 10(14 seconds ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/a203a2339c88 10:33:04 Branch pull/3087 updated to be equal with nicolae-0423-just-some-stuff: 13https://github.com/crawl/crawl/pull/3087 10:37:15 <08nicolae> Ugh, I rebased the files in that repository but it won't let me push them 11:08:52 <09gammafunk> Rebased in your local repo? And it won't let you push to branch in official repo? That's because you must force push the branch. Rebasing means rewriting history usually, hence force push 11:09:32 <08nicolae> i did git push -f 11:09:46 <08nicolae> well, fuck 11:09:51 <08nicolae> i just tried it again and it worked, Of Course 11:10:20 <09gammafunk> You didn't push hard enough, weakling 11:10:40 03nicolae02 07[nicolae-0423-just-some-stuff] * 0.30-a0-1043-g518cde9021: Add a few vaults in various places 10(3 months ago, 3 files, 236+ 0-) 13https://github.com/crawl/crawl/commit/518cde902157 11:10:40 03nicolae02 {GitHub} 07[nicolae-0423-just-some-stuff] * 0.31-a0-222-g0d184a366a: Merge branch 'master' into nicolae-0423-just-some-stuff 10(15 seconds ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/0d184a366aaf 11:10:40 Branch pull/3087 updated to be equal with nicolae-0423-just-some-stuff: 13https://github.com/crawl/crawl/pull/3087 11:10:47 <08nicolae> fucking goddammit 11:10:52 <09gammafunk> Lol 11:11:23 <09gammafunk> We got there 11:11:43 03nicolae02 {GitHub} 07* 0.31-a0-221-gbddc013574: Add a few vaults in various places (#3087) 10(35 seconds ago, 3 files, 236+ 0-) 13https://github.com/crawl/crawl/commit/bddc01357496 11:19:33 Unstable branch on crawl.kelbi.org updated to: 0.31-a0-221-gbddc013574 (34) 11:41:17 04Build failed for 08nicolae-0423-just-some-stuff @ 0d184a36 06https://github.com/crawl/crawl/actions/runs/5447418613 11:53:17 fungus - i love stripping all the int, spellcasting, spellpower etc stuff from Transmuter! solves the age-old question of whether it's supposed to be a physical character or a brainal character 11:57:13 <06pleasingfungus> thanks! 🙂 12:13:45 I have one complaint, ie, the plural of "talisman" is "talismen" :-) 12:15:21 <08nicolae> talaremen 12:16:02 <06pleasingfungus> https://cdn.discordapp.com/attachments/747522859361894521/1125505246135844905/image.png 12:16:59 <06pleasingfungus> https://cdn.discordapp.com/attachments/747522859361894521/1125505487690027038/image.png 12:17:00 <06pleasingfungus> https://cdn.discordapp.com/attachments/747522859361894521/1125505487933280367/image.png 13:38:41 <08wormsofcan> need a human form talisman called the talisperson 13:46:06 <06pleasingfungus> heh 13:46:19 <06pleasingfungus> OP for cats?? 14:35:00 <09hellmonk> taliswomen 15:25:38 Unstable branch on underhound.eu updated to: 0.31-a0-221-gbddc013574 (34) 15:33:57 <08nicolae> door form imo 15:40:50 <08wormsofcan> the talisman for it is shaped like a jar 16:12:04 <06pleasingfungus> “When is a door not adored?” 18:09:11 03PleasingFungus02 07[talisman-why-not] * 0.31-a0-237-ga941d20705: Simplify form hp penalties 10(64 seconds ago, 1 file, 7+ 8-) 13https://github.com/crawl/crawl/commit/a941d207056b 18:09:11 Branch pull/3176 updated to be equal with talisman-why-not: 13https://github.com/crawl/crawl/pull/3176 18:29:56 04Build failed for 08talisman-why-not @ a941d207 06https://github.com/crawl/crawl/actions/runs/5449777501 22:12:44 StonerKitturk (L15 SpHu) ERROR in 'mon-util.cc' at line 681: bogus mc (no monster data): invalid monster_type 1000 (1000) (D:14) 23:14:55 Unstable branch on cbro.berotato.org updated to: 0.31-a0-221-gbddc013574 (34)