update submodules

This commit is contained in:
proller 2016-01-29 16:57:07 +03:00
parent 3e4aa329fa
commit 6c34a811aa
3 changed files with 4 additions and 3 deletions

View File

@ -3,6 +3,7 @@ Engine
### 0.4.13.8 ( )
* Stability and speed fixes
* kv lua api: now possible to use any custom db: core.kv_put('mykey', 'mydata', 'mydb'); core.kv_get('mykey', 'mydb'); 'mydb' is optional
* Optional store auth database to leveldb, no huge auth.txt. to enable: auth_kv=1
* Mapgen indev: huge noise based caves
* Auto delete old items by default. push items up from solid blocks.

@ -1 +1 @@
Subproject commit b06a26040fa95e6a70fb36deb57524734f7e34dd
Subproject commit e3b53be1bede19fa6680889eb1d870cdf00fb3b6

View File

@ -21,12 +21,12 @@ git pull
git remote add minetest_game https://github.com/minetest/minetest_game.git
git fetch --all
git submodule foreach --recursive "git checkout master; git pull||true"
git commit -a -m "up"
git commit -a -m "update submodules"
( git merge --no-edit minetest_game/master | grep -i "conflict" ) && exit
git push
cd ..
git commit -a -m "up"
git commit -a -m "update submodules"
git push
git status