Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/wip5.7.0' into farmesh5.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
proller committed Nov 18, 2023
2 parents a778b4e + ad3c8d4 commit 8551551
Show file tree
Hide file tree
Showing 11 changed files with 312 additions and 183 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ Core: fast reliable network protocol, fast multi-threaded server, utf8 chat, bui

Changelog
======
### 5.7.0.0 (?)
* Tree growth
* Weather tuned


### 5.6.1.0 (?)
* auth_kv removed, use instead in world.mt:
auth_backend = leveldbfm
Expand Down
2 changes: 1 addition & 1 deletion builtin/mainmenu/tab_online.lua
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
if gamedata.address and gamedata.port then
core.settings:set("address", gamedata.address)
core.settings:set("remote_port", gamedata.port)
core.settings:set("remote_proto", gamedata.proto)
core.settings:set("remote_proto", gamedata.proto or "mt")
core.start()
end
return true
Expand Down
2 changes: 1 addition & 1 deletion games/default
Submodule default updated 51 files
+13 −7 .gitmodules
+4 −0 .luacheckrc
+21 −0 game_api.txt
+22 −17 mods/beds/functions.lua
+4 −3 mods/bucket/init.lua
+1 −0 mods/creative/locale/creative.de.tr
+1 −0 mods/creative/locale/creative.eo.tr
+2 −1 mods/creative/locale/creative.es.tr
+1 −0 mods/creative/locale/creative.fr.tr
+1 −0 mods/creative/locale/creative.id.tr
+1 −0 mods/creative/locale/creative.it.tr
+1 −0 mods/creative/locale/creative.ja.tr
+1 −0 mods/creative/locale/creative.jbo.tr
+1 −0 mods/creative/locale/creative.ms.tr
+1 −0 mods/creative/locale/creative.pl.tr
+1 −0 mods/creative/locale/creative.pt_BR.tr
+1 −0 mods/creative/locale/creative.ru.tr
+1 −0 mods/creative/locale/creative.sk.tr
+1 −0 mods/creative/locale/creative.sv.tr
+1 −0 mods/creative/locale/creative.uk.tr
+1 −0 mods/creative/locale/creative.zh_CN.tr
+1 −0 mods/creative/locale/creative.zh_TW.tr
+1 −0 mods/creative/locale/template.txt
+12 −5 mods/default/chests.lua
+2 −1 mods/default/license.txt
+1 −1 mods/default/locale/default.de.tr
+102 −18 mods/default/nodes.lua
+ mods/default/textures/default_river_water.png
+ mods/default/textures/default_river_water_flowing_animated.png
+ mods/default/textures/default_river_water_source_animated.png
+ mods/default/textures/default_water.png
+ mods/default/textures/default_water_flowing_animated.png
+ mods/default/textures/default_water_source_animated.png
+83 −85 mods/default/trees.lua
+17 −4 mods/doors/init.lua
+17 −10 mods/farming/api.lua
+0 −1 mods/fire/locale/fire.fr.tr
+0 −1 mods/fire/locale/fire.it.tr
+0 −1 mods/fire/locale/fire.ms.tr
+0 −1 mods/fire/locale/fire.ru.tr
+1 −1 mods/mob_horse
+1 −1 mods/mobs_animal
+1 −1 mods/mobs_monster
+1 −1 mods/mobs_npc
+1 −1 mods/mobs_redo
+1 −0 mods/mobs_sky
+1 −0 mods/mobs_water
+1 −1 mods/pbj_pup
+1 −1 mods/protector
+36 −113 mods/stairs/init.lua
+5 −3 mods/weather/weather.lua
Loading

0 comments on commit 8551551

Please sign in to comment.