Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-25 01:19:33 +01:00
Code Issues Projects Releases Packages Wiki Activity
8146 commits 116 branches 83 tags 186 MiB
Commit graph

7356 commits

Author SHA1 Message Date
cora
969ac0be78 fix style details and mistakes in mcl_crimson 2022-06-19 00:24:52 +02:00
cora
d9a74ac180 rename mcl_surface_pools -> mcl_terrain_features 2022-06-19 00:24:52 +02:00
cora
a0264ed5e0 tweak biome distribution to be more like mc 
according to
https://www.reddit.com/r/Minecraft/comments/gjeuww/how_the_nether_biomes_are_distributed/
 2022-06-19 00:24:52 +02:00
cora
48189cb3a7 fix lighting issue for placed schematics 
warped and crimson shroomlight would not work correctly before
because they're placed after light calculation is done apparently
 2022-06-19 00:24:52 +02:00
cora
db9fba70dd some biome tweaks, add nether gold 2022-06-19 00:24:52 +02:00
cora
8efbd89b6a Add basalt columns & lava pools 2022-06-19 00:24:52 +02:00
cora
3c79685c48 Add main nether biomes 
Add nether forests

Add soulsand valley decorations

Add Basalt Delta basics
 2022-06-19 00:24:48 +02:00
cora
06fdfd2e63 make nether mushroom rotation random 2022-06-19 00:24:48 +02:00
cora
1c3a6f8a19 replace algorithmic fungus gen by schematic 
it was always the same anyways (except for the shroomlight)
 2022-06-19 00:24:48 +02:00
cora
489ee80490 remove enderman spawning 2022-06-19 00:24:48 +02:00
AFCMS
f285e18d24 Fix some codestyle issues with mcl_crimson 2022-06-19 00:24:48 +02:00
cora
7d653011fc fix whitespace 2022-06-19 00:24:48 +02:00
cora
6af3fecacb rename mcl_mushroom to mcl_crimson 2022-06-19 00:24:48 +02:00
3raven
9d5bbd7d22 Correct name 2022-06-19 00:24:48 +02:00
3raven
686b62f6e3 fix 
fix
 2022-06-19 00:24:45 +02:00
3raven
ee2f8f46f1 Non flammable/modify by similiraty with trees 2022-06-19 00:24:45 +02:00
3raven
653020d2ef Add texture files for stripped stem 
Add texture files for stripped stem

Add texture files for stripped stem

Add warped hyphae stripped and bark

Same for crimson hyphae
 2022-06-19 00:24:33 +02:00
kay27
7420877077 Bump ABM intervals to 1 second 2022-06-19 00:24:33 +02:00
3raven
69da3ffc05 fix texture 2022-06-19 00:24:33 +02:00
3raven
b25c23f5fa mcl_mushroom.fr.tr 
Translation
 2022-06-19 00:24:33 +02:00
kay27
352fd7562f #41 Remove proprietary textures, update game screenshot 2022-06-19 00:24:33 +02:00
debiankaios
4a727d79c7 german translation 
german translation

german translation
 2022-06-19 00:24:15 +02:00
debiankaios
b2b86e4fcc Added textures for the sprouts and roots. 2022-06-19 00:24:15 +02:00
debiankaios
c3e00a1c26 Add more decoration blocks. 
Added the decorations lbocks, and chancheg generation of decoration a bit.
 2022-06-19 00:24:15 +02:00
debiankaios
4b976a663f Add twisting_vines textures 2022-06-19 00:24:15 +02:00
debiankaios
6755675021 Fixed warnings 
Warnings because a var which not exist
 2022-06-19 00:24:15 +02:00
debiankaios
324aa159a7 New Textures 
New Textures

New Textures

New Textures

New Textures

New Textures

New Textures
 2022-06-19 00:23:23 +02:00
debiankaios
5b06af4fec Bufixes 
Fixed Bug that trees generating in other blocks. The slab and stairbug was fixed too.
 2022-06-17 22:54:30 +02:00
