| Time |
Nick |
Message |
| 00:14 |
|
ecutruin joined #minetest |
| 00:34 |
|
luizrpgluiz joined #minetest |
| 00:34 |
|
Taoki joined #minetest |
| 00:34 |
luizrpgluiz |
hi |
| 00:36 |
luizrpgluiz |
Taoki: hi |
| 00:36 |
Taoki |
hi |
| 00:51 |
|
Viper168 joined #minetest |
| 00:52 |
|
luizrpgluiz left #minetest |
| 01:16 |
|
Taoki_1 joined #minetest |
| 01:55 |
|
Xenoth joined #minetest |
| 02:13 |
|
hmmmmm joined #minetest |
| 02:26 |
|
jojoa1997 joined #minetest |
| 02:27 |
fireglow |
meow |
| 02:35 |
est31 |
~seen VanessaE |
| 02:35 |
ShadowBot |
est31: I saw VanessaE in #minetest 1 day, 1 hour, 53 minutes, and 58 seconds ago saying "but what he can do with the download, I don't know" |
| 02:38 |
|
OldCoder joined #minetest |
| 02:39 |
|
Zeno` joined #minetest |
| 02:47 |
|
xrogaan_ joined #minetest |
| 02:50 |
|
Gizmokid2010 joined #minetest |
| 02:51 |
|
cheapie_ joined #minetest |
| 02:52 |
|
kahrl joined #minetest |
| 02:52 |
|
chrisf_ joined #minetest |
| 02:56 |
|
DarkNekros joined #minetest |
| 02:57 |
|
roboman2444 joined #minetest |
| 03:17 |
MinetestBot |
[git] Zeno- -> minetest/minetest: Fix Android compile warning 66efaaa http://git.io/NnZK (2015-02-12T13:16:38+10:00) |
| 03:21 |
|
ecutruin joined #minetest |
| 03:36 |
OldCoder |
VanessaE Zeno` compunerd do you happen to have Firefox 35 and a headset with a mike (either regular audio or USB) ? |
| 03:36 |
VanessaE |
nope |
| 03:37 |
Zeno` |
OldCoder, yes |
| 03:37 |
Zeno` |
oh... mic... no :( |
| 03:38 |
OldCoder |
No big deal |
| 03:38 |
* OldCoder |
wants to try out the free phone built into Firefox 35 |
| 03:38 |
OldCoder |
Pick up one of the headsets sometime. This looks fun. It supports free video calls too. |
| 03:39 |
Zeno` |
phone? |
| 03:40 |
compunerd |
I do have Firefox 35.0.1 and a mic built into my webcam... Didn't know there was a phone built into the browser... This should be interesting |
| 03:40 |
* Zeno` |
has picked up his headset |
| 03:40 |
Tesseract |
WebRTC-based, as I expected. |
| 03:41 |
Tesseract |
Google's had apprtc.appspot.com or so up for a while now, but it's fairly basic. |
| 03:42 |
Zeno` |
Does Chrome have Emacs built into it though? |
| 03:42 |
Zeno` |
I bet not! |
| 03:42 |
compunerd |
Is it this, "Truecaller" in the apps section? |
| 03:43 |
Tesseract |
Zeno`: But emacs already has chrome built in! That would be recursive, and the people with finite storage complained. killjoys. |
| 03:43 |
Zeno` |
hmm.. that is a problem isn't it |
| 03:44 |
Tesseract |
compunerd: It's apparently called "Hello." |
| 03:46 |
OldCoder |
Does somebody wish to try this? |
| 03:46 |
OldCoder |
If so, if you have USB headset, a small change is needed |
| 03:52 |
compunerd |
OldCoder, Check PM |
| 04:03 |
|
crazyR joined #minetest |
| 04:13 |
OldCoder |
compunerd, k |
| 04:28 |
|
Erthome joined #minetest |
| 04:29 |
Erthome |
OldCoder are you out here? |
| 04:30 |
OldCoder |
Erthome, I have PMd |
| 04:31 |
OldCoder |
See PM PLs |
| 04:44 |
|
mazal joined #minetest |
| 04:47 |
|
Erthome_ joined #minetest |
| 04:57 |
|
Viper168 joined #minetest |
| 04:58 |
|
Miner_48er joined #minetest |
| 05:14 |
|
phantombeta joined #minetest |
| 05:37 |
|
chrisf joined #minetest |
| 05:47 |
|
LazyJ joined #minetest |
| 06:17 |
MinetestBot |
[git] est31 -> minetest/minetest: Enable LUA_USE_POSIX if possible in bundled Lua b2f3ffe http://git.io/NnAe (2015-02-12T16:14:12+10:00) |
| 06:23 |
|
jin_xi joined #minetest |
| 06:40 |
LazyJ |
VanessaE, I noticed there is no issue posted on GitHub about nerzhul's network patch. Were the problems your servers were experiencing earlier caused by something unique only to your setups? |
| 07:03 |
|
Tux[Qyou] joined #minetest |
| 07:03 |
est31 |
LazyJ, ask on #minetest-dev nerzhul is online right now |
| 07:03 |
|
jbb joined #minetest |
| 07:03 |
jbb |
da |
| 07:03 |
jbb |
hallo |
| 07:05 |
LazyJ |
est31, unfortunately I don't have enough info on what happened to be of use. VanessaE would have logs and other insights that could aid in solving the problem. |
| 07:07 |
LazyJ |
However, as a server-op, because of those problems, I am concerned and am holding off on upgrading. |
| 07:15 |
LazyJ |
Ah. Just remembered... VanessaE used a pull request that nerzhul posted to fix the problem but that "fix" is still sitting as a pull request. Perhaps more priority would be placed on it's review and approval if the devs had info on what happened with VanessaE's servers? |
| 07:18 |
|
hollandais joined #minetest |
| 07:45 |
|
CWz joined #minetest |
| 07:47 |
VanessaE |
LazyJ: yes, the problem was due to a pull request, which nerzhul has since revised. that revised pull has been in place since the last restart almost 24 hours ago |
| 07:49 |
VanessaE |
actually no |
| 07:50 |
VanessaE |
not 24 hours, considerably less |
| 07:50 |
VanessaE |
tit went in around 11:20am EST |
| 07:50 |
VanessaE |
it* |
| 07:50 |
LazyJ |
Thanks, VanessaE. I'm a bit confused by the way the branches are arranged now. I saw celeron55's recent post on the forums about having a feature freeze branch separate from the main branch. The version numbering seems backwards though. The commits posted for 0.4.11 seem to be more like fixes than new features. |
| 07:52 |
LazyJ |
Time will sort it out eventually. |
| 07:53 |
|
Megaf joined #minetest |
| 07:53 |
VanessaE |
I'm not entirely sure what the plan is with the two branches |
| 07:53 |
VanessaE |
so I'll just let the core devs hash it out :) |
| 07:53 |
LazyJ |
We went through something like this before when minetest_game was split into four or five different sub-game-like components. |
| 07:53 |
VanessaE |
oh no, this is different |
| 07:54 |
VanessaE |
this is more like one branch for stable development + bugfixes, the other for stuff that's progressive but could break things? |
| 07:54 |
VanessaE |
I'm not sure |
| 07:54 |
LazyJ |
Me neither. |
| 07:55 |
LazyJ |
The engine's higher version number is several commits behind the lower version number. |
| 07:55 |
VanessaE |
that doesn't mean much on its own |
| 07:56 |
Megaf |
Hi all |
| 07:56 |
Megaf |
Hi VanessaE |
| 07:56 |
VanessaE |
hi |
| 07:56 |
LazyJ |
No, but if I were just coming into Minetest through GitHub I'd wonder which I was to start a server with. |
| 07:56 |
LazyJ |
Howdy, Megaf ;) |
| 07:56 |
|
puhfa joined #minetest |
| 07:57 |
Megaf |
heya |
| 07:57 |
VanessaE |
LazyJ: good question |
| 07:57 |
Megaf |
I have finally installed Quassel Client again here so I could connect back |
| 07:57 |
LazyJ |
I'm a bit concerned that despite the engine's branch split, things will continue with new bells-and-whistles being added but few persistent problems being fixed. |
| 07:57 |
VanessaE |
I would guess "freeze-0.4.12", then "stable-0.4" once it goes out? |
| 07:58 |
|
alket joined #minetest |
| 07:59 |
LazyJ |
I don't envy celeron55. Herding cats comes to mind. |
| 07:59 |
VanessaE |
the way I understand it, master branch is being used as a sort of "staging area" for stuff that's to be made part of 0.4.12 (and presumably pushed to "freeze-0.4.12") |
| 08:00 |
|
Haudegen joined #minetest |
| 08:01 |
VanessaE |
but since it's in feature-freeze, well, no new features are allowed in :) |
| 08:01 |
LazyJ |
So is "freeze-0.4.12" the one to use for server upgrades? |
| 08:01 |
VanessaE |
idk |
| 08:01 |
VanessaE |
ask in -dev :) |
| 08:01 |
LazyJ |
I'm reluctant to ask there. I doubt I could understand the answer(s). |
| 08:02 |
VanessaE |
try anyway :) |
| 08:02 |
VanessaE |
you can't learn if you aren't confronted with the confusing answer :) |
| 08:03 |
LazyJ |
Confusing answers are one thing, condescending and snarky answers I don't have patience to entertain anymore. |
| 08:03 |
VanessaE |
fair enough |
| 08:03 |
VanessaE |
but, this IS minetest, so snarky answers are par for the course |
| 08:04 |
LazyJ |
Unfortunately. |
| 08:04 |
LazyJ |
That's one of the reasons I value input from you and Sokomine. |
| 08:06 |
VanessaE |
thanks :) |
| 08:06 |
VanessaE |
of course half my responses on any given day might be smartassed ;) |
| 08:08 |
alket |
how long did it take from 0.4.10 to 0.4.11 ? |
| 08:09 |
LazyJ |
About 5 months. |
| 08:09 |
LazyJ |
Some releases have been short while others quite long. 0.4.9 was one of the longest, iirc. |
| 08:10 |
LazyJ |
Though, that depends on if you are going from stable release to stable release or if you are upgrading with unstable releases along the way. |
| 08:11 |
VanessaE |
0.4.11->0.4.12 is one of the shortest |
| 08:11 |
alket |
what about 0.5 |
| 08:11 |
VanessaE |
0.5.x is not yet planned. |
| 08:12 |
VanessaE |
(no one can seem to agree to just DO it, maybe? I dunno) |
| 08:12 |
LazyJ |
It looks like the devs are going to go by 0.4.11, 0.4.12, 0.4.13, 0.4.14, etc. |
| 08:14 |
LazyJ |
So long as there is steady progress in development and releases. 0.4.x or 0.5.x or A.B.C. or pancake.syrup.coffee - whatever method to mark progression is used. |
| 08:15 |
|
oleastre joined #minetest |
| 08:19 |
LazyJ |
Pancake.syryp.coffee with a patch of hashbrowns.bacon.scrambled_eggs is a release that would hit the spot right now. |
| 08:19 |
* LazyJ |
has the late-night munchies again. |
| 08:20 |
|
ImQ009 joined #minetest |
| 08:22 |
|
chchjesus joined #minetest |
| 08:25 |
|
Haudegen joined #minetest |
| 08:28 |
VanessaE |
LazyJ, you're killin' me... |
| 08:32 |
LazyJ |
;)- |
| 08:48 |
|
aheinecke joined #minetest |
| 09:03 |
|
oleastre joined #minetest |
| 09:04 |
|
Yepoleb joined #minetest |
| 09:06 |
mazal |
Hi everyone , is server step 0.1 the fastest setting ? |
| 09:07 |
|
Trustable joined #minetest |
| 09:09 |
|
SylvieLorxu joined #minetest |
| 09:09 |
Megaf |
Nope |
| 09:10 |
Megaf |
if you and all your players have a ultra fast internet and more than ultra fast CPU you can use like 0.05 |
| 09:10 |
mazal |
I'm on 100mb lan , would that work ? |
| 09:11 |
|
kattsmis1 joined #minetest |
| 09:24 |
|
ImQ009 joined #minetest |
| 09:25 |
Megaf |
mazal: on a local network you can put 0.05 |
| 09:26 |
Megaf |
but you wont actually feel much diffference |
| 09:27 |
mazal |
k thanx |
| 09:55 |
|
dv- joined #minetest |
| 09:59 |
|
JamesTait joined #minetest |
| 10:01 |
alket |
http://www.bbc.com/news/blogs-news-from-elsewhere-31296419 |
| 10:04 |
JamesTait |
Heh. |
| 10:04 |
JamesTait |
Good morning all; happy Lost Penny Day! :-D |
| 10:06 |
kahrl |
Even worse, there's violence against Turkey in minecraft. |
| 10:06 |
kahrl |
If someone uses this: http://www.minecraftskins.net/turkey |
| 10:12 |
alket |
lol |
| 10:16 |
|
DFeniks joined #minetest |
| 10:20 |
est31 |
https://github.com/minetest/minetest/issues/2275#issuecomment-74047666 |
| 10:20 |
|
denton joined #minetest |
| 10:21 |
|
denton left #minetest |
| 10:26 |
|
Haudegen joined #minetest |
| 10:50 |
|
chchjesus joined #minetest |
| 10:57 |
|
blaze joined #minetest |
| 10:58 |
|
casimir joined #minetest |
| 11:03 |
|
ImQ009_ joined #minetest |
| 11:10 |
|
ruskie joined #minetest |
| 11:13 |
|
est31 joined #minetest |
| 11:13 |
|
est31 joined #minetest |
| 11:13 |
|
est31 joined #minetest |
| 11:16 |
|
ImQ009 joined #minetest |
| 11:17 |
|
JakubVanek joined #minetest |
| 11:23 |
|
jin_xi joined #minetest |
| 11:29 |
|
Jordach joined #minetest |
| 11:33 |
|
ruskie joined #minetest |
| 11:33 |
|
ruskie joined #minetest |
| 11:33 |
|
book` joined #minetest |
| 11:35 |
|
theblazehen joined #minetest |
| 11:37 |
|
DFeniks_ joined #minetest |
| 11:43 |
|
FR^2 joined #minetest |
| 12:12 |
|
PilzAdam joined #minetest |
| 12:49 |
|
Zeno` joined #minetest |
| 13:08 |
|
Viper168 joined #minetest |
| 13:16 |
|
turtleman_ joined #minetest |
| 13:29 |
|
luizrpgluiz joined #minetest |
| 13:31 |
luizrpgluiz |
hi |
| 13:32 |
|
ImQ009 joined #minetest |
| 14:06 |
|
Tux[Qyou] joined #minetest |
| 14:09 |
|
shadowzone joined #minetest |
| 14:09 |
|
shadowzone joined #minetest |
| 14:10 |
shadowzone |
Good morning/afternoon/evening Everybody! |
| 14:12 |
luizrpgluiz |
shadowzone: hi |
| 14:12 |
shadowzone |
Hi, luizrpgluiz, how are you? |
| 14:24 |
est31 |
how to turn off this initializing nodes thing? |
| 14:25 |
Zeno` |
? |
| 14:27 |
|
BlockMen joined #minetest |
| 14:28 |
luizrpgluiz |
shadowzone: i am fine and you? |
| 14:28 |
BlockMen |
hi everyone |
| 14:28 |
shadowzone |
I'm good |
| 14:28 |
shadowzone |
Good, whatevertimeitisforyou, BlockMen. |
| 14:29 |
BlockMen |
afternoon ;) |
| 14:30 |
fireglow |
hi BlockMen! :) |
| 14:30 |
shadowzone |
Thank you. |
| 14:30 |
shadowzone |
So correction |
| 14:30 |
shadowzone |
Good afternoon, BlockMen. |
| 14:30 |
luizrpgluiz |
someone has issues where the link has the days of development minetest? |
| 14:32 |
est31 |
I'm getting ERROR: An unhandled exception occurred: ServerEnvironment::loadMeta(): EnvArgsEnd not found! |
| 14:32 |
est31 |
after a crash of the server |
| 14:32 |
est31 |
reproducibly |
| 14:34 |
est31 |
it isnt the map.sqlite |
| 14:34 |
est31 |
I've applied a backup, still breaking |
| 14:34 |
shadowzone |
I get that with Minecraft all the timee. |
| 14:41 |
|
turtleman_ joined #minetest |
| 14:49 |
|
CraigyDavi joined #minetest |
| 14:52 |
|
luizrpgluiz left #minetest |
| 14:52 |
|
LazyJ joined #minetest |
| 14:57 |
casimir |
est31, put some content in your env_meta.txt |
| 14:57 |
est31 |
I did and it helped, thanks :) |
| 15:02 |
shadowzone |
My ear buds just shocked the inside of my ear! |
| 15:05 |
|
SopaXorzTaker joined #minetest |
| 15:08 |
|
SylvieLorxu joined #minetest |
| 15:09 |
|
ecutruin joined #minetest |
| 15:21 |
|
Jousway joined #minetest |
| 15:40 |
|
DFeniks joined #minetest |
| 15:40 |
|
twoelk joined #minetest |
| 15:42 |
|
Mati1_ joined #minetest |
| 15:49 |
MinetestBot |
[git] JakubVanek -> minetest/minetest: Update czech translation 2630f45 http://git.io/NlkT (2015-02-12T16:41:44+01:00) |
| 15:49 |
MinetestBot |
[git] ngosang -> minetest/minetest: Minor fixes in translations c7a7803 http://git.io/NlkI (2015-02-12T16:41:40+01:00) |
| 15:54 |
MinetestBot |
[git] Xanthin -> minetest/minetest_game: Make trapdoor better visible when held in the hand 047ecea http://git.io/Nlt0 (2015-02-12T16:51:32+01:00) |
| 15:59 |
|
CWz joined #minetest |
| 16:00 |
|
alket joined #minetest |
| 16:07 |
|
turtleman_ joined #minetest |
| 16:08 |
|
Wayward_One joined #minetest |
| 16:11 |
|
shadowzone joined #minetest |
| 16:11 |
|
hmmmm joined #minetest |
| 16:14 |
|
SopaXorzTaker joined #minetest |
| 16:18 |
|
Krock joined #minetest |
| 16:19 |
Krock |
\o/ BlockMen! |
| 16:20 |
BlockMen |
hi Krock :) |
| 16:21 |
LazyJ |
What are the pros and cons of using Minetest's built-in normalmap function in the Settings tab vs using a texture pack that already had normalmap textures included? |
| 16:22 |
|
ecutruin1 joined #minetest |
| 16:24 |
* Jordach |
waits for the timeout |
| 16:24 |
Jordach |
ecutruin1, you've opened two clients :P |
| 16:26 |
|
MinetestForFun joined #minetest |
| 16:29 |
|
crazyR joined #minetest |
| 16:30 |
|
Pest joined #minetest |
| 16:34 |
|
jojoa1997 joined #minetest |
| 16:34 |
|
zat joined #minetest |
| 16:36 |
|
meldrian joined #minetest |
| 16:36 |
|
ImQ009 joined #minetest |
| 16:41 |
|
rubenwardy joined #minetest |
| 16:45 |
|
roniz joined #minetest |
| 17:19 |
|
The_Loko joined #minetest |
| 17:38 |
* Jordach |
critically useful info with information relating |
| 17:38 |
Jordach |
dammit |
| 17:38 |
* Jordach |
found critically useful info with information relating to his models |
| 17:38 |
|
Xenoth joined #minetest |
| 17:39 |
|
Player_2 joined #minetest |
| 17:47 |
|
Ataron joined #minetest |
| 17:48 |
|
Vargos joined #minetest |
| 17:50 |
rubenwardy |
#1843 |
| 17:54 |
|
bas080 joined #minetest |
| 17:54 |
|
turtleman_ joined #minetest |
| 18:03 |
|
fusion44 joined #minetest |
| 18:04 |
|
Calinou joined #minetest |
| 18:07 |
|
roniz_ joined #minetest |
| 18:07 |
|
Scall joined #minetest |
| 18:14 |
|
Inocudom joined #minetest |
| 18:15 |
Inocudom |
I tremble before the nightmare that is about to strike the northeast; http://www.wunderground.com/news/arctic-coldest-this-winter-season-northeast |
| 18:16 |
Inocudom |
The icy skull of death will be upon the northeast this weekend. Word cannot describe how bad it will be; http://www.wunderground.com/news/valentines-day-weekend-snowstorm-northeast |
| 18:18 |
Inocudom |
The groundhog saw its shadow this year. I'd say that shadow was pitch black, just like Saturn. |
| 18:21 |
|
Robert_Zenz joined #minetest |
| 18:21 |
Inocudom |
There was also a grim cloud in northern Spain: http://www.nbcnews.com/news/world/spain-chemical-plant-blast-cloaks-towns-toxic-cloud-n304971 |
| 18:38 |
MinetestBot |
[git] nerzhul -> minetest/minetest: Add german and french translation for minetest.desktop af7f369 http://git.io/N86t (2015-02-12T19:36:02+01:00) |
| 18:45 |
|
est31 joined #minetest |
| 18:45 |
|
est31 joined #minetest |
| 18:49 |
|
rubenwardy joined #minetest |
| 18:51 |
|
basxto joined #minetest |
| 19:04 |
|
Scall joined #minetest |
| 19:09 |
|
Robert_Zenz joined #minetest |
| 19:27 |
|
turtleman_ joined #minetest |
| 19:27 |
|
ElectronLibre joined #minetest |
| 19:32 |
|
rfree_prox joined #minetest |
| 19:35 |
|
fusion44_ joined #minetest |
| 19:41 |
|
fusion44 joined #minetest |
| 19:41 |
|
Haudegen joined #minetest |
| 19:43 |
|
OldCoder joined #minetest |
| 19:51 |
|
Mati1_ joined #minetest |
| 19:51 |
|
VargaD_ joined #minetest |
| 19:52 |
Mati1 |
HI all |
| 19:52 |
Mati1 |
help me pleace |
| 19:52 |
Mati1 |
how to connect with someone by the server |
| 19:52 |
Mati1 |
wear is help?? on web site |
| 19:53 |
ElectronLibre |
With someone? What do you mean exactly? |
| 19:54 |
Mati1 |
whit my bro |
| 19:54 |
Mati1 |
on server |
| 19:54 |
ElectronLibre |
On a server you run by yourself? |
| 19:56 |
Mati1 |
ok i have RealBadAngel online ;) |
| 20:04 |
Megaf |
!server Megaf |
| 20:04 |
MinetestBot |
Megaf: Megaf Server v4.0 | mt.megaf.info:30003 | Clients: 0/9, 0/4 | Version: 0.4.11-dev / MegafXploreNext | Ping: 7ms |
| 20:04 |
Megaf |
I wonder why I no longer gat 1ms/2ms ping |
| 20:04 |
|
ImQ009 joined #minetest |
| 20:09 |
Mati1 |
how connect to same ip adress?? |
| 20:12 |
|
jojoa1997 joined #minetest |
| 20:17 |
ElectronLibre |
192.168.x.x |
| 20:17 |
ElectronLibre |
You can find these informations in the configuration of your computer Mati1. |
| 20:17 |
ElectronLibre |
(I mean what first x and second x are) |
| 20:18 |
Mati1 |
77.12.43.39 |
| 20:19 |
ElectronLibre |
That's not helpful at all. |
| 20:19 |
ElectronLibre |
What OS are you using? |
| 20:20 |
est31 |
also you can use 127.0.0.1 in theory |
| 20:20 |
est31 |
I manage to connect with 0.0.0.0 |
| 20:22 |
ElectronLibre |
If you want to connect on yourself, use 127.0.0.1 indeed, if you want to connect on a computer using the same network access point as you you have to find its internal IP adress. |
| 20:26 |
|
ImQ009 joined #minetest |
| 20:27 |
Megaf |
the command ipconfig on the windows prompt will do that |
| 20:29 |
|
JakubVanek joined #minetest |
| 20:29 |
Tesseract |
est31: You can connect to 0.0.0.0? Isn't that only valid for binding to all interfaces? |
| 20:31 |
JakubVanek |
instead of 127.0.0.* you can use localhost |
| 20:31 |
JakubVanek |
it's part of tcp/ip specification |
| 20:37 |
|
Wuzzy joined #minetest |
| 20:42 |
|
CWz joined #minetest |
| 20:44 |
|
Amaz joined #minetest |
| 20:45 |
|
JakubVanek joined #minetest |
| 20:49 |
Polsaker |
s/127.0.0.*/127.*/ |
| 20:50 |
|
Megal joined #minetest |
| 20:50 |
est31 |
Tesseract, actually 127.0.0.1 doesnt work |
| 20:50 |
est31 |
dunno know why |
| 20:57 |
JakubVanek |
if you're trying to connect to existing local server instance, what's in the server's console after "listening" (under logo)? |
| 20:57 |
ElectronLibre |
0.0.0.0:<port> usually. |
| 21:00 |
|
linuxtardis joined #minetest |
| 21:00 |
linuxtardis |
then i have no idea why it doesn't work |
| 21:13 |
MinetestBot |
[git] t4im -> minetest/minetest_game: Bones mod fixes 75ea7e3 http://git.io/N4bh (2015-02-12T22:10:15+01:00) |
| 21:15 |
* ElectronLibre |
just thought "Oh my.. That means I have to rebase my PR >_>" |
| 21:19 |
|
Viper168 joined #minetest |
| 21:21 |
MinetestBot |
[git] CraigyDavi -> minetest/minetest_game: Fix typo in survival formspec & create legacy file a9137e8 http://git.io/N4hL (2015-02-12T22:18:22+01:00) |
| 21:21 |
ElectronLibre |
Can anyone tell me what do when you rebased a pull-request and get conflicts with the new code? |
| 21:21 |
ElectronLibre |
s/do/to do |
| 21:22 |
JakubVanek |
open file where it mentions merge conflict, find >>> and resolve it |
| 21:24 |
JakubVanek |
then call git add on this file and call git rebase --continue. if necessary, repeat these steps |
| 21:24 |
ElectronLibre |
And then I commit, push, and rebase? |
| 21:24 |
ElectronLibre |
(not rebase) |
| 21:26 |
JakubVanek |
after all merge conflicts are resolved git will auto-apply all changes |
| 21:27 |
JakubVanek |
not sure about non-commited changes before rebase |
| 21:27 |
MinetestBot |
[git] blha303 -> minetest/minetest_game: Fix download URL 60520b8 http://git.io/NBvv (2015-02-12T22:25:07+01:00) |
| 21:27 |
ElectronLibre |
Done and done, thanks. At least my modifications have been kept after someone rewrote about the half part of the file I changed... |
| 21:28 |
ElectronLibre |
Sh*t there are still conflicts... |
| 21:28 |
Mati1 |
all ok thx |
| 21:29 |
JakubVanek |
after all call git push -f (force because we overwrote history) |
| 21:29 |
ElectronLibre |
Oki. |
| 21:30 |
ElectronLibre |
I just found that I commited part of the rebas on master, so I removed last commit, and updated my branch, I try push. |
| 21:31 |
ElectronLibre |
Just tell me, it's git rebase master <branch> isn't it? |
| 21:33 |
JakubVanek |
no, git rebase <origin>/<branch> |
| 21:34 |
ElectronLibre |
Sh*t. |
| 21:34 |
* ElectronLibre |
rollbacks everything. |
| 21:34 |
JakubVanek |
you must be on branch that you want to rebase (move on top), maybe it has one more arg |
| 21:35 |
ElectronLibre |
Hey, wait, rebasing master dropping_bones (my branch) worked, conflict solved \o/. |
| 21:36 |
ElectronLibre |
It has removed a modification I made that was part of the merged commit (but with some little differences) but it works.. #420 of minetest_game is working again. |
| 21:36 |
ElectronLibre |
Thanks for you help JakubVanek :). |
| 21:39 |
JakubVanek |
ok :) |
| 22:00 |
|
alket joined #minetest |
| 22:04 |
Tesseract |
est31: Your PR is O.K. now, but I'd like the dash or a underscore between the words and I can't merge it ATM. |
| 22:05 |
est31 |
why a dash? |
| 22:06 |
est31 |
its /hollowdome not /hollow_dome |
| 22:07 |
Tesseract |
est31: Because it's two words. And I never said I liked the way otger commands did it. |
| 22:07 |
est31 |
rather stick with one style? |
| 22:07 |
Tesseract |
But maybe Uberi has a good reason for that. |
| 22:08 |
Tesseract |
*shrug* I guess I'll merge it later. |
| 22:09 |
est31 |
great :) |
| 22:19 |
|
fortytwo joined #minetest |
| 22:23 |
|
BlockMen left #minetest |
| 22:31 |
|
Hirato joined #minetest |
| 22:31 |
|
alket joined #minetest |
| 22:32 |
alket |
many play from android, installed from Google Play |
| 22:32 |
est31 |
and there is no official version out |
| 22:32 |
est31 |
its all unauthorized copies |
| 22:32 |
alket |
yes, which is a shame |
| 22:33 |
est31 |
yes |
| 22:33 |
alket |
today I saw it in App Store, selling for 1.5 Euros |
| 22:33 |
est31 |
:( |
| 22:33 |
alket |
https://itunes.apple.com/nz/app/minetest./id717384883?mt=8 |
| 22:34 |
est31 |
yea pretty bad |
| 22:34 |
ElectronLibre |
Welcome in the horrible truth : most of the players on public servers are kids using illegal, buggy and full-of-advertising applications. |
| 22:34 |
est31 |
but its as it seems allowed |
| 22:34 |
est31 |
its lgpl |
| 22:35 |
alket |
app store doesn't allow GPL software |
| 22:35 |
est31 |
not even lgpl? |
| 22:35 |
alket |
but that guy is profiting though |
| 22:35 |
ElectronLibre |
What about LGPL indeed? |
| 22:36 |
* ElectronLibre |
got confused between CTRL+K for color and CTRL+B for bold ._. |
| 22:37 |
est31 |
http://stackoverflow.com/a/2145271 |
| 22:38 |
est31 |
but there seem to be problems with lgpl inside app store: http://roadfiresoftware.com/2013/08/the-problem-with-using-lgpl-v2-1-code-in-an-ios-app/ |
| 22:40 |
est31 |
but in theory the fact that they charge money isn't illegal, only that they dont fullfill that requirement. |
| 22:40 |
est31 |
and the linking needs to be dynamic |
| 22:58 |
|
ElectronLibre left #minetest |
| 23:41 |
|
luizrpgluiz joined #minetest |
| 23:41 |
luizrpgluiz |
hi |
| 23:57 |
Inocudom |
Minetest is not to be our primary concern these days: http://youtu.be/OCdxCcu3s8s |
| 23:59 |
Inocudom |
I am hearing fierce winds outside my house right now. They server as a dire warning to me concerning just how infinitely bad things are about to get on this planet. |
