Now it conflicts on rebase, and when I try to resolve it, I get a connection error to the straight, unmodified, server:
Code: Select all
2018-01-08 02:19:45: ERROR[Main]: A serialization error occurred:
2018-01-08 02:19:45: ERROR[Main]: unsupported NodeBox version
2018-01-08 02:19:45: ERROR[Main]: The server is probably running a different version of Minetest.
Update: Nevermind, it seems to be working for me, now. I don't know what changed.