| Time |
Nick |
Message |
| 00:04 |
|
tuedel joined #minetest-dev |
| 00:33 |
|
Lone_Wolf joined #minetest-dev |
| 00:35 |
|
tyler-2 left #minetest-dev |
| 00:35 |
|
tyler-2 joined #minetest-dev |
| 00:50 |
|
Miner_48er joined #minetest-dev |
| 00:54 |
|
ssieb joined #minetest-dev |
| 01:39 |
|
oil_boi joined #minetest-dev |
| 01:44 |
|
hecks joined #minetest-dev |
| 03:52 |
|
unclouded joined #minetest-dev |
| 04:10 |
|
YuGiOhJCJ joined #minetest-dev |
| 04:21 |
|
Seirdy joined #minetest-dev |
| 05:08 |
|
Kimapr joined #minetest-dev |
| 05:18 |
|
olliy joined #minetest-dev |
| 05:38 |
|
ssieb joined #minetest-dev |
| 07:15 |
|
calcul0n joined #minetest-dev |
| 07:28 |
|
NetherEran joined #minetest-dev |
| 07:47 |
|
calcul0n_ joined #minetest-dev |
| 07:56 |
|
Kimapr joined #minetest-dev |
| 08:00 |
|
ShadowNinja joined #minetest-dev |
| 08:56 |
|
H4mlet joined #minetest-dev |
| 09:48 |
|
Fixer joined #minetest-dev |
| 10:24 |
|
Qiangong2[m] joined #minetest-dev |
| 10:26 |
|
_Zaizen_ joined #minetest-dev |
| 10:43 |
|
NetherEran_ joined #minetest-dev |
| 11:27 |
|
oiaohm joined #minetest-dev |
| 12:45 |
|
H4mlet_ joined #minetest-dev |
| 13:51 |
|
H4mlet_ joined #minetest-dev |
| 14:59 |
|
calcul0n joined #minetest-dev |
| 15:09 |
|
Gael-de-Sailly joined #minetest-dev |
| 15:19 |
|
Kimapr joined #minetest-dev |
| 16:01 |
|
Lone_Wolf joined #minetest-dev |
| 16:31 |
|
lisac joined #minetest-dev |
| 16:46 |
|
H4mlet joined #minetest-dev |
| 16:47 |
|
fluxflux joined #minetest-dev |
| 16:51 |
|
Kimapr joined #minetest-dev |
| 16:55 |
Krock |
will merge #10160 in 15 minutes |
| 16:55 |
ShadowBot |
https://github.com/minetest/minetest/issues/10160 -- Cleanup ClientLauncher by SmallJoker |
| 16:57 |
Krock |
#9523 too |
| 16:57 |
ShadowBot |
https://github.com/minetest/minetest/issues/9523 -- Add object crosshair and disable entity selectionboxes by default by LoneWolfHT |
| 17:09 |
Krock |
MERGING |
| 17:12 |
Krock |
oh no |
| 17:14 |
Krock |
Force push 94619d8b4...88ffd6412 -> post-corrected the commit message |
| 17:15 |
Krock |
github ignored the input boxes |
| 17:16 |
Lone_Wolf |
heh |
| 17:16 |
Lone_Wolf |
Can I rebase properly without a force-push? |
| 17:17 |
sfan5 |
rebasing rewrites the history, so no |
| 17:17 |
Krock |
Lone_Wolf: no, that would be a merge |
| 17:17 |
Krock |
and the "merge rebase" what GitHub offers, is a fake rebase where you just merge your branch with master |
| 17:18 |
Lone_Wolf |
Ah, ok. Guess I'll just start squashing when I rebase |
| 17:18 |
sfan5 |
"merge rebase" is an oxymoron |
| 17:19 |
Krock |
hence " |
| 17:19 |
Krock |
Lone_Wolf: highly recommended for your own sake. Use what works best for you |
| 17:21 |
Lone_Wolf |
It'll probably work fine, I'm still learning git so wasn't aware of how to do it |
| 17:22 |
Krock |
feel free to ask if you're running into a tiring situation - there might be easy solutions ;) |
| 18:31 |
|
Flitzpiepe joined #minetest-dev |
| 19:56 |
|
NetherEran joined #minetest-dev |
| 20:03 |
|
H4mlet joined #minetest-dev |
| 20:25 |
sfan5 |
merging #9888 + #10128 in 10 minutes |
| 20:25 |
ShadowBot |
https://github.com/minetest/minetest/issues/9888 -- Implement grouped mode for find_nodes_in_area by sfan5 |
| 20:25 |
ShadowBot |
https://github.com/minetest/minetest/issues/10128 -- Formspecs: volume and key settings windows can now be closed by doubleclicking/tapping by Zughy |
| 20:26 |
|
indiana joined #minetest-dev |
| 20:45 |
|
H4mlet_ joined #minetest-dev |
| 20:54 |
|
_Zaizen_ joined #minetest-dev |
| 21:48 |
|
oiaohm joined #minetest-dev |
| 21:49 |
|
erlehmann joined #minetest-dev |
| 22:17 |
|
NetherEran joined #minetest-dev |
| 22:30 |
|
tyler-2 left #minetest-dev |
| 22:32 |
|
tyler-2 joined #minetest-dev |
| 23:27 |
|
oil_boi joined #minetest-dev |
