Time Nick Message 00:13 hmmmm i should probably write some stuff for the wiki 00:14 hmmmm anyway i un-gave up from yesterday and i took a better look at the git stuff, i am at the part where i'm using kdiff3 00:14 hmmmm this is pretty confusing 00:15 hmmmm alright, base is the common ancestor, local is my stuff, remote is your current stuff 00:20 hmmmm after i fix it, what do i do exactly? 00:20 hmmmm i clicked Merge current file and then it was warning me about how it's not saved, i saved it, and i guess i just close it out and git mergetool will go onto the next one? 00:21 hmmmm so i close it out and now it says no files need merging 00:21 hmmmm oh boy, it deleted everything 01:45 hmmmm okay, rm -rf minetest, starting all over again 01:45 hmmmm actually i better not, i should probably save my config file 01:55 hmmmm alright anyway back to where i was before. i fix the file, save, run git rebase --continue and it says "applying: blahblah" "no changes - did you forget to use git add"? 01:55 hmmmm what do i git add? the file i just changed? 01:55 hmmmm git status is worthless because i am currently rebasing 01:56 VanessaE wish I could help 01:56 hmmmm so i do git add "src/noise.cpp" and try it again, same message 01:56 VanessaE I barely know enough git to manage my own projects.. 01:56 hmmmm yeah i thought i knew git well enough until i had to do this 01:57 VanessaE heh 05:57 hmmmm omg i did dit 05:57 hmmmm it worked 05:57 hmmmm holy freaking crap 05:58 hmmmm what happened to the slow flying, was that reverted within a day or something? 05:59 hmmmm what the hell, minetest is using notably more cpu 05:59 hmmmm this is not right 06:18 hmmmm i say somebody ought to volunteer to do a binary search on the lag regression 06:18 hmmmm between 0.4.3's release and the current master 06:24 hmmmm https://github.com/kwolekr/minetest/commits/yay_new_branch 06:25 hmmmm celeron, important question.. where does stuff such as this go? https://github.com/kwolekr/minetest/blob/yay_new_branch/src/settings.h#L549 10:11 celeron55_ hmmmm: which is, stuff like... what? 10:12 celeron55_ if you mean the platform/compiler dependent macros, probably porting.h 10:12 Oblivion1500 *** hmmmm quit (Remote host closed the connection) 10:14 celeron55_ there is a public channel log, in case you didn't notice 10:14 Oblivion1500 oh, no i didnt sorry 14:15 RealBadAngel hia 14:15 RealBadAngel *hi 20:36 sapier can someone plz review https://github.com/celeron55/minetest/pull/411 I don't believe it's ready for merge on first try 22:54 Oblivion1500 hey i know i asked this before but i forgot the method but what is the py script to find all item/node names 22:58 thexyz is there a way? 22:59 thexyz (except making it interpret all lua mods)