Merge remote-tracking branch 'upstream/master'

2025-07-23 15:40:18 +02:00 · 2021-01-24 12:40:06 +01:00
parent 99a01301a8 fd596ea83b
commit df9e8aea4b
828 changed files with 88659 additions and 89233 deletions
--- a/fake_fire/models/fancy_fire.obj
+++ b/fake_fire/models/fancy_fire.obj
--- a/fake_fire/textures/chimney_top.png
+++ b/fake_fire/textures/chimney_top.png
--- a/fake_fire/textures/embers_animated.png
+++ b/fake_fire/textures/embers_animated.png
--- a/fake_fire/textures/fake_fire_animated.png
+++ b/fake_fire/textures/fake_fire_animated.png
--- a/fake_fire/textures/fake_fire_embers.png
+++ b/fake_fire/textures/fake_fire_embers.png
--- a/fake_fire/textures/fake_fire_empty_tile.png
+++ b/fake_fire/textures/fake_fire_empty_tile.png
--- a/fake_fire/textures/fake_fire_inv.png
+++ b/fake_fire/textures/fake_fire_inv.png
--- a/fake_fire/textures/fake_fire_particle_anim_fire.png
+++ b/fake_fire/textures/fake_fire_particle_anim_fire.png
--- a/fake_fire/textures/fake_fire_particle_anim_smoke.png
+++ b/fake_fire/textures/fake_fire_particle_anim_smoke.png
--- a/fake_fire/textures/fancy_fire_inv.png
+++ b/fake_fire/textures/fancy_fire_inv.png
--- a/fake_fire/textures/flint_and_steel.png
+++ b/fake_fire/textures/flint_and_steel.png
--- a/fake_fire/textures/ice_fire_animated.png
+++ b/fake_fire/textures/ice_fire_animated.png
--- a/fake_fire/textures/smoke_particle.png
+++ b/fake_fire/textures/smoke_particle.png