Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

minetest_game
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

960a9de9

Commit 960a9de9 authored 8 years ago by Milan

Downloads
- Plain Diff

fix mergeconflicts

parents 1cb367a2 55a16cd2

No related branches found

No related tags found

No related merge requests found

Changes 188

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 0 additions, 6 deletions

.gitmodules
.luacheckrc 1 addition, 1 deletion

.luacheckrc
.travis.yml 10 additions, 12 deletions

.travis.yml
game_api.txt 207 additions, 6 deletions

game_api.txt
minetest.conf.example 3 additions, 0 deletions

minetest.conf.example
mods/beds/README.txt 20 additions, 24 deletions

mods/beds/README.txt
mods/beds/api.lua 3 additions, 3 deletions

mods/beds/api.lua
mods/beds/beds.lua 15 additions, 1 deletion

mods/beds/beds.lua
mods/beds/functions.lua 1 addition, 1 deletion

mods/beds/functions.lua
mods/beds/license.txt 60 additions, 0 deletions

mods/beds/license.txt
mods/boats 0 additions, 1 deletion

mods/boats
mods/bones/README.txt 8 additions, 13 deletions

mods/bones/README.txt
mods/bones/init.lua 7 additions, 7 deletions

mods/bones/init.lua
mods/bones/license.txt 58 additions, 0 deletions

mods/bones/license.txt
mods/bucket/README.txt 9 additions, 22 deletions

mods/bucket/README.txt
mods/bucket/init.lua 29 additions, 5 deletions

mods/bucket/init.lua
mods/bucket/license.txt 51 additions, 0 deletions

mods/bucket/license.txt
mods/carts/README.txt 22 additions, 0 deletions

mods/carts/README.txt
mods/carts/cart_entity.lua 392 additions, 0 deletions

mods/carts/cart_entity.lua
mods/carts/depends.txt 1 addition, 0 deletions

mods/carts/depends.txt

with 897 additions and 102 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment