Time Nick Message 00:05 paramat will merge 4352 4554 4614 4636 in a moment 00:19 paramat now merging 00:24 paramat merged but #4636 did not apply 00:24 ShadowBot https://github.com/minetest/minetest/issues/4636 -- Trim whitespaces from the input of the `/privs` command. by red-001 01:01 paramat game#1332 sofar 01:01 ShadowBot https://github.com/minetest/minetest_game/issues/1332 -- Default: Fix 'leaves simple', 'jungleleaves simple' textures by paramat 06:41 Foghrye4_ Hi, nrzkt! 06:42 nrzkt hi 07:15 red-001 rebased 4636 so it can be merged when someone gets around to it 07:18 kaeza that patch introduces a few unnecessary changes 07:19 kaeza the diff should be just +param = param:trim() 07:27 red-001 It's mostly to make the code more readable 07:28 red-001 overwriting param seemed a bit confusing 07:31 celeron55 it's fine, but imo the commit message could mention the unconfusement of the code too 07:31 celeron55 not that this really matters at all 07:31 celeron55 just a good habit 16:25 red-001 could someone review #4472 16:25 ShadowBot https://github.com/minetest/minetest/issues/4472 -- Make serverlist searchable. by red-001 16:33 Megaf needs rebase 16:33 Megaf red-001: ^ 16:35 red-001 ok 16:36 Megaf I just have no idea how to do that tho 16:39 red-001 do what? 16:42 nrzkt no need to rebase red-001 it's mergeable 16:43 Megaf nrzkt: why you say so? Bacause github isnt complaining? 16:44 nrzkt exactly 16:45 * Megaf will try with git clone --depth=1 https://www.github.com/minetest/minetest && cd minetest && wget https://github.com/minetest/minetest/pull/4472.patch && git apply 4472.patch 16:45 Megaf nope, patch fails to apply ;) 16:45 Megaf maybe the webinterface can do some trickery to overcome that 16:46 Megaf something to do with white spaces 16:47 nrzkt we can rebase with web interface in fact 16:47 nrzkt not everything but working things 16:55 T4im Megaf: applying a patch != mergin or rebasing 16:56 Megaf Are we going to start this again? Really? 16:56 Megaf Can you point me to where I said that path is the same thing of merge or rebase? 16:57 T4im start what again? i was just reminding you, as you seem to have forgotten it 16:58 T4im nrzkt was pointing out it's mergable, and you were questioning it, again 16:58 T4im it is, because github sais so, yes 16:58 Megaf I'm sure Github does some trickery to resolve little incompatibilities 16:58 T4im no, it just does a simple merge 16:58 T4im or could do one 16:59 T4im not being able to apply a patch does not mean it's not mergable, that's why i was pointing that out, again 17:13 T4im the other thing i should remind you again is, that you need more history; without git has no chance applying against a historic commit anyway 17:13 T4im the patch applies just fine here 17:13 T4im if you ignore the trailing whitespace warnings anyway 18:10 red-001 Megaf I rebased the branch 18:10 red-001 You can test if it works now 18:43 Megaf red-001: sure, just a sec please 18:45 Megaf red-001: maybe in this case I'm indeed mistaken 18:45 Megaf well, there is no conflict per see, just a complain about white spaces 18:46 red-001 does the search work correctly? 18:46 Megaf I dont know what this means http://git.megaf.info/Megaf/GitPaste/raw/master/git%20apply 18:47 Megaf building 18:49 T4im just, that it found whitespace issues; you can ignore that though "By default, the command outputs warning messages but applies the patch." 18:50 T4im red-001 could clean up the whitespaces though 18:52 red-001 whitespace issues as in trailing whitespaces? 18:52 T4im yea 18:52 T4im git apply nags about though 18:52 T4im those* 18:53 red-001 why? 18:53 red-001 why is it a problem for git? 18:53 T4im isn't really; it just defaults to warn about them 18:53 red-001 werid 18:54 T4im well; maybe to keep patches smaller, by removing unnecessary whitespace additions? 18:54 red-001 will fix them as soon as I'm finished some code I'm working on 18:54 T4im one can deactivate that, with --whitespace=nowarn, Megaf ^^ 18:54 Megaf ok 18:54 Megaf red-001: still building here 18:55 Megaf it will take a while 18:55 Megaf long while 18:55 red-001 well you don't really need to rebuild to test it 18:55 red-001 the c++ code is like 3 lines long 18:56 red-001 2 of which is a unit test 19:00 T4im that's an excellent test to code ratio 19:01 Megaf red-001: I had more changes to change 19:01 Megaf my snapshot was outdated 19:01 Megaf and I changed other stuff myself too 19:16 Megaf red-001: :+1: by me 19:16 Megaf :) 19:19 Megaf https://github.com/minetest/minetest/pull/4472#issuecomment-254067713 19:20 Megaf sfan5: nore: If you are there and codewise #4472 is ok you can merge it. I have patched here and tested. Runs fine. 19:20 ShadowBot https://github.com/minetest/minetest/issues/4472 -- Make serverlist searchable. by red-001 19:28 red-001 would #4642 be useful? 19:28 ShadowBot https://github.com/minetest/minetest/issues/4642 -- Allow the join/leave message to be overridden by mods. by red-001 19:33 red-001 #4636 can be merged 19:33 ShadowBot https://github.com/minetest/minetest/issues/4636 -- Trim whitespaces from the input of the `/privs` command. by red-001 20:05 garywhite Um I think this would probably go to this channel so: If I were to make an operating system that is free under CC BY-SA 4.0 for the main purpose of being used by MT devs and server owners would it be legal to do so with including MT under its LGPL license? 20:07 garywhite note: I am putting the notice for MT's LGPL license under the initial EULA 20:08 red-001 ask in ##law ? 20:09 garywhite Well, i figured that since this is the Minetest developer channel, the devs hold the license, so I thought this would be the best place 20:14 red-001 you should be ok 20:15 garywhite ok 20:18 Megaf anydev here whilling to help me build minetest for ARM and GL ES on Linux? 20:21 red-001 how similar is opengl es to normal opengl? 20:21 red-001 paramat I rebased 4636 20:22 paramat ShadowNinja, is it possible you could complete #4530 ? looks like gcu will not finish it 20:22 ShadowBot https://github.com/minetest/minetest/issues/4530 -- Fix superflous shader setting updates by gregorycu 20:22 paramat yeah 20:28 paramat nore sfan5 sofar how about we remove vessels from mtgame? 20:28 sfan5 i agree that they are kinda useless 20:28 sfan5 but why 20:29 paramat less to maintain :] 20:30 kaeza they make nice decoration 20:30 paramat could be moved to mt-mods repo 20:31 paramat yeah, but more of a decor mod thing. they seem specialised compared to other mtgame mods 20:32 everamzah books and bookshelves, too, then? i mean, where do you draw the line? 20:32 red-001 yeah vessels are useless 20:32 kaeza I'd say if it works, don't touch it 20:32 red-001 they don't even look nice 20:32 kaeza or has vessels caused any problem as of late? 20:33 red-001 maybe someone could add meshes to vessels? 20:34 everamzah it's probably not advantageous to remove what little decor there is. 20:34 T4im don't forget, that they are used probably a lot as craf items; especially for food mods 20:34 paramat hmm 20:34 T4im not *just* as décor 20:38 paramat game#1332 might merge this later, fairly trivial 20:38 ShadowBot https://github.com/minetest/minetest_game/issues/1332 -- Default: Fix 'leaves simple', 'jungleleaves simple' textures by paramat 20:41 T4im it's that conflict of interest again, between a minetest game and a minetest base game, isn't it? :) 20:43 T4im red-001: homedecor actually overrides vessels to replace them with meshes 20:44 red-001 whats the license for homedecor? 20:44 T4im well, the homedecor_3d_extras mod in the pack is apparently lgpl 20:44 red-001 so it could be merged? 20:45 T4im the assets might be what-the-cobble public license 20:45 T4im best to ask vanessae 20:46 T4im or kilbith perhaps 20:46 red-001 is that license related to another one with a similar name? 20:46 * T4im is just minetest minting the language 20:47 red-001 I see 20:47 red-001 I doubt that would be the worst thing in the logs 20:48 red-001 yeah it's WT*PL 20:49 red-001 will make PR 20:52 T4im you should still ask 20:54 red-001 !seen VanessaE 20:54 ShadowBot red-001: I saw VanessaE in #minetest-dev 9 weeks, 6 days, 2 hours, 1 minute, and 8 seconds ago saying "yeah, it's been around for a while. My Creative server also has this problem, but on that one, I can't be sure if the seed has/hasn't changed at some point. with the one I showed you, I'm 100% certain." 20:55 garywhite I can get VanessaE for you she's usually idle on her server 20:57 red-001 garywhite could you ask her if it's ok to use the wtfpl models and textures from homedecor_3d_extras in mt_game? 20:58 garywhite I actually just pinged her and asked her if she could come on #minetest-dev cause you were asking about a mod 20:59 paramat do we really want meshes for vessels? plantlike is fine 21:00 paramat otherewise we would have to start using meshes for almost everything, mushrooms etc 21:00 red-001 paramat even torchs look better with plantlike then vessels 21:01 paramat nevermind, mushrooms look weird as plantlike too 21:01 red-001 sl 21:01 red-001 so plantlike only looks good with grass? 21:01 paramat i don't think it's worth the effort 21:01 T4im garywhite: i don't think you're gonna get her in here; she gave up on -dev after several issues were ignored for several years without attempt of a fix (likely while a lot of unimportant things took precedence) 21:02 garywhite ok, i'll ask her 21:02 red-001 paramat adding some models that are already made isn't complicated 21:02 garywhite So wait you want to add homedecor_3d_extras into minetest_game? 21:02 paramat sure, but it's inconsistent fanciness 21:03 T4im that's the dilemma, hm? looks bad now, doesn't fit the MTG style with those meshes 21:04 T4im perhaps different - less fancy - models? 21:05 paramat my intention with this discussion was to recommend not bothering with vessels, i don't want to cause time to be spent on them :] 21:05 T4im ya, you're probably right with that 21:05 paramat any mesh is fancy 21:06 paramat so perhaps best we just leave it in but not dev it 21:06 red-001 drinking glass looks plain awful 21:06 garywhite Vanessa saw the log and said "Use whatever assets you want from homedecor. I don't care." 21:09 kaeza paramat, always have this in mind: https://xkcd.com/1172/ 21:09 T4im :D 21:12 red-001 well it would be best imo to remove vessels or at least remove the drinking glass 21:12 red-001 but thats not going to happen anytime soon 21:12 paramat we could, it's a case of disruption 21:14 T4im there is the option of "downgrading" the vessel nodes to vessel craft items? 21:15 T4im homedecor can still override them to be decor 21:15 red-001 T4im what would you do with the nodes that are placed? 21:16 T4im well, you got that same problem when removing vessels completely 21:17 red-001 replace them with air? 21:17 paramat we would have to notify everyone to add the vessels mod as an independent mod 21:17 T4im well with a downgrade homedecor users would not have to act, except perhaps update homedecor if some changes might be needed 21:19 T4im but well; as you say; probably not worth dealing with the trouble, if there is no real need to act 21:21 red-001 how do I make a mesh larger? 21:53 ShadowNinja paramat: Due to other responsibilities I don't really have the time for much MT stuff ATM. 21:54 paramat ok 21:56 garywhite This is for devs and server owners: My new system made just for MT https://sites.google.com/site/whitessoftware/ 22:10 red-001 #1333 22:10 ShadowBot https://github.com/minetest/minetest/issues/1333 -- Remove useless statbar protection by BlockMen 22:10 red-001 I meant game#1333 22:10 ShadowBot https://github.com/minetest/minetest_game/issues/1333 -- Vessels: Use modified models and textures from homedecor by @VanessaE by red-001 22:25 Megaf so, what do you think is faster to build minetestserver 22:26 Megaf 4 ARM threads, GCC4, at 1 GHz, with a 2 MB/s storage. Or. 2 amd64 threads at 1,3GHz, GCC 6 with 400 MB/s storage? 22:26 Megaf place your bets 22:30 Megaf RPi got to 100% when AMD64 was still at 97% 22:30 Megaf BUT, it has slower storage. AMD64 managed to catch up to 100%. Soon after the AMD64 finished due to it's amazing fast storage. But! Raspberry Pi finished linking ONE SECOND before the AMD64 22:31 Megaf Interesting, the ARM binary is 2672 KB and the AMD64 binary is 3156 22:48 dzho ldd 23:50 sofar so far so good. Had several rail carts run for 24hrs straight now (using all the rails and up and down stuff as well). 23:51 paramat very much appreciated 23:51 T4im what did you test with a long-term carting? :D 23:51 T4im longtime*