luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-21 20:05:45 +02:00
Code Activity

uploading version 2

Browse Source
This commit is contained in:
Foghrye4
2016-04-19 20:27:17 +03:00
parent b5dca28ca3 bca6164937
commit 162df581e8
5 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu/common.lua
View File

@@ -290,7 +290,11 @@ end
--------------------------------------------------------------------------------
function is_server_protocol_compat(server_proto_min, server_proto_max)
<<<<<<< HEAD
return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13)
=======
return not ((min_supp_proto > (server_proto_max or 24)) or (max_supp_proto < (server_proto_min or 13)))
>>>>>>> bca616493783b18b2f280d4773cb4be41d01c434
end
--------------------------------------------------------------------------------
function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)

3
builtin/settingtypes.txt
View File

@@ -241,9 +241,12 @@ send_pre_v25_init (Support older servers) bool true
# Save the map received by the client on disk.
enable_local_map_saving (Saving map received from server) bool false
<<<<<<< HEAD
# Show entity selection boxes
show_entity_selectionbox (Show entity selection boxes) bool true
=======
>>>>>>> bca616493783b18b2f280d4773cb4be41d01c434
# Enable usage of remote media server (if provided by server).
# Remote servers offer a significantly faster way to download media (e.g. textures)
# when connecting to the server.