Elias Fleckenstein
c1ee0228f0 Fix light_source warning in mcl_mushroom 2022-06-17 22:54:30 +02:00
cora
49cb60f2e5 comment out ore generation for now 2022-06-17 22:54:30 +02:00
debiankaios
8a181661a5 Add warped and crimson 2022-06-17 22:54:30 +02:00
cora
98a322443b make "old" villagers keep their job 2022-06-17 13:59:32 +00:00
cora
cd43076ea3 additionally rate limit villager jobhunts 2022-06-17 15:54:53 +02:00
cora
e630ea59c9 Rate limit pathfinding attempts 
In certain situation it otherwise results in excessive attempts to
find a path.
 2022-06-17 15:54:53 +02:00
MysticTempest
965d10c003 Bell can be activated by redstone 2022-06-16 21:26:15 +02:00
Johannes Fritz
a455e7bb8e Lightning command: Strike player by name 2022-06-16 13:43:44 -05:00
cora
92da429f50 Fix chatcommand not under mcl_structures in /help 2022-06-15 05:10:41 +02:00
cora
726d1f07fa use noise instead of fill_ratio for distribution 2022-06-15 05:10:41 +02:00
cora
9c6aafa3c1 add surface pools 2022-06-15 05:10:41 +02:00
cora
1b0053299c Do not replace bedrock during geode gen. 2022-06-15 05:10:41 +02:00
cora
fa56ce5d52 Add outer geode layer 
uses deepslate until smooth basalt is there
 2022-06-15 05:10:41 +02:00
cora
a0bed1d8bc Add proper logging + some fixes 2022-06-15 05:10:41 +02:00
cora
a895292371 Add API documentation, minor fixes 2022-06-15 05:10:41 +02:00
cora
b0b8638a4c Add /spawnstruct support 2022-06-15 05:10:41 +02:00
cora
8fa67e6b4f Geodes as test for place by function 2022-06-15 05:10:41 +02:00
cora
1eaac3c406 use gennotify instead of lbm for placement 
keep the lbm for secondary structures
 2022-06-15 05:10:41 +02:00
