From 5e235db2fc20d852c5f87c8fa5709165f467cfae Mon Sep 17 00:00:00 2001 From: zelophed Date: Wed, 15 Nov 2023 21:26:46 +0100 Subject: [PATCH] merge new changes to 1.20.1 --- gradle.properties | 4 ++-- .../infrastructure/ponder/scenes/CartAssemblerScenes.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c37d9e82..79813fa0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ jei_minecraft_version = 1.20.1 jei_version = 15.2.0.22 curios_minecraft_version = 1.20.1 curios_version = 5.2.0-beta.3 -catnip_version = 0.7.3 -ponder_version = 0.7.3 +catnip_version = 0.7.4 +ponder_version = 0.7.4 cc_tweaked_enable = true cc_tweaked_minecraft_version = 1.20.1 diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java index cd127c005..79dcb784c 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java @@ -11,11 +11,11 @@ import net.createmod.ponder.api.ParticleEmitter; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.EntityElement; +import net.createmod.ponder.api.element.MinecartElement; import net.createmod.ponder.api.element.WorldSectionElement; import net.createmod.ponder.api.scene.SceneBuilder; import net.createmod.ponder.api.scene.SceneBuildingUtil; import net.createmod.ponder.api.scene.Selection; -import net.createmod.ponder.foundation.element.MinecartElement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes;