From c63df6d4f74391160781c63184115b77bbda3025 Mon Sep 17 00:00:00 2001 From: Bart Kuivenhoven Date: Sat, 12 Jun 2021 23:59:55 +0200 Subject: [PATCH 1/2] Apply a temporary fix to one of the dependencies It's a dirty little hack to do this in the Dockerfile, but for now this means the end of my yak shaving. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index f9a490b..65202c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,7 @@ COPY entrypoint.sh / ENV VISPY_GL_LIB /usr/lib/libGLESv2.so.2 ENV OSMESA_LIBRARY /usr/lib/libOSMesa.so.8 +# If this line starts failing, hopefully that means the dependency was fixed. That should be your cue to remove this line +RUN sed -i 's/from fractions import gcd/from math import gcd/' /usr/local/lib/python3.9/site-packages/vispy/geometry/torusknot.py + ENTRYPOINT ["/entrypoint.sh"] From 9ae5e3c40af671fec35689de1da82354391030da Mon Sep 17 00:00:00 2001 From: Bart Kuivenhoven Date: Mon, 14 Jun 2021 11:07:19 +0200 Subject: [PATCH 2/2] The block grass_path was renamed to block_path in 1.17 --- blockcrafter/blockstates.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blockcrafter/blockstates.properties b/blockcrafter/blockstates.properties index 036223c..bdecb41 100644 --- a/blockcrafter/blockstates.properties +++ b/blockcrafter/blockstates.properties @@ -50,12 +50,12 @@ minecraft:conduit is_waterloggable=true,disable_culling=true minecraft:farmland faulty_lighting=true minecraft:anvil faulty_lighting=true -minecraft:grass_path faulty_lighting=true +minecraft:dirt_path faulty_lighting=true minecraft:cocoa faulty_lighting=true minecraft:dragon_egg faulty_lighting=true minecraft:snow lighting_type=smooth_bottom -minecraft:grass_path lighting_type=smooth,shadow_edges=1 +minecraft:dirt_path lighting_type=smooth,shadow_edges=1 minecraft:water lighting_type=smooth,biome_type=simple,biome_colors=water minecraft:flowing_water lighting_type=smooth,biome_type=simple,biome_colors=water