cora
6406a14738 Add Structure placement api 2022-06-15 05:10:41 +02:00
cora
899c849996 old registered_structures -> structure_data 2022-06-15 05:10:41 +02:00
cora
8651e3b04e randomize spawning list 2022-06-15 05:06:31 +02:00
cora
60f164d46a Fix horse and wolf spawning biomes 2022-06-15 05:06:31 +02:00
mrminer
110b293297 Update 'mods/ITEMS/mcl_farming/potatoes.lua' 2022-06-15 01:30:55 +00:00
cora
27a84799e4 remove superfluous dependencies 2022-06-13 12:32:48 +02:00
cora
bd6d777f05 remove check for mcl_copper, fix recipe 2022-06-13 12:29:47 +02:00
cora
7dd6d5f886 spaces -> tabs 2022-06-13 12:29:47 +02:00
PrairieAstronomer
e58387d123 Removed screenshots and Liscense 2022-06-13 12:29:47 +02:00
NO11
c4aa634a40 mcl_spyglass by NO11 2022-06-13 12:29:17 +02:00
cora
9cea10a706 fix more blast resistance and hardness values 2022-06-13 02:48:00 +02:00
cora
2074fec7a1 Fix hardness and b.resistance of blackstone nodes 2022-06-13 02:48:00 +02:00
cora
4e1b6074c7 Add Smooth Basalt node 2022-06-13 02:48:00 +02:00
cora
a43627e268 Fix 2 wrong variable uses that made warnings 2022-06-12 01:35:27 +00:00
PrairieAstronomer
87a45ad78e Minor Format Detail in Country Lode Advancement 2022-06-11 19:14:28 -06:00
PrairieAstronomer
bbd86045e5 Country Lode, Take Me Home Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
eb72bb81da Fishy Business Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
b544fb819d What A Deal! Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
17e2f05971 Sweet Dreams Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
2a62936fe7 Postmortal Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
91f8f44e17 The End? Advancement 2022-06-11 15:35:48 -06:00
PrairieAstronomer
1a5195b5e6 Isn't It Iron Pick Advancement 2022-06-11 15:35:48 -06:00
epCode
ef92475d35 Merge pull request 'master' (#2296) from master into Raytraced_arrows_fix 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2296
 2022-06-11 02:42:04 +00:00
epCode
6bc5e76b8f fix tipped arrows and rocket 2022-06-10 19:40:12 -07:00
epCode
6a74adc261 Merge pull request 'master' (#2290) from master into Raytraced_arrows 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2290
 2022-06-09 16:18:56 +00:00
cora
d1149ee49a Add 'mods/ITEMS/mcl_sus_stew/' from commit '6048efbc988390321952e9ba1da4f6342df59cbf' 
git-subtree-dir: mods/ITEMS/mcl_sus_stew
git-subtree-mainline: 8d9131eda3
git-subtree-split: 6048efbc98
 2022-06-08 05:16:58 +02:00
epCode
0aaede2f50 Merge pull request 'master' (#2285) from master into Raytraced_arrows 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2285
 2022-06-07 18:41:22 +00:00
MysticTempest
45ec876167 Knockback fixes: 
This PR enables knockback for snowballs, and eggs.
And disables knockback for the following mobs: Shulkers, Iron Golems,
and Ender Dragons.
 2022-06-07 02:55:19 -05:00
epCode
6c804f44d5 add a small bit of doc 2022-06-06 18:43:50 -07:00
cora
5c057f24fb get_mapgen_params -> get_mapgen_setting 2022-06-07 03:17:32 +02:00
epCode
d738229298 Make loaded Crossbow (Corssbow) not show up in creative inventory 2022-06-07 00:58:37 +00:00
epCode
78940e109c fix critical hit displaying in the wrong place 2022-06-06 14:38:18 -07:00
epCode
fdb7d5bfad fixed Badly calculated arrow direction 2022-06-06 14:32:07 -07:00
epCode
f2c2f4106b fix arrows not disapearing after mob hit, and self damaging 2022-06-06 13:55:28 -07:00
epCode
e1feec9a30 Add Raytracing arrows 2022-06-06 13:42:24 -07:00
epCode
ad486a56fd Add more Villager sounds 2022-06-06 12:09:14 -07:00
epCode
42c764e149 Make Villager nod/head shake 2022-06-06 11:12:57 -07:00
cora
4bff9710a0 Make structblock non walk- and pointable 2022-06-06 01:08:55 +02:00
cora
d4e4bc8708 add rarer beached shipwreck 2022-06-05 13:10:36 +02:00
cora
b7419dc207 randomly enchant treasure 2022-06-05 13:10:36 +02:00
cora
4af1094eed Add shipwrecks 
schematics by chmodsayshello
 2022-06-05 13:10:36 +02:00
cora
ef093d0c00 Be more careful with possibly expired objects 2022-06-04 20:26:00 +02:00
MysticTempest
b4c5805afe Make items flowing in water use acceleration for movement. 2022-06-03 05:46:27 -05:00
MysticTempest
5dde594c19 Item movement fixes: 
This PR fixes items at flowing_water edges not falling down holes.
As well as fixing items not sliding on slippery nodes like ice.

And, allows for movement starting at the source block of a
flowing water node. While ensuring regular water_source blocks
do not bug out.
 2022-06-02 09:44:04 +00:00
MysticTempest
983b8f0934 Make breaking boats by hand easier. 2022-06-02 00:20:44 -05:00
NO11
25d847f49f Fix crash when unknown item in offhand slot 2022-05-31 22:43:30 +02:00
MysticTempest
31106a2031 Fix items obtained from villager trades: 
This PR stops the load_enchantments function from being
called for all items in the villager trades.
Fixing non-enchanted items from villagers being unable to stack
with their regular counterparts.

As they now, no longer have any description metadata.
While also ensuring that enchanted items still have their
tooltips, and work.
 2022-05-30 15:11:22 -05:00
cora
dc21b02d04 update old mobs_mc_ horse armor textures 2022-05-30 10:49:38 +00:00
Elias Fleckenstein
a86fc935aa mcl_maps: add callback to load_map function (#2261) 
Fixes maps in itemframes not loading after restart (#2255)
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2261
Co-authored-by: Elias Fleckenstein <eliasfleckenstein@web.de>
Co-committed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-30 01:32:20 +00:00
cora
a44347f641 make cart.table, fletch.table and loom diggable 2022-05-29 22:07:47 +02:00
cora
e4a4648b25 fix size of black cat texture 2022-05-29 02:34:02 +02:00
cora
6b9cb0062d save home coords in cat entity as well 2022-05-29 02:34:02 +02:00
cora
2337e72a23 simplify spawn logic 2022-05-29 02:34:02 +02:00
cora
da6563a5b3 Spawn witch and black cat on witchhut generation 2022-05-29 02:34:02 +02:00
cora
a179a1cb62 fix indoor weather + multiplayer issue 2022-05-29 02:24:12 +02:00
cora
7bc63d2882 fix mcl_mobs api_changes 2022-05-28 00:06:29 +02:00
cora
c0a9cb7020 don't hurt perched parrot on punch 2022-05-28 00:05:04 +02:00
cora
e90e17e533 clean up perch code, smoother behavior 2022-05-28 00:05:04 +02:00
cora
3d13000599 tweak detaching behavior 2022-05-28 00:05:04 +02:00
cora
86bc398a79 don't do flying animation while perching,fix anims 2022-05-28 00:05:04 +02:00
cora
14ec1aa014 add basic parrot perching 2022-05-28 00:05:04 +02:00
cora
ae2860d017 Show/Hide XP-hud immediately after gamemode switch 2022-05-27 19:56:47 +02:00
cora
1127231ca9 Fix crash on non existent xp-hud due to gamemode 2022-05-27 15:06:25 +02:00
cora
4dba637ed8 readd lost horse armor inv images - confusing names 2022-05-27 02:44:39 +02:00
Elias Fleckenstein
e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
cora
47fa43825c count only mobs for cramming 2022-05-26 14:20:19 +02:00
cora
af7dc0fb8f change "constant" declaration to match mcl_mobs 2022-05-26 14:16:38 +02:00
cora
87f50d6423 entity cramming: clean up check logic 2022-05-26 14:16:38 +02:00
cora
fb4f21cba0 entity cramming: spare the children 2022-05-26 14:16:38 +02:00
cora
85b599edba entity cramming: check less often 2022-05-26 14:16:38 +02:00
cora
b4cbc528a3 mcl_mobs: add entity_cramming 2022-05-26 14:16:38 +02:00
Elias Fleckenstein
f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Elias Fleckenstein
dd1f8cb59c Remove enderman gameconfig 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
4054f05a4c Remove support for invisibility mod 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
f6be8bac5a Remove checks for MCL2 mods 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
8db9e76529 Remove unused version field 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
6ae722a6ee Remove use_cmi 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
fc3992ceb6 Remove mobs.is_creative 2022-05-25 23:13:33 +02:00
cora
d3afccad64 Merge pull request 'Fix warnings in mcl_bells and mcl_beds' (#2243) from EliasFleckenstein03/MineClone2:warn into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2243
 2022-05-25 17:54:28 +00:00
Elias Fleckenstein
569288b782
Fix warnings in mcl_bells and mcl_beds 2022-05-25 19:37:36 +02:00
cora
d863a6298b fix/simplifiy things from review 2022-05-25 16:36:04 +02:00
cora
2499fe1e83 add complete input validation, better result msgs 2022-05-25 05:43:49 +02:00
cora
f89780695e Add /gamemode command for per player gamemode 2022-05-25 05:43:49 +02:00
cora
6a2f9e1a16 Fix wrong argument to is_creative_enabled 2022-05-25 03:41:43 +00:00
cora
bda5073d86 make soul fire drop nothing when dug 2022-05-25 05:27:52 +02:00
cora
11e8e7d4cc Add soul_group to s.soil&sand, torch fix recpipe 2022-05-24 13:25:59 +02:00
kabou
1931a85f24 Add blackstone to cobble group. 
By adding blackstone to the group "cobble", it automatically inherits
all crafting recipes and tool repair capabilities that apply to that
group.

* Add `cobble=1` to blackstone node definition groups.
* Remove stone tools and furnace crafting recipes.
 2022-05-24 13:25:45 +02:00
cora
0c65363a09 replace ' with " 2022-05-24 13:25:45 +02:00
cora
b6a647e119 remove unused vars 2022-05-24 13:25:45 +02:00
cora
23e5a1c7d3 Comment out ore generation for now 
The discussion about how to handle this is still ongoing. Since
this is about getting the new nodes disable ore registration
for now.
 2022-05-24 13:25:45 +02:00
cora
0d8436b343 fix soul fire 2022-05-24 13:25:45 +02:00
cora
29c16eaa75 remove superfluous torch models 2022-05-24 13:25:45 +02:00
cora
2d81d31139 Fix soul torch to use the actual mcl_torches api 2022-05-24 13:25:45 +02:00
cora
a9be3f0f96 remove excessive newlines 2022-05-24 13:25:45 +02:00
cora
181a7d3b11 make nether gold gen. respect mcl_generate_ores 2022-05-24 13:25:45 +02:00
cora
430dc7fd8c remove packed ice recipe 2022-05-24 13:25:45 +02:00
cora
c6312e7bdd use vector.new instead of normal tables 2022-05-24 13:25:45 +02:00
cora
d9f2db5950 adapt readme to mcl2 2022-05-24 13:25:45 +02:00
cora
6b058d6f38 remove changelog.md 2022-05-24 13:25:45 +02:00
cora
dd928db9ea fix soul torch recipe 2022-05-24 13:25:45 +02:00
cora
67e026cb12 blackstone: remove soul lantern dupe(mcl_lanterns) 2022-05-24 13:25:45 +02:00
cora
4a0a9ba482 move depends.txt to mod.conf, add author field 2022-05-24 13:25:45 +02:00
debian044
16d79996c0 Add blackstone via cp -r & git add * ^^ 2022-05-24 13:25:45 +02:00
Elias Fleckenstein
60c463b8f9
Run tools/generate_ingame_credits.lua 
This should be run every time CREDITS.md is changed.
 2022-05-22 21:41:40 +02:00
cora
028d1c1f4f do not tame villagers 2022-05-22 14:43:44 +02:00
cora
a5ba8f739f Add bell to villager trades 2022-05-22 02:01:21 +02:00
cora
d34191f00c villagers go to the bell if it's rung(for now) 
this will help with further testing pathfinding until villagers
get a proper schedule and do more things
 2022-05-22 02:01:21 +02:00
cora
ec73afd21a use iron texture for apprentice badge, not stone 2022-05-22 02:01:21 +02:00
cora
fca259c074 fix crash during (artificial) village creation 
when using the village tool doing that on an unsuitable location
would result in no position for the belltower being available
this checks for that and ... doesn't crash then ^^
 2022-05-22 02:01:21 +02:00
cora
7379d5bee8 Add Belltower to villages 2022-05-21 14:48:56 +02:00
cora
d67dd0577f fix crash through forgotten function call 2022-05-21 12:36:57 +02:00
cora
e353ec3b16 Iron golems pick and pick up one (stack of) poppy 2022-05-21 12:36:57 +02:00
cora
5dafeaadc6 Fix indentation in mcl_mobs/api.txt 2022-05-21 12:36:57 +02:00
cora
2b63866c14 spawn villagers (and golem) immediately after mg 2022-05-21 12:36:57 +02:00
cora
27d0d778e2 Update TODO list 2022-05-21 12:36:57 +02:00
cora
a74fcab06b Make iron golem stay near set _home position 2022-05-21 12:36:57 +02:00
cora
e51ea1e079 initialize inventory nodes on mapgen 2022-05-21 12:36:57 +02:00
cora
e5806215f0 fix possible crash 2022-05-21 12:36:57 +02:00
cora
08b36e3eb3 Add textures for all professions 2022-05-21 12:36:57 +02:00
cora
53df441c1b Don't pick up near player, add more breeding stuff 2022-05-21 12:36:57 +02:00
cora
873e018faf Dynamically add trading tier badge to texture 2022-05-21 12:36:57 +02:00
cora
b58422a584 write villager id into bed nodemeta 2022-05-21 12:36:57 +02:00
cora
3ff4ea576d spawn iron golem on villagegen 2022-05-21 12:36:57 +02:00
cora
539c31e8d6 fix trading crash 2022-05-21 12:36:57 +02:00
cora
db865ede56 villagers open doors in daytime and close at night 2022-05-21 12:36:57 +02:00
cora
0d56ef1a90 add jobsites to villagegen schematics 2022-05-21 12:36:57 +02:00
cora
67939f7b7a pathfinding: find doors close to target as well 2022-05-21 12:36:57 +02:00
cora
9ccbf91706 mobs api: document api additions 2022-05-21 12:36:57 +02:00
cora
dfb74cf9e9 mobs: add nofollow option so v. dont follow bread 2022-05-21 12:36:57 +02:00
cora
9a866e873e breed by throwing bread at villagers 2022-05-21 12:36:57 +02:00
cora
e6b65af3b4 add mobs item pickup 2022-05-21 12:36:57 +02:00
cora
4ac41a793e fix two crashes in pathfinding 2022-05-21 12:36:57 +02:00
cora
98231f15ae change function name go_wplist -> gopath 2022-05-21 12:36:57 +02:00
cora
e3bb7fe4be codestyle: replace inline functions 2022-05-21 12:36:57 +02:00
cora
f8fc111b4a pathfind to jobsites 2022-05-21 12:36:57 +02:00
cora
dbc5564d02 move movement code to mcl_mobs 2022-05-21 12:36:57 +02:00
cora
ce7a882c86 Show trade tier in formspec 2022-05-21 12:36:57 +02:00
cora
12bc8f1a3b initial pathfinding experiments 
to test rightclick a villager and it will try to path find to
0,9,0 (i'm using flat mapgen for testing for now).
 2022-05-21 12:36:57 +02:00
cora
0598aa35c0 add simple jobsite logic 2022-05-21 12:36:57 +02:00
cora
e9f4f500d9 bell: slightly tweak bottom texture 2022-05-21 12:35:22 +02:00
cora
63b6a1d176 Update README.md 2022-05-20 21:54:42 +02:00
cora
1ba12aec60 Add new textures, make bell a nodebox 
thx erlehmann for the nodebox <3
 2022-05-20 21:27:12 +02:00
cora
4ba570e3b4 remove mesecons dependency 2022-05-20 13:45:45 +02:00
cora
bf1a939564 fix bell sound 2022-05-20 13:44:17 +02:00
cora
fe164e5f41 add basic mcl2 node properties 2022-05-20 13:36:41 +02:00
kay27
a6e9afbb93 Add bell from mcl5 2022-05-20 13:33:39 +02:00
Nils Dagsson Moskopp
c9c14d6ff0 Add noise to christmas chest textures 2022-05-20 04:13:13 +02:00
Nils Dagsson Moskopp
ff384c9588 Reskin chests as presents on December 24th to 26th 2022-05-20 04:13:01 +02:00
cora
c4e51650f8 smoker & bfurnace: More concise short descriptions 2022-05-18 13:37:34 +02:00
cora
8426e7826a Fix smoker fuel not being burned at twice the rate. 2022-05-18 13:30:00 +02:00
MysticTempest
d10f8944ed Fix blast_furnace fuel not being consumed at twice the rate. 2022-05-18 05:30:05 -05:00
PrairieWind
d93704fa0e Merge branch 'master' into furnaces 2022-05-17 18:33:20 +00:00