Merge remote-tracking branch 'upstream/master'

Merged in adrido/scaffolding (pull request #1 )
Fixed "PNG warning: iCCP: known incorrect sRGB profile"
2020-07-31 22:12:35 +02:00 · 2020-07-27 13:42:40 +00:00 · 2020-07-25 14:31:02 +02:00
7 changed files with 0 additions and 0 deletions
--- 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
Author	SHA1	Message	Date
sys4	5a785b4d00	Merge remote-tracking branch 'upstream/master'	2020-07-31 22:12:35 +02:00
adrido	930edb43d2	Merged in adrido/scaffolding (pull request #1 ) Fixed "PNG warning: iCCP: known incorrect sRGB profile"	2020-07-27 13:42:40 +00:00
Adrian	0fb0cfea17	Fixed "PNG warning: iCCP: known incorrect sRGB profile"	2020-07-25 14:31:02 +02:00