dragonfire-client-waspsaliva/builtin
Schmappie Eldress 7871b44824 Merge branch 'dragonfire/master' into waspsaliva
This merge removes some redundant-looking code that was apparently
included in DFC upstream already.

This merge also reverts some whitespace & reformatting changes in the
`src/` directory so that a `git diff dragonfire/master` contains only
the essential differences.
2021-08-17 01:48:45 -05:00
..
async init 2020-10-04 03:37:08 +02:00
client Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
common Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
fstk Mainmenu: Improve "Join Game" tab (#11078) 2021-03-20 19:48:25 +01:00
game Merge branch 'master' of https://github.com/minetest/minetest 2021-05-13 18:06:47 +02:00
locale Update German builtin translation 2021-04-09 22:34:18 +02:00
mainmenu Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
profiler Builtin: Translatable join, leave, profiler msgs (#11064) 2021-03-19 21:46:11 +01:00
init.lua Merge branch 'master' of https://github.com/minetest/minetest 2021-03-26 14:00:57 +01:00
settingtypes.txt Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00