Merge branch 'refs/heads/1.21' into 1.21-neo

# Conflicts: # src/main/java/dev/hephaestus/glowcase/Glowcase.java # src/main/java/dev/hephaestus/glowcase/compat/PolydexCompatibility.java
ModFest · Jul 26, 2024 · 96a39b3 · 96a39b3
2 parents 33bdfe1 + 924e7a3
commit 96a39b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...java/dev/hephaestus/glowcase/client/render/block/entity/HyperlinkBlockEntityRenderer.java b/...java/dev/hephaestus/glowcase/client/render/block/entity/HyperlinkBlockEntityRenderer.java
@@ -20,7 +20,7 @@
 public record HyperlinkBlockEntityRenderer(BlockEntityRendererFactory.Context context) implements BlockEntityRenderer<HyperlinkBlockEntity> {
 	private static final MinecraftClient mc = MinecraftClient.getInstance();
 
-	public static final ItemStack STACK = new ItemStack(Glowcase.HYPERLINK_BLOCK);
+	public static final ItemStack STACK = new ItemStack(Glowcase.HYPERLINK_BLOCK.get());
 
 	public void render(HyperlinkBlockEntity entity, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
 		Camera camera = context.getRenderDispatcher().camera;

diff --git a/src/main/resources/assets/glowcase/lang/en_us.json b/src/main/resources/assets/glowcase/lang/en_us.json
@@ -7,7 +7,7 @@
   "gui.glowcase.scale": "Scale: %d",
   "gui.glowcase.alignment": "Alignment: %s",
   "gui.glowcase.gives_item": "Gives Item: %s",
-  "gui.glowcase.shadow_type": "Shadow Type",
+  "gui.glowcase.shadow_type": "Shadow Type: %s",
   "gui.glowcase.rotation_type": "Rotation Type: %s",
   "gui.glowcase.show_name": "Show Name: %s",
   "gui.glowcase.offset": "Offset: %s",