minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: minetest:b3ea22dad141a71673abd6e6e1eefe3ce425ffef
Branches Tags
minetest:master
...
compare: minetest:fce3b46407aed0b966f9149d76da4a38ab280128
Branches Tags
minetest:master

3 commits
b3ea22dad1 ... fce3b46407

Author SHA1 Message Date
philipmi
fce3b46407 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mods/ctf/ctf_map/ctf_map_core/maps
 2021-09-25 21:58:09 +02:00
philipmi
afd7d36a4e Update maps submodule 2021-09-25 21:55:49 +02:00
philipmi
088f829c68 Update maps submodule 2021-09-25 21:54:09 +02:00
2 changed files with 2 additions and 2 deletions
Show stats Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -3,7 +3,7 @@
url = https://github.com/rubenwardy/crafting url = https://github.com/rubenwardy/crafting
[submodule "mods/ctf/ctf_map/ctf_map_core/maps"] [submodule "mods/ctf/ctf_map/ctf_map_core/maps"]
path = mods/ctf/ctf_map/ctf_map_core/maps path = mods/ctf/ctf_map/ctf_map_core/maps
url = https://github.com/MT-CTF/maps url = https://git.sp-codes.de/philipmi/maps
[submodule "mods/pvp/shooter"] [submodule "mods/pvp/shooter"]
path = mods/pvp/shooter path = mods/pvp/shooter
url = https://git.sp-codes.de/philipmi/shooter url = https://git.sp-codes.de/philipmi/shooter

2
mods/ctf/ctf_map/ctf_map_core/maps

@ -1 +1 @@
Subproject commit 6afcf12e1ca22873fc4066b242f57b8398131745 Subproject commit 10970201c9961fc34158b68dd14ff1e073e1124e