Skip to content

Commit 1bcb16e

Browse files
committed
Merge branch '1.20.1/dev' into 1.21.1/dev
# Conflicts: # gradle.properties
2 parents 32218be + d30ead5 commit 1bcb16e

25 files changed

+4
-1863
lines changed

common/src/vanillin/java/dev/engine_room/vanillin/GlyphInstance.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/VanillaVisuals.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import dev.engine_room.vanillin.visuals.ItemVisual;
2424
import dev.engine_room.vanillin.visuals.MinecartVisual;
2525
import dev.engine_room.vanillin.visuals.ShulkerBoxVisual;
26-
import dev.engine_room.vanillin.visuals.SignVisual;
2726
import net.minecraft.client.model.geom.ModelLayerLocation;
2827
import net.minecraft.client.model.geom.ModelLayers;
2928
import net.minecraft.world.entity.Entity;
@@ -60,9 +59,6 @@ public static void init() {
6059
.factory(ShulkerBoxVisual::new)
6160
.apply(STABLE);
6261

63-
builder(BlockEntityType.SIGN).factory(SignVisual::new)
64-
.apply(EXPERIMENTAL);
65-
6662
builder(EntityType.BLOCK_DISPLAY).factory(BlockDisplayVisual::new)
6763
.apply(STABLE);
6864

common/src/vanillin/java/dev/engine_room/vanillin/VanillinInstanceTypes.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/BakedGlyphMixin.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/CodePointMapMixin.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontAccessor.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontSetAccessor.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontSetMixin.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

common/src/vanillin/java/dev/engine_room/vanillin/mixin/text/FontTexture$NodeAccessor.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)