Commit b2d80a37 authored by Peter Nerlich's avatar Peter Nerlich
Browse files

Merge branch 'master' into testing

parents e24edbfc 318155bc
Pipeline #44217 passed with stage
in 12 seconds
......@@ -10,6 +10,8 @@ report:
only:
- master
- testing
tags:
- fsr
script:
- ./show-upstream-changes.sh -nc 2>&1 | tee upstream-report-color.txt
- ./show-upstream-changes.sh -n > upstream-report.txt
......
......@@ -156,13 +156,13 @@
url = https://gitlab.fachschaften.org/minetest/kiffood.git
[submodule "character_creator"]
path = character_creator
url = https://gitlab.fachschaften.org/minetest/character_creator.git
url = https://gitlab.hrz.tu-chemnitz.de/fsr-i/minetest/character_creator.git
[submodule "pipeworks"]
path = pipeworks
url = https://gitlab.com/VanessaE/pipeworks
[submodule "kif_custom"]
path = kif_custom
url = https://gitlab.fachschaften.org/minetest/kif_custom.git
[submodule "fsr_custom"]
path = fsr_custom
url = https://gitlab.hrz.tu-chemnitz.de/fsr-i/minetest/fsr_custom.git
[submodule "morelights"]
path = morelights
url = https://github.com/random-geek/morelights.git
......
Subproject commit ea508a27cea63c78bc44fcd20c6b3a5d69ffd39e
Subproject commit dda4c7979d97ce0c03b3e652e227dd7f219bd626
Subproject commit d720fd3d52fd9b36aa78854c2806769a12273fa1
kif_custom @ 2b4427a3
Subproject commit 2b4427a3adba8cd48b006ed123b71a79f456f5c2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment