minetest4kids
/
survival-mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'WIP merge testing with main' (#9) from testing into main 

Reviewed-on: https://codeberg.org/minetest4kids/survival-mods/pulls/9
master
nac 2021-03-09 14:28:44 +01:00
parent 2a71034844 8c65d70a65
commit edfbf249c4
39 changed files with 179 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
.gitmodules vendored
View File

@ -31,9 +31,6 @@
[submodule "biome_lib"]
path = biome_lib
url = https://gitlab.com/VanessaE/biome_lib.git
[submodule "better_fences"]
path = better_fences
url = https://github.com/ChimneySwift/better_fences.git
[submodule "bees"]
path = bees
url = https://notabug.org/TenPlus1/bees.git
@ -43,18 +40,12 @@
[submodule "cool_trees"]
path = cool_trees
url = https://github.com/runsy/cool_trees.git
[submodule "digtron"]
path = digtron
url = https://github.com/minetest-mods/digtron.git
[submodule "enchanting"]
path = enchanting
url = https://github.com/minetest-mods/enchanting.git
[submodule "farming"]
path = farming
url = https://notabug.org/TenPlus1/farming.git
[submodule "frame"]
path = frame
url = https://github.com/minetest-mods/frame.git
[submodule "gates_long"]
path = gates_long
url = https://github.com/Sokomine/gates_long.git
@ -73,9 +64,6 @@
[submodule "lumberjack"]
path = lumberjack
url = https://github.com/joe7575/lumberjack.git
[submodule "mapfix"]
path = mapfix
url = https://github.com/minetest-mods/mapfix.git
[submodule "mapserver_mod"]
path = mapserver_mod
url = https://github.com/minetest-mapserver/mapserver_mod.git
@ -154,9 +142,6 @@
[submodule "moreblocks"]
path = moreblocks
url = https://github.com/minetest-mods/moreblocks.git
[submodule "sfinv"]
path = sfinv
url = https://github.com/rubenwardy/sfinv.git
[submodule "chat3"]
path = chat3
url = https://github.com/octacian/chat3.git
@ -184,12 +169,93 @@
[submodule "skybox"]
path = skybox
url = https://github.com/minetest-mods/skybox.git
[submodule "factory_bridges"]
path = factory_bridges
url = https://github.com/narrnika/factory_bridges.git
[submodule "animalworld"]
path = animalworld
url = https://github.com/Skandarella/animalworld.git
[submodule "regrow"]
path = regrow
url = https://notabug.org/TenPlus1/regrow.git
[submodule "bridges"]
path = bridges
url = https://github.com/Sokomine/bridges.git
[submodule "minimap_radar"]
path = minimap_radar
url = https://github.com/OgelGames/minimap_radar.git
[submodule "builtin_item"]
path = builtin_item
url = https://notabug.org/TenPlus1/builtin_item.git
[submodule "bows"]
path = bows
url = https://notabug.org/TenPlus1/bows.git
[submodule "guinea_pig"]
path = guinea_pig
url = https://github.com/DrPlamsa/guinea_pig.git
[submodule "livingnether"]
path = livingnether
url = https://github.com/Skandarella/livingnether.git
[submodule "drawers"]
path = drawers
url = https://github.com/minetest-mods/drawers.git
[submodule "dreambuilder_hotbar"]
path = dreambuilder_hotbar
url = https://gitlab.com/VanessaE/dreambuilder_hotbar.git
[submodule "servercleaner"]
path = servercleaner
url = https://github.com/AiTechEye/servercleaner.git
[submodule "illumination"]
path = illumination
url = https://notabug.org/Piezo_/minetest-illumination.git
[submodule "scaffolding"]
path = scaffolding
url = https://bitbucket.org/Infinatum/scaffolding.git
[submodule "minetest-toolranks-extras"]
path = toolranks_extras
url = https://github.com/louisroyer/minetest-toolranks-extras.git
[submodule "minetest-toolranks"]
path = toolranks
url = https://github.com/lisacvuk/minetest-toolranks.git
[submodule "morebricks"]
path = morebricks
url = https://gitlab.com/KaylebJay/morebricks.git
[submodule "xdecor"]
path = xdecor
url = https://github.com/minetest-mods/xdecor.git
[submodule "3d_armor_flyswim"]
path = 3d_armor_flyswim
url = https://github.com/sirrobzeroone/3d_armor_flyswim.git
[submodule "itemshelf"]
path = itemshelf
url = https://github.com/hkzorman/itemshelf.git
[submodule "columnia"]
path = columnia
url = https://github.com/Glunggi/columnia.git
[submodule "climate_api"]
path = climate_api
url = https://github.com/t-affeldt/climate_api.git
[submodule "lightning"]
path = lightning
url = https://github.com/minetest-mods/lightning.git
[submodule "minetest_moon_phase"]
path = minetest_moon_phase
url = https://github.com/t-affeldt/minetest_moon_phase.git
[submodule "regional_weather"]
path = regional_weather
url = https://github.com/t-affeldt/regional_weather.git
[submodule "ts_furniture"]
path = ts_furniture
url = https://github.com/minetest-mods/ts_furniture.git
[submodule "farming_flood"]
path = farming_flood
url = https://github.com/AFCMS/farming_flood.git
[submodule "playerlist"]
path = playerlist
url = https://github.com/EliasFleckenstein03/playerlist.git
[submodule "quartz"]
path = quartz
url = https://github.com/minetest-mods/quartz.git
[submodule "controls"]
path = controls
url = https://github.com/mt-mods/controls.git
[submodule "unified_inventory"]
path = unified_inventory
url = https://github.com/minetest-mods/unified_inventory.git

1
3d_armor_flyswim Submodule

@ -0,0 +1 @@
Subproject commit cb812fb82437e09337ce047a04480eef41d90188

47
README.md
View File

@ -2,11 +2,24 @@
Mods des minetest4kids-Survival Servers.
## Achtung!
Dies ist der "testing" Branch und kann zu unerwarteten Problemen / Fehlern führen.
## Vorraussetzungen
- mindestens Minetest 5.4.0
- mindestens 1 GB RAM
- git
- quilt
## Install
```
git clone https://codeberg.org/minetest4kids/m4k-mods.git
```
```
git submodule sync
```
```
git submodule init
```
@ -14,3 +27,37 @@ git submodule init
```
git submodule update
```
### patches
Die Modd 'Witt' crasht beim Blick auf einen sog. "unknown_node", hier für habe ich einen Patch erstellt der das Problem löst. Um ihn anzuwenden bitte folgenden Schritte durchführen:
```
quilt push -a
```
## Update
### patches
Vor einem update bitte immer die Patches entfernen.
```
quilt pop -a
```
Anschließend kann das Update der Mods mit folgenden Befehlen durchgeführt werden.
```
git pull
```
```
git submodule init
```
```
git submodule update
```
```
git clean -dff
```

1
better_fences

@ -1 +0,0 @@
Subproject commit 9fe099b343caa5ee286a53d9b83728fc67f86296

1
bows Submodule

@ -0,0 +1 @@
Subproject commit 4755d00b4baf8aca372f92d69ea47d9abb8a66a7

1
bridges Submodule

@ -0,0 +1 @@
Subproject commit 5b5f47552cab78cad1c31be84b5db3d384e2bbff

1
builtin_item Submodule

@ -0,0 +1 @@
Subproject commit 6eceac6e0e8dbee0a3a9bdbcd2f16d783059d9b8

1
climate_api Submodule

@ -0,0 +1 @@
Subproject commit a56116e8ab50405431e4f862b9fcfcb58f725bc3

1
columnia Submodule

@ -0,0 +1 @@
Subproject commit b7af923d1c829f38611fc8e79f90b287e66ccce2

1
controls Submodule

@ -0,0 +1 @@
Subproject commit 6baa8365718fec83b5d862064699bc3509bd7218

1
digtron

@ -1 +0,0 @@
Subproject commit 843dbd227658a93ee4df791bfdd3d136ee7adf85

1
drawers Submodule

@ -0,0 +1 @@
Subproject commit 662be1a11f0cbe84e3091e57cf375b35cd3ba5a2

1
dreambuilder_hotbar Submodule

@ -0,0 +1 @@
Subproject commit 778eb26aaa3e15109c00702841b8e9f7f0c7b1dd

1
factory_bridges

@ -1 +0,0 @@
Subproject commit ea43c55c23f6633c4161854e143307b3707f4dec

1
farming_flood Submodule

@ -0,0 +1 @@
Subproject commit 71ee276308272d23f7c971593fd5ae678b30b642

1
frame

@ -1 +0,0 @@
Subproject commit 5543e277a010d871d8233b284ccb5e9b54d9fc2e

1
guinea_pig Submodule

@ -0,0 +1 @@
Subproject commit 281739351ee06fa5eb5e0146113920d846a22aeb

1
illumination Submodule

@ -0,0 +1 @@
Subproject commit 770247fdef8cb9c04b98eb0111a8219f2df1fc25

1
itemshelf Submodule

@ -0,0 +1 @@
Subproject commit 5a9914ca0ac5d2116480d03ed854451ab7ffb2dc

1
lightning Submodule

@ -0,0 +1 @@
Subproject commit 10595463449df42ef81684f7561773e9245f3a6a

1
livingnether Submodule

@ -0,0 +1 @@
Subproject commit e081d37dfd81173d417e1a06196d3284080e6102

1
mapfix

@ -1 +0,0 @@
Subproject commit 4d3f6505b54b7047823a69d539aa6706b51d2dfa

1
minetest_moon_phase Submodule

@ -0,0 +1 @@
Subproject commit f9182cae3f78b832e253d3ffc82cb7ff6a67cf8b

1
minimap_radar Submodule

@ -0,0 +1 @@
Subproject commit f55e5559dde7bd0a9e9bfe34b770a4b11f57994e

1
morebricks Submodule

@ -0,0 +1 @@
Subproject commit 162af8e845b00385d57f0d5f842ce33b4eeaa399

1
patches/series Normal file
View File

@ -0,0 +1 @@
witt_fix.diff

14
patches/witt_fix.diff Normal file
View File

@ -0,0 +1,14 @@
Index: survival-mods/witt/init.lua
===================================================================
--- survival-mods.orig/witt/init.lua
+++ survival-mods/witt/init.lua
@@ -20,7 +20,8 @@ minetest.register_globalstep(function(dt
update_player_hud_pos(player, player_to_animtime[player])
end
- if lookat then
+ if lookat and minetest.registered_nodes[lookat.name] ~= nil then
+ --if lookat then
if player_to_cnode[player] ~= lookat.name then -- Only do anything if they are looking at a different type of block than before
player_to_animtime[player] = nil -- Reset the animation
local nodename, mod = describe_node(lookat) -- Get the details of the block in a nice looking way

1
playerlist Submodule

@ -0,0 +1 @@
Subproject commit a84a62544f7896b3f3551b8fb5b49ba0b510e416

1
quartz Submodule

@ -0,0 +1 @@
Subproject commit 72ec06fff6bd613dd03d294f5a69fd0beec2b891

1
regional_weather Submodule

@ -0,0 +1 @@
Subproject commit 4b44f25ef89947e0c7fcd28d65df8327e5674153

1
scaffolding Submodule

@ -0,0 +1 @@
Subproject commit 930edb43d2460fb027255e7fbc17aa7b89532690

1
servercleaner Submodule

@ -0,0 +1 @@
Subproject commit 82db9f3cfd72ac78a4a6bd396e461f5e7acd3c5f

1
sfinv

@ -1 +0,0 @@
Subproject commit 988ade8f03613ee9fef081be70da10c3b05988f6

1
toolranks Submodule

@ -0,0 +1 @@
Subproject commit 8010feb5bfecd369c7a9353ac786bc6c83384174

1
toolranks_extras Submodule

@ -0,0 +1 @@
Subproject commit 4f2c3884327034ab3e0e142ceecff324836f9bae

1
ts_furniture Submodule

@ -0,0 +1 @@
Subproject commit d6a34f398fb1b613a23f59c9e21c32d46c423602

1
unified_inventory Submodule

@ -0,0 +1 @@
Subproject commit fbbf786caf056aff70eec25f0878925f89d49bbe

5
update-mods.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
git pull && git submodule init && git submodule update && git clean -dff && chown -R Debian-minetest:games *

1
xdecor Submodule

@ -0,0 +1 @@
Subproject commit 8acc028481701a63a359e458db1109301fc1d3d3