merge upstream

2022-08-25 17:51:59 +02:00 · 2021-07-08 11:47:37 +01:00 · 2018-08-04 15:29:28 +02:00 · 2021-10-27 12:03:49 +02:00 · 2022-08-25 17:51:59 +02:00 · 2021-02-12 20:55:18 +01:00
diff --git a/.github/workflows b/.github/workflows
Milan f3be63d874 merge upstream		2022-08-25 17:51:59 +02:00
.github/workflows	Replace Travis CI with GitHub actions (#2661 )	2021-07-08 11:47:37 +01:00
menu	add own header and icon for the subgame	2018-08-04 15:29:28 +02:00
modpacks	Bump modpacks/mydoors from `eef3b5f` to `1e7ace6`	2021-10-27 12:03:49 +02:00
mods	merge upstream	2022-08-25 17:51:59 +02:00
utils	Safe texture compression (#2808 )	2021-02-12 20:55:18 +01:00
.gitignore	merge upstream commit: Gitignore: Update to ignore additional ide/editors	2016-07-16 13:46:33 +02:00
.gitlab-ci.yml	prepare for gitlab-runner	2021-09-02 21:23:05 +02:00
.gitmodules	add submodule colored_eggs	2022-02-08 08:28:40 +01:00
.luacheckrc	prepare for gitlab-runner	2021-09-02 21:23:05 +02:00
LICENSE.txt	License.txt: Include full official LGPL 2.1 .txt file	2017-01-07 22:01:24 +00:00
README.md	Copyedit `README.md` & `game.conf` (#2919 )	2022-01-23 18:07:10 +01:00
game.conf	merge upstream	2022-08-25 17:51:59 +02:00
game_api.txt	Deduplicate player action logging, silence fake player actions (#2941 )	2022-05-06 20:04:55 +02:00
minetest.conf	Minetest.conf: Move mapgen flags to engine .conf	2015-04-14 02:32:06 +01:00
minetest.conf.example	Deduplicate player action logging, silence fake player actions (#2941 )	2022-05-06 20:04:55 +02:00
readme.md	update readme	2016-07-16 23:46:36 +02:00
schematic_tables.txt	Fix missing papyrus in savanna, add a dry dirt version	2020-02-09 01:34:17 +00:00
screenshot.png	Safe texture compression (#2808 )	2021-02-12 20:55:18 +01:00
settingtypes.txt	Deduplicate player action logging, silence fake player actions (#2941 )	2022-05-06 20:04:55 +02:00