| Time |
Nick |
Message |
| 00:19 |
|
werwerwer_ joined #minetest-dev |
| 01:02 |
|
Miner_48er joined #minetest-dev |
| 02:17 |
|
khonkhortisan joined #minetest-dev |
| 03:27 |
|
ImQ009 joined #minetest-dev |
| 04:18 |
|
ImQ009 joined #minetest-dev |
| 04:40 |
|
Naked joined #minetest-dev |
| 04:40 |
|
Weedy joined #minetest-dev |
| 04:40 |
|
Weedy joined #minetest-dev |
| 05:16 |
|
jin_xi joined #minetest-dev |
| 05:17 |
|
Semilevel joined #minetest-dev |
| 05:20 |
|
Weedy joined #minetest-dev |
| 05:20 |
|
Guest92458 joined #minetest-dev |
| 06:02 |
|
Weedy_lappy joined #minetest-dev |
| 06:02 |
|
Weedy_lappy joined #minetest-dev |
| 06:03 |
|
Weedy_la1py joined #minetest-dev |
| 06:25 |
|
Weedy joined #minetest-dev |
| 06:34 |
|
prestotron55 joined #minetest-dev |
| 07:12 |
|
Calinou joined #minetest-dev |
| 07:12 |
|
Weedy joined #minetest-dev |
| 07:13 |
|
Weedy_lappy joined #minetest-dev |
| 07:14 |
|
Weedy_la1py joined #minetest-dev |
| 08:48 |
|
Akien joined #minetest-dev |
| 09:06 |
|
darkrose joined #minetest-dev |
| 09:06 |
|
darkrose joined #minetest-dev |
| 09:35 |
|
SpeedProg joined #minetest-dev |
| 09:44 |
|
nyuszika7h joined #minetest-dev |
| 10:11 |
|
BlockMen joined #minetest-dev |
| 10:21 |
|
proller joined #minetest-dev |
| 10:30 |
|
Ritchie_ joined #minetest-dev |
| 10:41 |
|
proller joined #minetest-dev |
| 12:56 |
|
troller joined #minetest-dev |
| 13:17 |
|
ImQ009 joined #minetest-dev |
| 13:28 |
|
proller joined #minetest-dev |
| 13:37 |
|
e1z0 joined #minetest-dev |
| 13:37 |
|
e1z0 joined #minetest-dev |
| 13:42 |
|
proller joined #minetest-dev |
| 13:47 |
|
tango_ joined #minetest-dev |
| 14:39 |
|
Naked joined #minetest-dev |
| 14:48 |
|
Zeitgeist_ joined #minetest-dev |
| 14:59 |
|
ImQ009_ joined #minetest-dev |
| 15:00 |
|
PilzAdam joined #minetest-dev |
| 15:04 |
|
Jordach joined #minetest-dev |
| 15:51 |
|
Yepoleb joined #minetest-dev |
| 16:17 |
|
Calinou joined #minetest-dev |
| 16:25 |
|
Calinou joined #minetest-dev |
| 16:32 |
|
Semilevel joined #minetest-dev |
| 16:35 |
|
BlockMen joined #minetest-dev |
| 17:18 |
|
Weedy joined #minetest-dev |
| 17:18 |
|
Weedy joined #minetest-dev |
| 17:33 |
|
rubenwardy joined #minetest-dev |
| 17:37 |
|
rubenwardy1 joined #minetest-dev |
| 17:41 |
|
Neological joined #minetest-dev |
| 17:59 |
|
OWNSyouAll_DESKT joined #minetest-dev |
| 18:15 |
|
Miner_48er joined #minetest-dev |
| 18:16 |
|
Cruelbob joined #minetest-dev |
| 18:41 |
|
rubenwardy1 left #minetest-dev |
| 18:57 |
|
OWNSyouAll_DESKT joined #minetest-dev |
| 19:19 |
|
Calinou joined #minetest-dev |
| 19:28 |
|
proller joined #minetest-dev |
| 19:52 |
BlockMen |
why needs #928 rebase? |
| 19:52 |
|
Neological joined #minetest-dev |
| 19:53 |
sfan5 |
BlockMen: github says so |
| 19:57 |
* BlockMen |
doesnt like github |
| 19:58 |
BlockMen |
so i have to merge all commits into that branch and then its rebased? |
| 20:00 |
sfan5 |
no |
| 20:00 |
sfan5 |
you need to rebase it |
| 20:00 |
sfan5 |
tutorials can be found with your favorite search engine |
| 20:09 |
BlockMen |
sfan5, have i to do that or do you guys that when mergin? |
| 20:14 |
sfan5 |
git remote add upstream https://github.com/minetest/minetest; git fetch upstream; git rebase upstream/master; git push -f |
| 20:14 |
sfan5 |
if merge conflicts occur you need to run "git mergetool" |
| 20:17 |
|
Weedy_lappy joined #minetest-dev |
| 20:17 |
|
Weedy_lappy joined #minetest-dev |
| 20:22 |
BlockMen |
sfan5, is there i way to solve a merge conflict manually? it says it cant find the "mergetool" file, in my case (windows) bcomp.exe |
| 20:22 |
sfan5 |
you can solve it manually |
| 20:22 |
sfan5 |
... |
| 20:23 |
sfan5 |
the changes from LOCAL and REMOTE (both) need to into the BASE file |
| 20:27 |
|
RealBadAngel joined #minetest-dev |
| 20:27 |
BlockMen |
umm...it seems i need more practise with git |
| 20:28 |
BlockMen |
so the rebase will take a while i guess :\ |
| 20:32 |
|
BlockMen left #minetest-dev |
| 20:36 |
andersje |
so...has anyone ever considered implementing a funtion for "minetest.get_objects_inside_area", to go with the "get_objects_inside_radius" function? |
| 20:36 |
|
Splizard joined #minetest-dev |
| 21:01 |
|
Semilevel joined #minetest-dev |
| 21:12 |
|
hmmmm joined #minetest-dev |
| 21:57 |
|
Kray joined #minetest-dev |
| 22:11 |
|
ShadowNinja joined #minetest-dev |
| 22:19 |
|
prestotron55 joined #minetest-dev |
| 22:27 |
|
kaeza joined #minetest-dev |
| 22:36 |
|
diemartin joined #minetest-dev |
| 22:43 |
|
Kray joined #minetest-dev |
| 22:50 |
|
salamanderrake joined #minetest-dev |
| 23:38 |
|
Zeitgeist_ joined #minetest-dev |
