Merge remote-tracking branch 'upstream/master'

2020-07-31 22:12:35 +02:00 · 2020-07-31 22:12:35 +02:00 · 5a785b4d00
Parent 2ff60245a9 930edb43d2
--- a/textures/scaffolding_iron_scaffolding.png
+++ b/textures/scaffolding_iron_scaffolding.png
--- a/textures/scaffolding_iron_scaffolding_top.png
+++ b/textures/scaffolding_iron_scaffolding_top.png
--- a/textures/scaffolding_platform.png
+++ b/textures/scaffolding_platform.png
--- a/textures/scaffolding_reinforced.png
+++ b/textures/scaffolding_reinforced.png
--- a/textures/scaffolding_wooden_scaffolding.png
+++ b/textures/scaffolding_wooden_scaffolding.png
--- a/textures/scaffolding_wooden_scaffolding_top.png
+++ b/textures/scaffolding_wooden_scaffolding_top.png
--- a/textures/scaffolding_wrench.png
+++ b/textures/scaffolding_wrench.png