diff --git a/changelog.txt b/changelog.txt index 46232a5cdc..830efc4f58 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ - Fallen logs can rarely spawn on water - Fallen logs can no longer spawn on ice and other non terrain blocks (added tag for them) - Fallen log decoration (moss and vines) are now biome temperature and humidify dependent. No more moss in snowy biomes +- Freestanding ladders will now break off the wall when you break the top block +- Matrix Enchanting Table appears in creative if automaticallyConvert is off +- Fixed Skull Pikes not functioning when there's a block on top, by lowering the detection point diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java b/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java index cbc00011a4..ee31dbc1bf 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/block/MatrixEnchantingTableBlock.java @@ -11,6 +11,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -47,6 +48,9 @@ public MatrixEnchantingTableBlock(ZetaModule module) { this.module = module; module.zeta.registry.registerBlock(this, "matrix_enchanter", true); + + if(!MatrixEnchantingModule.automaticallyConvert) + setCreativeTab(CreativeModeTabs.FUNCTIONAL_BLOCKS, Blocks.ENCHANTING_TABLE, false); } @NotNull diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java index d61f30ac9b..079f423125 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingPlusButton.java @@ -12,7 +12,7 @@ public class MatrixEnchantingPlusButton extends Button { public MatrixEnchantingPlusButton(int x, int y, OnPress onPress) { - super(new Button.Builder(Component.literal(""), onPress).size(50, 12).pos(x, y)); + super(Button.builder(Component.literal(""), onPress).size(50, 12).pos(x, y)); } @Override diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QButton.java b/src/main/java/org/violetmoon/quark/base/client/config/QButton.java index cb1c0e8088..884233c428 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QButton.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QButton.java @@ -92,7 +92,7 @@ private static void celebrate(String name, int day, int end, Month month, int ti private boolean showBubble; public QButton(int x, int y) { - super(new Button.Builder(Component.literal("q"), QButton::click).size(20, 20).pos(x, y)); + super(Button.builder(Component.literal("q"), QButton::click).size(20, 20).pos(x, y)); Calendar calendar = Calendar.getInstance(); int month = calendar.get(Calendar.MONTH) + 1; diff --git a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java index 0a73003a28..4e17d60ca5 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java @@ -22,7 +22,7 @@ public class SocialButton extends Button { private final int socialId; public SocialButton(int x, int y, Component text, int textColor, int socialId, OnPress onClick) { - super(new Button.Builder(Component.literal(""), onClick).size(20, 20).pos(x, y)); + super(Button.builder(Component.literal(""), onClick).size(20, 20).pos(x, y)); this.textColor = textColor; this.socialId = socialId; diff --git a/src/main/java/org/violetmoon/quark/base/config/definition/ConvulsionMatrixClientDefinition.java b/src/main/java/org/violetmoon/quark/base/config/definition/ConvulsionMatrixClientDefinition.java index 6dd786f2b1..1551c21948 100644 --- a/src/main/java/org/violetmoon/quark/base/config/definition/ConvulsionMatrixClientDefinition.java +++ b/src/main/java/org/violetmoon/quark/base/config/definition/ConvulsionMatrixClientDefinition.java @@ -103,7 +103,7 @@ protected void init() { for(Map.Entry entry : params.presetMap.entrySet()) { String name = entry.getKey(); double[] preset = entry.getValue(); - addRenderableWidget(new Button.Builder(Component.literal(name), __ -> setFromArray(preset)).size(w - p, 20).pos(x + (w * i), y + 115).build()); + addRenderableWidget(Button.builder(Component.literal(name), __ -> setFromArray(preset)).size(w - p, 20).pos(x + (w * i), y + 115).build()); i++; } diff --git a/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java b/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java index 121ee2089f..e3678cbc2f 100644 --- a/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java +++ b/src/main/java/org/violetmoon/quark/content/management/client/screen/widgets/MiniInventoryButton.java @@ -47,7 +47,7 @@ public MiniInventoryButton(AbstractContainerScreen parent, int spriteType, in } public MiniInventoryButton(AbstractContainerScreen parent, int spriteType, int x, int y, Supplier> tooltip, OnPress onPress) { - super(new Button.Builder(Component.literal(""), onPress).size(10, 10).pos(parent.getGuiLeft() + x, parent.getGuiTop() + y)); + super(Button.builder(Component.literal(""), onPress).size(10, 10).pos(parent.getGuiLeft() + x, parent.getGuiTop() + y)); this.parent = parent; this.spriteType = spriteType; this.tooltip = tooltip; diff --git a/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java b/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java index a1b4a48394..d91f2c4981 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java +++ b/src/main/java/org/violetmoon/quark/content/tools/entity/SkullPike.java @@ -52,7 +52,7 @@ public void tick() { } public boolean isVisible(Entity entityIn) { - Vec3 vector3d = new Vec3(getX(), getY() + 1, getZ()); + Vec3 vector3d = new Vec3(getX(), getEyeY(), getZ()); Vec3 vector3d1 = new Vec3(entityIn.getX(), entityIn.getEyeY(), entityIn.getZ()); return level().clip(new ClipContext(vector3d, vector3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java index f62a31aa13..f37ceb0166 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java @@ -4,7 +4,6 @@ import net.minecraft.client.player.Input; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -21,13 +20,13 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; @@ -64,10 +63,12 @@ public class EnhancedLaddersModule extends ZetaModule { @Config public static boolean allowInventorySneak = true; - private static boolean staticEnabled; + public static boolean staticEnabled; private static TagKey laddersTag; private static TagKey laddersBlockTag; + private static final DirectionProperty FACING = LadderBlock.FACING; + @LoadEvent public final void setup(ZCommonSetup event) { laddersTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "ladders")); @@ -106,35 +107,23 @@ public void addAdditionalHints(ZGatherHints event) { event.accept(item, comp); } - private static boolean canAttachTo(BlockState state, Block ladder, LevelReader world, BlockPos pos, Direction facing) { - if(ladder instanceof LadderBlock) { - if(allowFreestanding) - return canLadderSurvive(state, world, pos); - - BlockPos offset = pos.relative(facing); - BlockState blockstate = world.getBlockState(offset); - return !blockstate.isSignalSource() && blockstate.isFaceSturdy(world, offset, facing); - } + // see LadderBlockMixin + public static boolean canSurviveTweak(boolean vanillaSurvive, BlockState state, LevelReader world, BlockPos pos) { + //With the freestanding feature enabled, ladders can survive if they are supported by a block (vanillaSurvive), + //or if they are underneath a ladder on the same wall. + if(vanillaSurvive) + return true; - return false; - } - - // replaces ladder survives logic - public static boolean canLadderSurvive(BlockState state, LevelReader world, BlockPos pos) { - if(!staticEnabled || !allowFreestanding) + if(!staticEnabled || !allowFreestanding || !state.is(laddersBlockTag) || !state.hasProperty(FACING)) return false; - if(!state.is(laddersBlockTag))return false; - - Direction facing = state.getValue(LadderBlock.FACING); - Direction opposite = facing.getOpposite(); - BlockPos oppositePos = pos.relative(opposite); - BlockState oppositeState = world.getBlockState(oppositePos); - boolean solid = oppositeState.isFaceSturdy(world, oppositePos, facing) && !(oppositeState.getBlock() instanceof LadderBlock); - BlockState topState = world.getBlockState(pos.above()); - return solid || (topState.getBlock() instanceof LadderBlock && (facing.getAxis() == Axis.Y || topState.getValue(LadderBlock.FACING) == facing)); + BlockState aboveState = world.getBlockState(pos.above()); + return aboveState.is(laddersBlockTag) && aboveState.hasProperty(FACING) && aboveState.getValue(FACING) == state.getValue(FACING); } + public static boolean shouldDoUpdateShapeTweak(BlockState state) { + return staticEnabled && allowFreestanding && state.is(laddersBlockTag); + } @PlayEvent public void onInteract(ZRightClickBlock event) { @@ -164,8 +153,7 @@ public void onInteract(ZRightClickBlock event) { if(water || stateDown.isAir()) { BlockState copyState = world.getBlockState(pos); - Direction facing = copyState.getValue(LadderBlock.FACING); - if(canAttachTo(copyState, block, world, posDown, facing.getOpposite())) { + if(copyState.canSurvive(world, posDown)) { world.setBlockAndUpdate(posDown, copyState.setValue(BlockStateProperties.WATERLOGGED, water)); world.playSound(null, posDown.getX(), posDown.getY(), posDown.getZ(), SoundEvents.LADDER_PLACE, SoundSource.BLOCKS, 1F, 1F); diff --git a/src/main/java/org/violetmoon/quark/mixin/mixins/BlockBehaviourMixin.java b/src/main/java/org/violetmoon/quark/mixin/mixins/BlockBehaviourMixin.java new file mode 100644 index 0000000000..d8d74f902b --- /dev/null +++ b/src/main/java/org/violetmoon/quark/mixin/mixins/BlockBehaviourMixin.java @@ -0,0 +1,22 @@ +package org.violetmoon.quark.mixin.mixins; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Exists to be subclassed by LadderBlockMixin basically + */ +@Mixin(BlockBehaviour.class) +public class BlockBehaviourMixin { + @Inject(method = "tick", at = @At("HEAD")) + public void quark$tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSource pRandom, CallbackInfo ci) { + + } +} diff --git a/src/main/java/org/violetmoon/quark/mixin/mixins/LadderBlockMixin.java b/src/main/java/org/violetmoon/quark/mixin/mixins/LadderBlockMixin.java index 1b399f98d0..3bcabe5376 100644 --- a/src/main/java/org/violetmoon/quark/mixin/mixins/LadderBlockMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/mixins/LadderBlockMixin.java @@ -1,30 +1,55 @@ package org.violetmoon.quark.mixin.mixins; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; + import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - import org.violetmoon.quark.content.tweaks.module.EnhancedLaddersModule; @Mixin(LadderBlock.class) -public class LadderBlockMixin { - +public class LadderBlockMixin extends BlockBehaviourMixin { + @ModifyReturnValue(method = "canSurvive", at = @At("RETURN")) + private boolean canSurviveTweak(boolean original, BlockState state, LevelReader level, BlockPos pos) { + return EnhancedLaddersModule.canSurviveTweak(original, state, level, pos); + } - @Inject(method = "canSurvive", at = @At("HEAD"), cancellable = true) - private void canSurvive(BlockState state, LevelReader level, BlockPos pos, CallbackInfoReturnable callbackInfoReturnable) { - if(EnhancedLaddersModule.canLadderSurvive(state, level, pos)) { - callbackInfoReturnable.setReturnValue(true); - callbackInfoReturnable.cancel(); + /** + * In vanilla, the only way to break a ladder is to break the block behind it. So in updateShape, + * vanilla only does ladder canSurvive checks if the update came from behind. But with Quark's + * freestanding ladder feature, it's possible to break a ladder by breaking a block *above* it. + */ + @Inject(method = "updateShape", at = @At(value = "HEAD"), cancellable = true) + private void updateShapeTweak(BlockState pState, Direction pFacing, BlockState pFacingState, LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pFacingPos, CallbackInfoReturnable cir) { + if(EnhancedLaddersModule.shouldDoUpdateShapeTweak(pState) && pFacing == Direction.UP) { + //This is just for fun. Makes the ladders break like bamboo instead of instantly. + pLevel.scheduleTick(pCurrentPos, (LadderBlock) (Object) this, 1); + cir.setReturnValue(pState); } } + /** + * Override from BlockBehaviourMixin which does the actual injection + */ + @Override + public void quark$tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSource pRandom, CallbackInfo ci) { + if(EnhancedLaddersModule.shouldDoUpdateShapeTweak(pState) && !pState.canSurvive(pLevel, pPos)) { + pLevel.destroyBlock(pPos, true); + } + } } diff --git a/src/main/resources/assets/quark/lang/de_de.json b/src/main/resources/assets/quark/lang/de_de.json index 509c986c31..a86b42e8a8 100644 --- a/src/main/resources/assets/quark/lang/de_de.json +++ b/src/main/resources/assets/quark/lang/de_de.json @@ -922,14 +922,11 @@ "block.quark.lavender_blossom_sapling": "Ruheblütensetzling", "block.quark.orange_blossom_leaves": "Warmblütenlaub", "block.quark.orange_blossom_sapling": "Warmblütensetzling", - "block.quark.pink_blossom_leaves": "Süßblütenlaub", - "block.quark.pink_blossom_sapling": "Süßblütensetzling", "block.quark.yellow_blossom_leaves": "Sonnenblütenlaub", "block.quark.yellow_blossom_sapling": "Sonnenblütensetzling", "block.quark.red_blossom_leaves": "Feuerblütenlaub", "block.quark.red_blossom_sapling": "Feuerblütensetzling", "block.quark.yellow_blossom_leaf_carpet": "Sonnenblütenlaubteppich", - "block.quark.pink_blossom_leaf_carpet": "Süßblütenlaubteppich", "block.quark.orange_blossom_leaf_carpet": "Warmblütenlaubteppich", "block.quark.lavender_blossom_leaf_carpet": "Ruheblütenlaubteppich", "block.quark.blue_blossom_leaf_carpet": "Frostblütenlaubteppich", @@ -1144,7 +1141,6 @@ "block.quark.potted_nether_wart": "Eingetopfte Netherwarze", "block.quark.potted_orange_blossom_sapling": "Eingetopfter Warmblütensetzling", "block.quark.potted_peony": "Eingetopfte Pfingstrose", - "block.quark.potted_pink_blossom_sapling": "Eingetopfter Süßblütensetzling", "block.quark.potted_potato": "Eingetopfte Kartoffel", "block.quark.potted_pumpkin": "Eingetopfter Kürbis", "block.quark.potted_red_blossom_sapling": "Eingetopfter Feuerblütensetzling", diff --git a/src/main/resources/assets/quark/lang/en_gb.json b/src/main/resources/assets/quark/lang/en_gb.json index 308bfed212..bd76261923 100644 --- a/src/main/resources/assets/quark/lang/en_gb.json +++ b/src/main/resources/assets/quark/lang/en_gb.json @@ -851,12 +851,9 @@ "block.quark.lavender_blossom_sapling": "Serene Blossom Sapling", "block.quark.orange_blossom_leaves": "Warm Blossom Leaves", "block.quark.orange_blossom_sapling": "Warm Blossom Sapling", - "block.quark.pink_blossom_leaves": "Sweet Blossom Leaves", - "block.quark.pink_blossom_sapling": "Sweet Blossom Sapling", "block.quark.yellow_blossom_leaves": "Sunny Blossom Leaves", "block.quark.yellow_blossom_sapling": "Sunny Blossom Sapling", "block.quark.yellow_blossom_leaf_carpet": "Sunny Blossom Leaf Carpet", - "block.quark.pink_blossom_leaf_carpet": "Sweet Blossom Leaf Carpet", "block.quark.orange_blossom_leaf_carpet": "Warm Blossom Leaf Carpet", "block.quark.lavender_blossom_leaf_carpet": "Serene Blossom Leaf Carpet", "block.quark.blue_blossom_leaf_carpet": "Frosty Blossom Leaf Carpet", @@ -924,7 +921,6 @@ "block.quark.potted_nether_wart": "Potted Nether Wart", "block.quark.potted_orange_blossom_sapling": "Potted Warm Blossom Sapling", "block.quark.potted_peony": "Potted Peony", - "block.quark.potted_pink_blossom_sapling": "Potted Sweet Blossom Sapling", "block.quark.potted_potato": "Potted Potatoes", "block.quark.potted_pumpkin": "Potted Pumpkin", "block.quark.potted_rose": "Potted Rose", diff --git a/src/main/resources/assets/quark/lang/en_pt.json b/src/main/resources/assets/quark/lang/en_pt.json index ec8c8913e8..68ef335559 100644 --- a/src/main/resources/assets/quark/lang/en_pt.json +++ b/src/main/resources/assets/quark/lang/en_pt.json @@ -787,14 +787,11 @@ "block.quark.lavender_blossom_sapling": "Serene Blossom Sapling", "block.quark.orange_blossom_leaves": "Warm Blossom Leaves", "block.quark.orange_blossom_sapling": "Warm Blossom Sapling", - "block.quark.pink_blossom_leaves": "Sweet Blossom Leaves", - "block.quark.pink_blossom_sapling": "Sweet Blossom Sapling", "block.quark.yellow_blossom_leaves": "Sunny Blossom Leaves", "block.quark.yellow_blossom_sapling": "Sunny Blossom Sapling", "block.quark.red_blossom_leaves": "Fiery Blossom Leaves", "block.quark.red_blossom_sapling": "Fiery Blossom Sapling", "block.quark.yellow_blossom_leaf_carpet": "Sunny Blossom Leaf Carpet", - "block.quark.pink_blossom_leaf_carpet": "Sweet Blossom Leaf Carpet", "block.quark.orange_blossom_leaf_carpet": "Warm Blossom Leaf Carpet", "block.quark.lavender_blossom_leaf_carpet": "Serene Blossom Leaf Carpet", "block.quark.blue_blossom_leaf_carpet": "Frosty Blossom Leaf Carpet", @@ -932,7 +929,6 @@ "block.quark.blue_blossom_hedge": "Shrubbery o' Frosty Flowers", "block.quark.lavender_blossom_hedge": "Shrubbery o' Lavenderrrrr Flowers", "block.quark.orange_blossom_hedge": "Shrubbery o' Summer Flowers", - "block.quark.pink_blossom_hedge": "Shrubbery o' Hearty Flowers", "block.quark.yellow_blossom_hedge": "Shrubbery o' Sunny Flowers", "block.quark.red_blossom_hedge": "Shrubbery o' Flamin' Flowers", "block.quark.matrix_enchanter": "Jigsawin' Witchcraft Bench", @@ -1103,7 +1099,6 @@ "block.quark.potted_nether_wart": "Captive Wart", "block.quark.potted_orange_blossom_sapling": "Captive Summer meager shrub", "block.quark.potted_peony": "Captive Peony", - "block.quark.potted_pink_blossom_sapling": "Captive Hearty meager shrub", "block.quark.potted_potato": "Captive Potatoes", "block.quark.potted_pumpkin": "Captive Gourd", "block.quark.potted_red_blossom_sapling": "Captive Flamin' meager shrub", diff --git a/src/main/resources/assets/quark/lang/en_us.json b/src/main/resources/assets/quark/lang/en_us.json index 1e84184eb2..68bd0563b9 100644 --- a/src/main/resources/assets/quark/lang/en_us.json +++ b/src/main/resources/assets/quark/lang/en_us.json @@ -212,7 +212,6 @@ "quark.jei.hint.orange_blossom_sapling": "Can be found in savannas.", "quark.jei.hint.pathfinders_quill": "Can be used to find the biome inscribed in it. Trade for it from Cartographers or Wandering Traders.", "quark.jei.hint.permafrost": "Can be found towards the top of Frozen Peaks.", - "quark.jei.hint.pink_blossom_sapling": "Can be found in mountains.", "quark.jei.hint.ravager_hide": "Will drop from Ravagers in Raids.", "quark.jei.hint.red_blossom_sapling": "Can be found in badlands.", "quark.jei.hint.redstone_randomizer": "Randomly repeats the given signal either left or right.", @@ -291,7 +290,6 @@ "quark.jei.hint.minecraft.calcite": "Additional large calcite clusters are added to mountains.", "quark.jei.hint.minecraft.chain": "When connected to a block, if that block is moved by a piston, so will the Chain and anything else on the other end.", "quark.jei.hint.minecraft.emerald_block": "Can be used to make Villagers follow you much like how animals follow food items.", - "quark.jei.hint.minecraft.jukebox": "Use a Dispenser to place discs into the Jukebox to automatically play music.", "quark.jei.hint.minecraft.magma_cream": "A Slime that dies to Magma will split into Magma Cubes instead. Note that tiny Magma Cubes do not drop Magma Cream.", "quark.jei.hint.minecraft.poisonous_potato": "When fed to a baby animal, it has a chance of poisoning them. If the animal is poisoned, it'll never grow into an adult.", "quark.jei.hint.minecraft.scaffolding": "Right clicking the Scaffolding with any block will replace the furthermost piece of Scaffolding with the block. Sneak to use the normal placing.", @@ -1015,14 +1013,11 @@ "block.quark.lavender_blossom_sapling": "Serene Trumpet Sapling", "block.quark.orange_blossom_leaves": "Warm Trumpet Leaves", "block.quark.orange_blossom_sapling": "Warm Trumpet Sapling", - "block.quark.pink_blossom_leaves": "Sweet Trumpet Leaves", - "block.quark.pink_blossom_sapling": "Sweet Trumpet Sapling", "block.quark.yellow_blossom_leaves": "Sunny Trumpet Leaves", "block.quark.yellow_blossom_sapling": "Sunny Trumpet Sapling", "block.quark.red_blossom_leaves": "Fiery Trumpet Leaves", "block.quark.red_blossom_sapling": "Fiery Trumpet Sapling", "block.quark.yellow_blossom_leaf_carpet": "Sunny Trumpet Leaf Carpet", - "block.quark.pink_blossom_leaf_carpet": "Sweet Trumpet Leaf Carpet", "block.quark.orange_blossom_leaf_carpet": "Warm Trumpet Leaf Carpet", "block.quark.lavender_blossom_leaf_carpet": "Serene Trumpet Leaf Carpet", "block.quark.blue_blossom_leaf_carpet": "Frosty Trumpet Leaf Carpet", @@ -1160,7 +1155,6 @@ "block.quark.blue_blossom_hedge": "Frosty Trumpet Leaf Hedge", "block.quark.lavender_blossom_hedge": "Serene Trumpet Leaf Hedge", "block.quark.orange_blossom_hedge": "Warm Trumpet Leaf Hedge", - "block.quark.pink_blossom_hedge": "Sweet Trumpet Leaf Hedge", "block.quark.yellow_blossom_hedge": "Sunny Trumpet Leaf Hedge", "block.quark.red_blossom_hedge": "Fiery Trumpet Leaf Hedge", "block.quark.matrix_enchanter": "Matrix Enchanting Table", @@ -1432,7 +1426,6 @@ "block.quark.potted_nether_wart": "Potted Nether Wart", "block.quark.potted_orange_blossom_sapling": "Potted Warm Trumpet Sapling", "block.quark.potted_peony": "Potted Peony", - "block.quark.potted_pink_blossom_sapling": "Potted Sweet Trumpet Sapling", "block.quark.potted_potato": "Potted Potatoes", "block.quark.potted_pumpkin": "Potted Pumpkin", "block.quark.potted_red_blossom_sapling": "Potted Fiery Trumpet Sapling", diff --git a/src/main/resources/assets/quark/lang/es_ar.json b/src/main/resources/assets/quark/lang/es_ar.json index 83dff65632..8e22323d65 100644 --- a/src/main/resources/assets/quark/lang/es_ar.json +++ b/src/main/resources/assets/quark/lang/es_ar.json @@ -791,14 +791,11 @@ "block.quark.lavender_blossom_sapling": "Brote floral sereno", "block.quark.orange_blossom_leaves": "Hojas florales cálidas", "block.quark.orange_blossom_sapling": "Brote floral cálido", - "block.quark.pink_blossom_leaves": "Hojas florales dulces", - "block.quark.pink_blossom_sapling": "Brote floral dulce", "block.quark.yellow_blossom_leaves": "Hojas florales soleadas", "block.quark.yellow_blossom_sapling": "Brote floral soleado", "block.quark.red_blossom_leaves": "Hojas florales ardientes", "block.quark.red_blossom_sapling": "Brote floral ardiente", "block.quark.yellow_blossom_leaf_carpet": "Alfombra de hojas florales soleadas", - "block.quark.pink_blossom_leaf_carpet": "Alfombra de hojas florales dulces", "block.quark.orange_blossom_leaf_carpet": "Alfombra de hojas florales cálidas", "block.quark.lavender_blossom_leaf_carpet": "Alfombra de hojas florales serenas", "block.quark.blue_blossom_leaf_carpet": "Alfombra de hojas florales frías", @@ -937,7 +934,6 @@ "block.quark.blue_blossom_hedge": "Seto de hojas florales frías", "block.quark.lavender_blossom_hedge": "Seto de hojas florales serenas", "block.quark.orange_blossom_hedge": "Seto de hojas florales cálidas", - "block.quark.pink_blossom_hedge": "Seto de hojas florales dulces", "block.quark.yellow_blossom_hedge": "Seto de hojas florales soleadas", "block.quark.red_blossom_hedge": "Seto de hojas florales ardientes", "block.quark.matrix_enchanter": "Mesa de encantamientos matricial", @@ -1118,7 +1114,6 @@ "block.quark.potted_nether_wart": "Maceta con verruga del Nether", "block.quark.potted_orange_blossom_sapling": "Maceta con brote floral cálido", "block.quark.potted_peony": "Maceta con peonía", - "block.quark.potted_pink_blossom_sapling": "Maceta con brote floral dulce", "block.quark.potted_potato": "Maceta con papa", "block.quark.potted_pumpkin": "Maceta con zapallo", "block.quark.potted_red_blossom_sapling": "Maceta con brote floral ardiente", diff --git a/src/main/resources/assets/quark/lang/es_es.json b/src/main/resources/assets/quark/lang/es_es.json index 7460889395..5b02c3b06c 100644 --- a/src/main/resources/assets/quark/lang/es_es.json +++ b/src/main/resources/assets/quark/lang/es_es.json @@ -791,14 +791,11 @@ "block.quark.lavender_blossom_sapling": "Brote floral sereno", "block.quark.orange_blossom_leaves": "Hojas florales cálidas", "block.quark.orange_blossom_sapling": "Brote floral cálido", - "block.quark.pink_blossom_leaves": "Hojas florales dulces", - "block.quark.pink_blossom_sapling": "Brote floral dulce", "block.quark.yellow_blossom_leaves": "Hojas florales soleadas", "block.quark.yellow_blossom_sapling": "Brote floral soleado", "block.quark.red_blossom_leaves": "Hojas florales ardientes", "block.quark.red_blossom_sapling": "Brote floral ardiente", "block.quark.yellow_blossom_leaf_carpet": "Alfombra de hojas florales soleadas", - "block.quark.pink_blossom_leaf_carpet": "Alfombra de hojas florales dulces", "block.quark.orange_blossom_leaf_carpet": "Alfombra de hojas florales cálidas", "block.quark.lavender_blossom_leaf_carpet": "Alfombra de hojas florales serenas", "block.quark.blue_blossom_leaf_carpet": "Alfombra de hojas florales frías", @@ -937,7 +934,6 @@ "block.quark.blue_blossom_hedge": "Seto de hojas florales frías", "block.quark.lavender_blossom_hedge": "Seto de hojas florales serenas", "block.quark.orange_blossom_hedge": "Seto de hojas florales cálidas", - "block.quark.pink_blossom_hedge": "Seto de hojas florales dulces", "block.quark.yellow_blossom_hedge": "Seto de hojas florales soleadas", "block.quark.red_blossom_hedge": "Seto de hojas florales ardientes", "block.quark.matrix_enchanter": "Mesa de encantamientos matricial", @@ -1118,7 +1114,6 @@ "block.quark.potted_nether_wart": "Maceta con verruga del Nether", "block.quark.potted_orange_blossom_sapling": "Maceta con brote floral cálido", "block.quark.potted_peony": "Maceta con peonía", - "block.quark.potted_pink_blossom_sapling": "Maceta con brote floral dulce", "block.quark.potted_potato": "Maceta con patata", "block.quark.potted_pumpkin": "Maceta con calabaza", "block.quark.potted_red_blossom_sapling": "Maceta con brote floral ardiente", diff --git a/src/main/resources/assets/quark/lang/es_mx.json b/src/main/resources/assets/quark/lang/es_mx.json index bab0fd4335..2c08615cdf 100644 --- a/src/main/resources/assets/quark/lang/es_mx.json +++ b/src/main/resources/assets/quark/lang/es_mx.json @@ -791,14 +791,11 @@ "block.quark.lavender_blossom_sapling": "Retoño floral sereno", "block.quark.orange_blossom_leaves": "Hojas florales cálidas", "block.quark.orange_blossom_sapling": "Retoño floral cálido", - "block.quark.pink_blossom_leaves": "Hojas florales dulces", - "block.quark.pink_blossom_sapling": "Retoño floral dulce", "block.quark.yellow_blossom_leaves": "Hojas florales soleadas", "block.quark.yellow_blossom_sapling": "Retoño floral soleado", "block.quark.red_blossom_leaves": "Hojas florales ardientes", "block.quark.red_blossom_sapling": "Retoño floral ardiente", "block.quark.yellow_blossom_leaf_carpet": "Alfombra de hojas florales soleadas", - "block.quark.pink_blossom_leaf_carpet": "Alfombra de hojas florales dulces", "block.quark.orange_blossom_leaf_carpet": "Alfombra de hojas florales cálidas", "block.quark.lavender_blossom_leaf_carpet": "Alfombra de hojas florales serenas", "block.quark.blue_blossom_leaf_carpet": "Alfombra de hojas florales frías", @@ -937,7 +934,6 @@ "block.quark.blue_blossom_hedge": "Seto de hojas florales frías", "block.quark.lavender_blossom_hedge": "Seto de hojas florales serenas", "block.quark.orange_blossom_hedge": "Seto de hojas florales cálidas", - "block.quark.pink_blossom_hedge": "Seto de hojas florales dulces", "block.quark.yellow_blossom_hedge": "Seto de hojas florales soleadas", "block.quark.red_blossom_hedge": "Seto de hojas florales ardientes", "block.quark.matrix_enchanter": "Mesa de encantamientos matricial", @@ -1118,7 +1114,6 @@ "block.quark.potted_nether_wart": "Maceta con verruga del Nether", "block.quark.potted_orange_blossom_sapling": "Maceta con retoño floral cálido", "block.quark.potted_peony": "Maceta con peonía", - "block.quark.potted_pink_blossom_sapling": "Maceta con retoño floral dulce", "block.quark.potted_potato": "Maceta con papa", "block.quark.potted_pumpkin": "Maceta con calabaza", "block.quark.potted_red_blossom_sapling": "Maceta con retoño floral ardiente", diff --git a/src/main/resources/assets/quark/lang/fi_fi.json b/src/main/resources/assets/quark/lang/fi_fi.json index d52687ac16..a8bd920438 100644 --- a/src/main/resources/assets/quark/lang/fi_fi.json +++ b/src/main/resources/assets/quark/lang/fi_fi.json @@ -911,14 +911,11 @@ "block.quark.lavender_blossom_sapling": "Tyynikukkapuun taimi", "block.quark.orange_blossom_leaves": "Lämpökukkapuunlehdet", "block.quark.orange_blossom_sapling": "Lämpökukkapuun taimi", - "block.quark.pink_blossom_leaves": "Makeakukkapuunlehdet", - "block.quark.pink_blossom_sapling": "Makeakukkapuun taimi", "block.quark.yellow_blossom_leaves": "Paistekukkapuunlehdet", "block.quark.yellow_blossom_sapling": "Paistekukkapuun taimi", "block.quark.red_blossom_leaves": "Tulikukkapuunlehdet", "block.quark.red_blossom_sapling": "Tulikukkapuun taimi", "block.quark.yellow_blossom_leaf_carpet": "Paistekukkapuunlehtimatto", - "block.quark.pink_blossom_leaf_carpet": "Makeakukkapuunlehtimatto", "block.quark.orange_blossom_leaf_carpet": "Lämpökukkapuunlehtimatto", "block.quark.lavender_blossom_leaf_carpet": "Tyynikukkapuunlehtimatto", "block.quark.blue_blossom_leaf_carpet": "Huurrekukkapuunlehtimatto", @@ -1110,7 +1107,6 @@ "block.quark.potted_nether_wart": "Istutettu Nether-pahka", "block.quark.potted_orange_blossom_sapling": "Istutettu lämpökukkapuun taimi", "block.quark.potted_peony": "Istutettu pioni", - "block.quark.potted_pink_blossom_sapling": "Istutettu makeakukkapuun taimi", "block.quark.potted_potato": "Istutetut perunat", "block.quark.potted_pumpkin": "Istutettu kurpitsa", "block.quark.potted_red_blossom_sapling": "Istutettu tulikukkapuun taimi", diff --git a/src/main/resources/assets/quark/lang/fr_fr.json b/src/main/resources/assets/quark/lang/fr_fr.json index 86c8a8d966..6311cfb7b6 100644 --- a/src/main/resources/assets/quark/lang/fr_fr.json +++ b/src/main/resources/assets/quark/lang/fr_fr.json @@ -856,14 +856,11 @@ "block.quark.lavender_blossom_sapling": "Pousse de cerisier lavande", "block.quark.orange_blossom_leaves": "Feuilles de cerisier orange", "block.quark.orange_blossom_sapling": "Pousse de cerisier orange", - "block.quark.pink_blossom_leaves": "Feuilles de cerisier rose", - "block.quark.pink_blossom_sapling": "Pousse de cerisier rose", "block.quark.yellow_blossom_leaves": "Feuilles de cerisier doré", "block.quark.yellow_blossom_sapling": "Pousse de cerisier doré", "block.quark.red_blossom_leaves": "Feuilles de cerisier corail", "block.quark.red_blossom_sapling": "Pousse de cerisier corail", "block.quark.yellow_blossom_leaf_carpet": "Tapis en feuilles de cerisier doré", - "block.quark.pink_blossom_leaf_carpet": "Tapis en feuilles de cerisier rose", "block.quark.orange_blossom_leaf_carpet": "Tapis en feuilles de cerisier orange", "block.quark.lavender_blossom_leaf_carpet": "Tapis en feuilles de cerisier lavande", "block.quark.blue_blossom_leaf_carpet": "Tapis en feuilles de cerisier azur", @@ -1016,7 +1013,6 @@ "block.quark.blue_blossom_hedge": "Haie en cerisier azur", "block.quark.lavender_blossom_hedge": "Haie en cerisier lavande", "block.quark.orange_blossom_hedge": "Haie en cerisier orange", - "block.quark.pink_blossom_hedge": "Haie en cerisier rose", "block.quark.yellow_blossom_hedge": "Haie en cerisier doré", "block.quark.red_blossom_hedge": "Haie en cerisier corail", @@ -1285,7 +1281,6 @@ "block.quark.potted_nether_wart": "Verrues du Nether en pot", "block.quark.potted_orange_blossom_sapling": "Pousse de cerisier orange en pot", "block.quark.potted_peony": "Pivoine en pot", - "block.quark.potted_pink_blossom_sapling": "Pousse de cerisier rose en pot", "block.quark.potted_potato": "Pomme de terre en pot", "block.quark.potted_pumpkin": "Citrouille en pot", "block.quark.potted_red_blossom_sapling": "Pousse de cerisier corail en pot", diff --git a/src/main/resources/assets/quark/lang/hu_hu.json b/src/main/resources/assets/quark/lang/hu_hu.json index bf869870ed..1935be01dd 100644 --- a/src/main/resources/assets/quark/lang/hu_hu.json +++ b/src/main/resources/assets/quark/lang/hu_hu.json @@ -851,12 +851,9 @@ "block.quark.lavender_blossom_sapling": "Derűs Virágzócsemete", "block.quark.orange_blossom_leaves": "Meleg Virágzó Levelek", "block.quark.orange_blossom_sapling": "Meleg Virágzócsemete", - "block.quark.pink_blossom_leaves": "Édes Virágzó Levelek", - "block.quark.pink_blossom_sapling": "Édes Virágzócsemete", "block.quark.yellow_blossom_leaves": "Napos Virágzó Levelek", "block.quark.yellow_blossom_sapling": "Napos Virágzócsemete", "block.quark.yellow_blossom_leaf_carpet": "Napos Virágzó Levél Szőnyeg", - "block.quark.pink_blossom_leaf_carpet": "Édes Virágzó Levél Szőnyeg", "block.quark.orange_blossom_leaf_carpet": "Meleg Virágzó Levél Szőnyeg", "block.quark.lavender_blossom_leaf_carpet": "Derűs Virágzó Levél Szőnyeg", "block.quark.blue_blossom_leaf_carpet": "Fagyos Virágzó Levél Szőnyeg", @@ -924,7 +921,6 @@ "block.quark.potted_nether_wart": "Netherbibircsók Cserépben", "block.quark.potted_orange_blossom_sapling": "Meleg Virágzócsemete Cserépben", "block.quark.potted_peony": "Bazsarózsa Cserépben", - "block.quark.potted_pink_blossom_sapling": "Édes Virágzócsemete Cserépben", "block.quark.potted_potato": "Krumpli Cserépben", "block.quark.potted_pumpkin": "Tök Cserépben", "block.quark.potted_rose": "Rózsa Cserépben", diff --git a/src/main/resources/assets/quark/lang/it_it.json b/src/main/resources/assets/quark/lang/it_it.json index fd9124c643..89990c9478 100644 --- a/src/main/resources/assets/quark/lang/it_it.json +++ b/src/main/resources/assets/quark/lang/it_it.json @@ -815,14 +815,11 @@ "block.quark.lavender_blossom_sapling": "Arboscello di fiori sereni", "block.quark.orange_blossom_leaves": "Foglie di fiori caldi", "block.quark.orange_blossom_sapling": "Arboscello di fiori caldi", - "block.quark.pink_blossom_leaves": "Foglie di fiori dolci", - "block.quark.pink_blossom_sapling": "Arboscello di fiori dolci", "block.quark.yellow_blossom_leaves": "Foglie di fiori del sole", "block.quark.yellow_blossom_sapling": "Arboscello di fiori del sole", "block.quark.red_blossom_leaves": "Foglie di fiori ardenti", "block.quark.red_blossom_sapling": "Arboscello di fiori ardenti", "block.quark.yellow_blossom_leaf_carpet": "Tappeto di foglie di fiori del sole", - "block.quark.pink_blossom_leaf_carpet": "Tappeto di foglie di fiori dolci", "block.quark.orange_blossom_leaf_carpet": "Tappeto di foglie di fiori caldi", "block.quark.lavender_blossom_leaf_carpet": "Tappeto di foglie di fiori sereni", "block.quark.blue_blossom_leaf_carpet": "Tappeto di foglie di fiori gelidi", @@ -960,7 +957,6 @@ "block.quark.blue_blossom_hedge": "Siepe di foglie di fiori gelidi", "block.quark.lavender_blossom_hedge": "Siepe di foglie di fiori sereni", "block.quark.orange_blossom_hedge": "Siepe di foglie di fiori caldi", - "block.quark.pink_blossom_hedge": "Siepe di foglie di fiori dolci", "block.quark.yellow_blossom_hedge": "Siepe di foglie di fiori del sole", "block.quark.red_blossom_hedge": "Siepe di foglie di fiori ardenti", "block.quark.matrix_enchanter": "Tavolo per incantesimi matrix", @@ -1212,7 +1208,6 @@ "block.quark.potted_nether_wart": "Vaso con verrucca del Nether", "block.quark.potted_orange_blossom_sapling": "Vaso con arboscello di fiori caldi", "block.quark.potted_peony": "Vaso con peonia", - "block.quark.potted_pink_blossom_sapling": "Vaso con arboscello di fiori dolci", "block.quark.potted_potato": "Vaso con patate", "block.quark.potted_pumpkin": "Vaso con zucca", "block.quark.potted_red_blossom_sapling": "Vaso con arboscello di fiori ardenti", diff --git a/src/main/resources/assets/quark/lang/ja_jp.json b/src/main/resources/assets/quark/lang/ja_jp.json index 2f0f855f48..b07e130e40 100644 --- a/src/main/resources/assets/quark/lang/ja_jp.json +++ b/src/main/resources/assets/quark/lang/ja_jp.json @@ -211,7 +211,6 @@ "quark.jei.hint.orange_blossom_sapling": "サバンナで見つかります。", "quark.jei.hint.pathfinders_quill": "バイオームを見つけるために使用します。製図家や行商人との取引で入手することができます。", "quark.jei.hint.permafrost": "凍った山頂で見つかります。", - "quark.jei.hint.pink_blossom_sapling": "山で見つかります。", "quark.jei.hint.ravager_hide": "襲撃で出現するラヴェジャーがドロップします。", "quark.jei.hint.red_blossom_sapling": "荒野で見つかります。", "quark.jei.hint.redstone_randomizer": "入力された信号を左か右にランダムで伝えます。", @@ -290,7 +289,6 @@ "quark.jei.hint.minecraft.calcite": "山に方解石の大きな塊として追加されます。", "quark.jei.hint.minecraft.chain": "ブロックに接続され、そのブロックがピストンによって動かされた場合、鎖と接続されたブロックを動かすことができます。", "quark.jei.hint.minecraft.emerald_block": "動物が食べ物に追従するように、村人を追従させることができます。", - "quark.jei.hint.minecraft.jukebox": "ディスペンサーを使用してレコードをジュークボックスに入れると、自動的に音楽が再生されます。", "quark.jei.hint.minecraft.magma_cream": "溶岩によって死んだスライムはマグマキューブに分裂します。ただし、小さなマグマキューブはマグマクリームをドロップしません。", "quark.jei.hint.minecraft.poisonous_potato": "子どもの動物に与えると、毒にする可能性があります。毒になった動物は、決して大人に成長しません。", "quark.jei.hint.minecraft.scaffolding": "任意のブロックで足場を右クリックすると、最も遠い足場がそのブロックで置き換えられます。通常の配置にはスニークが必要です。", @@ -1015,14 +1013,11 @@ "block.quark.lavender_blossom_sapling": "穏イペの苗木", "block.quark.orange_blossom_leaves": "暖イペの葉", "block.quark.orange_blossom_sapling": "暖イペの苗木", - "block.quark.pink_blossom_leaves": "甘イペの葉", - "block.quark.pink_blossom_sapling": "甘イペの苗木", "block.quark.yellow_blossom_leaves": "陽イペの葉", "block.quark.yellow_blossom_sapling": "陽イペの苗木", "block.quark.red_blossom_leaves": "燃イペの葉", "block.quark.red_blossom_sapling": "燃イペの苗木", "block.quark.yellow_blossom_leaf_carpet": "陽イペの葉のカーペット", - "block.quark.pink_blossom_leaf_carpet": "甘イペの葉のカーペット", "block.quark.orange_blossom_leaf_carpet": "暖イペの葉のカーペット", "block.quark.lavender_blossom_leaf_carpet": "穏イペの葉のカーペット", "block.quark.blue_blossom_leaf_carpet": "霜イペの葉のカーペット", @@ -1160,7 +1155,6 @@ "block.quark.blue_blossom_hedge": "霜イペの葉の生垣", "block.quark.lavender_blossom_hedge": "穏イペの葉の生垣", "block.quark.orange_blossom_hedge": "暖イペの葉の生垣", - "block.quark.pink_blossom_hedge": "甘イペの葉の生垣", "block.quark.yellow_blossom_hedge": "陽イペの葉の生垣", "block.quark.red_blossom_hedge": "燃イペの葉の生垣", "block.quark.matrix_enchanter": "マトリックスエンチャントテーブル", @@ -1433,7 +1427,6 @@ "block.quark.potted_nether_wart": "植えられたネザーウォート", "block.quark.potted_orange_blossom_sapling": "植えられた暖イペの苗木", "block.quark.potted_peony": "植えられたボタン", - "block.quark.potted_pink_blossom_sapling": "植えられた甘イペの苗木", "block.quark.potted_potato": "植えられたジャガイモ", "block.quark.potted_pumpkin": "植えられたカボチャ", "block.quark.potted_red_blossom_sapling": "植えられた燃イペの苗木", diff --git a/src/main/resources/assets/quark/lang/ko_kr.json b/src/main/resources/assets/quark/lang/ko_kr.json index 00cd0e2bdb..07880d575c 100644 --- a/src/main/resources/assets/quark/lang/ko_kr.json +++ b/src/main/resources/assets/quark/lang/ko_kr.json @@ -741,14 +741,11 @@ "block.quark.lavender_blossom_sapling": "청명꽃 참나무 묘목", "block.quark.orange_blossom_leaves": "온기꽃 참나무 잎", "block.quark.orange_blossom_sapling": "온기꽃 참나무 묘목", - "block.quark.pink_blossom_leaves": "향기꽃 참나무 잎", - "block.quark.pink_blossom_sapling": "향기꽃 참나무 묘목", "block.quark.yellow_blossom_leaves": "화창꽃 참나무 잎", "block.quark.yellow_blossom_sapling": "화창꽃 참나무 묘목", "block.quark.red_blossom_leaves": "불꽃 참나무 잎", "block.quark.red_blossom_sapling": "불꽃 참나무 묘목", "block.quark.yellow_blossom_leaf_carpet": "화창꽃 참나무 잎 카펫", - "block.quark.pink_blossom_leaf_carpet": "향기꽃 참나무 잎 카펫", "block.quark.orange_blossom_leaf_carpet": "온기꽃 참나무 잎 카펫", "block.quark.lavender_blossom_leaf_carpet": "청명꽃 참나무 잎 카펫", "block.quark.blue_blossom_leaf_carpet": "서리꽃 참나무 잎 카펫", @@ -886,7 +883,6 @@ "block.quark.blue_blossom_hedge": "서리꽃 참나무 잎 산울타리", "block.quark.lavender_blossom_hedge": "청명꽃 참나무 잎 산울타리", "block.quark.orange_blossom_hedge": "온기꽃 참나무 잎 산울타리", - "block.quark.pink_blossom_hedge": "향기꽃 참나무 잎 산울타리", "block.quark.yellow_blossom_hedge": "화창꽃 참나무 잎 산울타리", "block.quark.red_blossom_hedge": "불꽃 참나무 잎 산울타리", "block.quark.matrix_enchanter": "매트릭스 마법 부여대", @@ -1000,7 +996,6 @@ "block.quark.potted_nether_wart": "화분에 심은 네더 사마귀", "block.quark.potted_orange_blossom_sapling": "화분에 심은 온기꽃 참나무 묘목", "block.quark.potted_peony": "화분에 심은 모란", - "block.quark.potted_pink_blossom_sapling": "화분에 심은 향기꽃 참나무 묘목", "block.quark.potted_potato": "화분에 심은 감자", "block.quark.potted_pumpkin": "화분에 심은 호박", "block.quark.potted_red_blossom_sapling": "화분에 심은 불꽃 참나무 묘목", diff --git a/src/main/resources/assets/quark/lang/pl_pl.json b/src/main/resources/assets/quark/lang/pl_pl.json index 9206749401..217ca04dc4 100644 --- a/src/main/resources/assets/quark/lang/pl_pl.json +++ b/src/main/resources/assets/quark/lang/pl_pl.json @@ -812,15 +812,12 @@ "block.quark.lavender_blossom_sapling": "Spokojna kwitnąca sadzonka", "block.quark.orange_blossom_leaves": "Ciepłe kwitnące liście", "block.quark.orange_blossom_sapling": "Ciepła kwitnąca sadzonka", - "block.quark.pink_blossom_leaves": "Słodkie kwitnące liście", - "block.quark.pink_blossom_sapling": "Słodka kwitnąca sadzonka", "block.quark.yellow_blossom_leaves": "Słoneczne kwitnące liście", "block.quark.yellow_blossom_sapling": "Słoneczna kwitnąca sadzonka", "block.quark.red_blossom_leaves": "Ogniste kwitnące liście", "block.quark.red_blossom_sapling": "Ognista kwitnąca sadzonka", "block.quark.red_blossom_leaf_carpet": "Warstwa ognistych kwitnących liści", "block.quark.yellow_blossom_leaf_carpet": "Warstwa słonecznych kwitnących liści", - "block.quark.pink_blossom_leaf_carpet": "Warstwa słodkich kwitnących liści", "block.quark.orange_blossom_leaf_carpet": "Warstwa ciepłych kwitnących liści", "block.quark.lavender_blossom_leaf_carpet": "Warstwa spokojnych kwitnących liści", "block.quark.blue_blossom_leaf_carpet": "Warstwa mroźnych kwitnących liści", @@ -958,7 +955,6 @@ "block.quark.blue_blossom_hedge": "Mroźny kwitnący żywopłot", "block.quark.lavender_blossom_hedge": "Spokojny kwitnący żywopłot", "block.quark.orange_blossom_hedge": "Ciepły kwitnący żywopłot", - "block.quark.pink_blossom_hedge": "Słodki kwitnący żywopłot", "block.quark.yellow_blossom_hedge": "Słoneczny kwitnący żywopłot", "block.quark.red_blossom_hedge": "Ognisty kwitnący żywopłot", "block.quark.matrix_enchanter": "Matrycowy stół do zaklinania", @@ -1210,7 +1206,6 @@ "block.quark.potted_nether_wart": "Netherowa brodawka w doniczce", "block.quark.potted_orange_blossom_sapling": "Ciepła kwitnąca sadzonka w doniczce", "block.quark.potted_peony": "Piwonia w doniczce", - "block.quark.potted_pink_blossom_sapling": "Słodka kwitnąca sadzonka w doniczce", "block.quark.potted_potato": "Ziemniak w doniczce", "block.quark.potted_pumpkin": "Dynia w doniczce", "block.quark.potted_red_blossom_sapling": "Ognista kwitnąca sadzonka w doniczce", diff --git a/src/main/resources/assets/quark/lang/pt_br.json b/src/main/resources/assets/quark/lang/pt_br.json index dc5af3a976..0ce37f61c3 100644 --- a/src/main/resources/assets/quark/lang/pt_br.json +++ b/src/main/resources/assets/quark/lang/pt_br.json @@ -815,14 +815,11 @@ "block.quark.lavender_blossom_sapling": "Muda de florida-serena", "block.quark.orange_blossom_leaves": "Folhas de florida-morna", "block.quark.orange_blossom_sapling": "Muda de florida-morna", - "block.quark.pink_blossom_leaves": "Folhas de florida-doce", - "block.quark.pink_blossom_sapling": "Muda de florida-doce", "block.quark.yellow_blossom_leaves": "Folhas de florida-ensolarada", "block.quark.yellow_blossom_sapling": "Muda de florida-ensolarada", "block.quark.red_blossom_leaves": "Folhas de florida-flamejante", "block.quark.red_blossom_sapling": "Muda de florida-flamejante", "block.quark.yellow_blossom_leaf_carpet": "Tapete de folhas de florida-ensolarada", - "block.quark.pink_blossom_leaf_carpet": "Tapete de folhas de florida-doce", "block.quark.orange_blossom_leaf_carpet": "Tapete de folhas de florida-morna", "block.quark.lavender_blossom_leaf_carpet": "Tapete de folhas de florida-serena", "block.quark.blue_blossom_leaf_carpet": "Tapete de folhas de florida-gelada", @@ -960,7 +957,6 @@ "block.quark.blue_blossom_hedge": "Cerca viva de florida-gelada", "block.quark.lavender_blossom_hedge": "Cerca viva de florida-serena", "block.quark.orange_blossom_hedge": "Cerca viva de florida-morna", - "block.quark.pink_blossom_hedge": "Cerca viva de florida-doce", "block.quark.yellow_blossom_hedge": "Cerca viva de florida-ensolarada", "block.quark.red_blossom_hedge": "Cerca viva de florida-flamejante", "block.quark.matrix_enchanter": "Mesa de encantamentos matrix", @@ -1212,7 +1208,6 @@ "block.quark.potted_nether_wart": "Fungo do Nether envasado", "block.quark.potted_orange_blossom_sapling": "Muda de florida-morna envasada", "block.quark.potted_peony": "Peônia envasada", - "block.quark.potted_pink_blossom_sapling": "Muda de florida-doce envasada", "block.quark.potted_potato": "Batatas envasadas", "block.quark.potted_pumpkin": "Abóbora envasada", "block.quark.potted_red_blossom_sapling": "Muda de florida-flamejante envasada", diff --git a/src/main/resources/assets/quark/lang/pt_pt.json b/src/main/resources/assets/quark/lang/pt_pt.json index e0bd0e1c24..7ff58c79c9 100644 --- a/src/main/resources/assets/quark/lang/pt_pt.json +++ b/src/main/resources/assets/quark/lang/pt_pt.json @@ -211,7 +211,6 @@ "quark.jei.hint.orange_blossom_sapling": "Pode ser encontrado em savanas.", "quark.jei.hint.pathfinders_quill": "Pode ser usado para encontrar o bioma nele inscrito. Troca-o com cartógrafos ou vendedores ambulantes.", "quark.jei.hint.permafrost": "Pode ser encontrado no topo de picos congelados.", - "quark.jei.hint.pink_blossom_sapling": "Poder ser encontrado em montanhas.", "quark.jei.hint.ravager_hide": "Cai de devastadores em invasões.", "quark.jei.hint.red_blossom_sapling": "Poder ser encontrado nas terras áridas.", "quark.jei.hint.redstone_randomizer": "Repete aleatoriamente o sinal dado para a esquerda ou para a direita.", @@ -289,7 +288,6 @@ "quark.jei.hint.minecraft.calcite": "Outros grandes aglomerados de calcite são adicionados às montanhas.", "quark.jei.hint.minecraft.chain": "Quando ligado a um bloco, se esse bloco for movido por um pistão, o mesmo acontecerá com a corrente e qualquer outra coisa na outra extremidade.", "quark.jei.hint.minecraft.emerald_block": "Pode ser utilizado para fazer com que os aldeões o/a sigam, tal como os animais seguem os alimentos.", - "quark.jei.hint.minecraft.jukebox": "Utilize um dispensador para colocar discos na jukebox para reproduzir música automaticamente.", "quark.jei.hint.minecraft.magma_cream": "Um slime que morra com magma vai dividir-se em cubos de magma. Nota que os cubos de magma pequenos não deixam cair creme de magma.", "quark.jei.hint.minecraft.poisonous_potato": "Quando se dá de comer a um animal bebé, há a possibilidade de o envenenar. Se o animal for envenenado, nunca se tornará num adulto.", "quark.jei.hint.minecraft.scaffolding": "Clicar com o botão direito do rato no andaime com qualquer bloco substitui a peça de andaime mais afastada pelo bloco. Esgueira-se para usar a colocação normal.", @@ -999,14 +997,11 @@ "block.quark.lavender_blossom_sapling": "Rebento de flórida-serena", "block.quark.orange_blossom_leaves": "Folhas de flórida-morna", "block.quark.orange_blossom_sapling": "Rebento de flórida-morna", - "block.quark.pink_blossom_leaves": "Folhas de flórida-doce", - "block.quark.pink_blossom_sapling": "Rebento de flórida-doce", "block.quark.yellow_blossom_leaves": "Folhas de flórida-ensolarada", "block.quark.yellow_blossom_sapling": "Rebento de flórida-ensolarada", "block.quark.red_blossom_leaves": "Folhas de flórida-flamejante", "block.quark.red_blossom_sapling": "Rebento de flórida-flamejante", "block.quark.yellow_blossom_leaf_carpet": "Tapete de folhas de flórida-ensolarada", - "block.quark.pink_blossom_leaf_carpet": "Tapete de folhas de flórida-doce", "block.quark.orange_blossom_leaf_carpet": "Tapete de folhas de flórida-morna", "block.quark.lavender_blossom_leaf_carpet": "Tapete de folhas de flórida-serena", "block.quark.blue_blossom_leaf_carpet": "Tapete de folhas de flórida-gelada", @@ -1144,7 +1139,6 @@ "block.quark.blue_blossom_hedge": "Sebe de flórida-gelada", "block.quark.lavender_blossom_hedge": "Sebe de flórida-serena", "block.quark.orange_blossom_hedge": "Sebe de flórida-morna", - "block.quark.pink_blossom_hedge": "Sebe de flórida-doce", "block.quark.yellow_blossom_hedge": "Sebe de flórida-ensolarada", "block.quark.red_blossom_hedge": "Sebe de flórida-flamejante", "block.quark.matrix_enchanter": "Mesa de encantamentos matrix", @@ -1406,7 +1400,6 @@ "block.quark.potted_nether_wart": "Fungos do Nether em vaso", "block.quark.potted_orange_blossom_sapling": "Rebento de flórida-morna em vaso", "block.quark.potted_peony": "Peónia em vaso", - "block.quark.potted_pink_blossom_sapling": "Rebento de flórida-doce em vaso", "block.quark.potted_potato": "Batatas em vaso", "block.quark.potted_pumpkin": "Abóbora em vaso", "block.quark.potted_red_blossom_sapling": "Rebento de flórida-flamejante em vaso", diff --git a/src/main/resources/assets/quark/lang/ru_ru.json b/src/main/resources/assets/quark/lang/ru_ru.json index 7e58f5b4ed..74fd594700 100644 --- a/src/main/resources/assets/quark/lang/ru_ru.json +++ b/src/main/resources/assets/quark/lang/ru_ru.json @@ -772,14 +772,11 @@ "block.quark.lavender_blossom_sapling": "Саженец безмятежного цветущего дерева", "block.quark.orange_blossom_leaves": "Теплые цветущие листья", "block.quark.orange_blossom_sapling": "Саженец теплого цветущего дерева", - "block.quark.pink_blossom_leaves": "Сладкие цветущие листья", - "block.quark.pink_blossom_sapling": "Саженец сладкого цветущего дерева", "block.quark.yellow_blossom_leaves": "Солнечные цветущие листья", "block.quark.yellow_blossom_sapling": "Саженец солнечного цветущего дерева", "block.quark.red_blossom_leaves": "Огненные цветущие листья", "block.quark.red_blossom_sapling": "Саженец огненного цветущего дерева", "block.quark.yellow_blossom_leaf_carpet": "Ковёр из солнечных цветущих листьев", - "block.quark.pink_blossom_leaf_carpet": "Ковёр из сладких цветущих листьев", "block.quark.orange_blossom_leaf_carpet": "Ковёр из теплых цветущих листьев", "block.quark.lavender_blossom_leaf_carpet": "Ковёр из безмятежных цветущих листьев", "block.quark.blue_blossom_leaf_carpet": "Ковёр из морозных цветущих листьев", @@ -917,7 +914,6 @@ "block.quark.blue_blossom_hedge": "Живая изгородь из морозных цветущих листьев", "block.quark.lavender_blossom_hedge": "Живая изгородь из безмятежных цветущих листьев", "block.quark.orange_blossom_hedge": "Живая изгородь из тёплых цветущих листьев", - "block.quark.pink_blossom_hedge": "Живая изгородь из сладких цветущих листьев", "block.quark.yellow_blossom_hedge": "Живая изгородь из солнечных цветущих листьев", "block.quark.red_blossom_hedge": "Живая изгородь из огненных цветущих листьев", "block.quark.matrix_enchanter": "Матричный стол зачаровывания", @@ -1167,7 +1163,6 @@ "block.quark.potted_nether_wart": "Нарост из Незера в горшке", "block.quark.potted_orange_blossom_sapling": "Саженец теплого цветущего дерева в горшке", "block.quark.potted_peony": "Пион в горшке", - "block.quark.potted_pink_blossom_sapling": "Саженец сладкого цветущего дерева в горшке", "block.quark.potted_potato": "Картофель в горшке", "block.quark.potted_pumpkin": "Тыква в горшке", "block.quark.potted_red_blossom_sapling": "Саженец огненного цветущего дерева в горшке", diff --git a/src/main/resources/assets/quark/lang/sv_se.json b/src/main/resources/assets/quark/lang/sv_se.json index 662f44c894..576ce1c24a 100644 --- a/src/main/resources/assets/quark/lang/sv_se.json +++ b/src/main/resources/assets/quark/lang/sv_se.json @@ -212,7 +212,6 @@ "quark.jei.hint.orange_blossom_sapling": "Kan hittas i savanner.", "quark.jei.hint.pathfinders_quill": "Kan användas för att hitta biomen som har inristats på den. Byteshandla fram den med kartografer eller vandrande byteshandlare.", "quark.jei.hint.permafrost": "Kan hittas vid toppen på isiga bergstoppar.", - "quark.jei.hint.pink_blossom_sapling": "Kan hittas i bergen.", "quark.jei.hint.ravager_hide": "Fås från ödeläggare under räder.", "quark.jei.hint.red_blossom_sapling": "Kan hittas i stenöken.", "quark.jei.hint.redstone_randomizer": "Upprepar slumpartat den angivna signalen åt antingen vänster eller höger.", @@ -292,7 +291,6 @@ "quark.jei.hint.minecraft.calcite": "Ytterligare stora kalcitkluster finns i bergen.", "quark.jei.hint.minecraft.chain": "När den ansluter sig till ett block följer kedjan och allting annat på andra änden med om detta block flyttas av en kolv.", "quark.jei.hint.minecraft.emerald_block": "Kan användas för att få bybor att följa efter dig på ett liknande sätt som djur gör med matföremål.", - "quark.jei.hint.minecraft.jukebox": "Använd en automat för att placera skivor i jukeboxen och spela upp musik automatiskt.", "quark.jei.hint.minecraft.magma_cream": "En slemkub som dör på magmablock förvandlas till magmakuber istället. Observera att små magmakuber inte avger någon magmakräm.", "quark.jei.hint.minecraft.poisonous_potato": "När man matar en sådan till en djurbaby finns en chans att det förgiftas. Om djuret förgiftas kommer de aldrig bli vuxet.", "quark.jei.hint.minecraft.scaffolding": "När man högerklickar på en byggnadsställning med ett block ersätts byggnadsställningen längst bort med detta block. Smyg för att placera som vanligt.", @@ -1007,14 +1005,11 @@ "block.quark.lavender_blossom_sapling": "Lugnande blomsterplanta", "block.quark.orange_blossom_leaves": "Varma blomsterlöv", "block.quark.orange_blossom_sapling": "Varm blomsterplanta", - "block.quark.pink_blossom_leaves": "Söta blomsterlöv", - "block.quark.pink_blossom_sapling": "Söt blomsterplanta", "block.quark.yellow_blossom_leaves": "Soliga blomsterlöv", "block.quark.yellow_blossom_sapling": "Solig blomsterplanta", "block.quark.red_blossom_leaves": "Eldiga blomsterlöv", "block.quark.red_blossom_sapling": "Eldig blomsterplanta", "block.quark.yellow_blossom_leaf_carpet": "Solig blomsterlövsmatta", - "block.quark.pink_blossom_leaf_carpet": "Söt blomsterlövsmatta", "block.quark.orange_blossom_leaf_carpet": "Varm blomsterlövsmatta", "block.quark.lavender_blossom_leaf_carpet": "Lugnande blomsterlövsmatta", "block.quark.blue_blossom_leaf_carpet": "Frostig blomsterlövsmatta", @@ -1152,7 +1147,6 @@ "block.quark.blue_blossom_hedge": "Frostig blomsterlövshäck", "block.quark.lavender_blossom_hedge": "Lugnande blomsterlövshäck", "block.quark.orange_blossom_hedge": "Varm blomsterlövshäck", - "block.quark.pink_blossom_hedge": "Söt blomsterlövshäck", "block.quark.yellow_blossom_hedge": "Solig blomsterlövshäck", "block.quark.red_blossom_hedge": "Eldig blomsterlövshäck", "block.quark.matrix_enchanter": "Matrisförtrollningsbord", @@ -1414,7 +1408,6 @@ "block.quark.potted_nether_wart": "Nethervårta i kruka", "block.quark.potted_orange_blossom_sapling": "Varm blomsterplanta i kruka", "block.quark.potted_peony": "Pion i kruka", - "block.quark.potted_pink_blossom_sapling": "Söt blomsterplanta i kruka", "block.quark.potted_potato": "Potatisar i kruka", "block.quark.potted_pumpkin": "Pumpa i kruka", "block.quark.potted_red_blossom_sapling": "Eldig blomsterplanta i kruka", diff --git a/src/main/resources/assets/quark/lang/tok.json b/src/main/resources/assets/quark/lang/tok.json index 12dff0c61a..869a0395f9 100644 --- a/src/main/resources/assets/quark/lang/tok.json +++ b/src/main/resources/assets/quark/lang/tok.json @@ -289,7 +289,6 @@ "quark.jei.hint.minecraft.calcite": "kulupu suli namako pi kiwen walo ko li lon nena sewi.", "quark.jei.hint.minecraft.chain": "When connected to a block, if that block is moved by a piston, so will the Chain and anything else on the other end.", "quark.jei.hint.minecraft.emerald_block": "sina jo e ni la, jan tomo li tawa sina sama soweli.", - "quark.jei.hint.minecraft.jukebox": "poki pana wawa li ken pana e sike kalama lon ilo pi kalama musi. ni la, ilo li kalama musi.", "quark.jei.hint.minecraft.magma_cream": "kiwen seli li moli e monsuta ko la, kipisi ona li kama monsuta ko seli. (o sona e ni: monsuta ko seli lili li pana ala e ko monsuta seli a!)", "quark.jei.hint.minecraft.poisonous_potato": "soweli lili li moku e ni la, ni li ken pakala e sijelo ona. sijelo ona li pakala la, ona li kama ala suli.", "quark.jei.hint.minecraft.scaffolding": "jan li jo e leko lon luka, li nena nanpa tu pi ilo luka e supa palisa la, supa palisa weka li kama leko ni. jan li anpa lili la, nasin pi pana leko li nasa ala.", diff --git a/src/main/resources/assets/quark/lang/uk_ua.json b/src/main/resources/assets/quark/lang/uk_ua.json index cfa8db7bd8..0313dfa72e 100644 --- a/src/main/resources/assets/quark/lang/uk_ua.json +++ b/src/main/resources/assets/quark/lang/uk_ua.json @@ -803,14 +803,11 @@ "block.quark.lavender_blossom_sapling": "Паросток спокійного квітучого дерева", "block.quark.orange_blossom_leaves": "Тепле квітуче листя", "block.quark.orange_blossom_sapling": "Паросток теплого квітучого дерева", - "block.quark.pink_blossom_leaves": "Ніжне квітуче листя", - "block.quark.pink_blossom_sapling": "Паросток ніжного квітучого дерева", "block.quark.yellow_blossom_leaves": "Сонячне квітуче листя", "block.quark.yellow_blossom_sapling": "Паросток сонячного квітучого дерева", "block.quark.red_blossom_leaves": "Полум'яне квітуче листя", "block.quark.red_blossom_sapling": "Паросток полум'яного квітучого дерева", "block.quark.yellow_blossom_leaf_carpet": "Килимок з сонячного квітучого листя", - "block.quark.pink_blossom_leaf_carpet": "Килимок з ніжного квітучого листя", "block.quark.orange_blossom_leaf_carpet": "Килимок з теплого квітучого листя", "block.quark.lavender_blossom_leaf_carpet": "Килимок з спокійного квітучого листя", "block.quark.blue_blossom_leaf_carpet": "Килимок з морозного квітучого листя", @@ -949,7 +946,6 @@ "block.quark.blue_blossom_hedge": "Морозний квітучий живопліт", "block.quark.lavender_blossom_hedge": "Спокіний квітучий живопліт", "block.quark.orange_blossom_hedge": "Теплий квітучий живопліт", - "block.quark.pink_blossom_hedge": "Солодкий квітучий живопліт", "block.quark.yellow_blossom_hedge": "Сонячний квітучий живопліт", "block.quark.red_blossom_hedge": "Полум'яний квітучий живопліт", "block.quark.matrix_enchanter": "Матричний зачаровувач", @@ -1201,7 +1197,6 @@ "block.quark.potted_nether_wart": "Наріст Незеру у горщику", "block.quark.potted_orange_blossom_sapling": "Паросток теплого квітучого дерева в горщику", "block.quark.potted_peony": "Піон в горщику", - "block.quark.potted_pink_blossom_sapling": "Паросток ніжного квітучого дерева в горщику", "block.quark.potted_potato": "Картоплина в гощику", "block.quark.potted_pumpkin": "Гарбуз в горщику", "block.quark.potted_red_blossom_sapling": "Паросток полум'яного квітучого дерева в горщику", diff --git a/src/main/resources/assets/quark/lang/zh_cn.json b/src/main/resources/assets/quark/lang/zh_cn.json index 48ddbfb341..f77e134f36 100644 --- a/src/main/resources/assets/quark/lang/zh_cn.json +++ b/src/main/resources/assets/quark/lang/zh_cn.json @@ -793,14 +793,11 @@ "block.quark.lavender_blossom_sapling": "幽静花树苗", "block.quark.orange_blossom_leaves": "温暖花树叶", "block.quark.orange_blossom_sapling": "温暖花树苗", - "block.quark.pink_blossom_leaves": "甜蜜花树叶", - "block.quark.pink_blossom_sapling": "甜蜜花树苗", "block.quark.yellow_blossom_leaves": "阳光花树叶", "block.quark.yellow_blossom_sapling": "阳光花树苗", "block.quark.red_blossom_leaves": "火热花树叶", "block.quark.red_blossom_sapling": "火热花树苗", "block.quark.yellow_blossom_leaf_carpet": "阳光花树叶地毯", - "block.quark.pink_blossom_leaf_carpet": "甜蜜花树叶地毯", "block.quark.orange_blossom_leaf_carpet": "温暖花树叶地毯", "block.quark.lavender_blossom_leaf_carpet": "幽静花树叶地毯", "block.quark.blue_blossom_leaf_carpet": "雪霜花树叶地毯", @@ -938,7 +935,6 @@ "block.quark.blue_blossom_hedge": "雪霜花树叶篱", "block.quark.lavender_blossom_hedge": "幽静花树叶篱", "block.quark.orange_blossom_hedge": "温暖花树叶篱", - "block.quark.pink_blossom_hedge": "甜蜜花树叶篱", "block.quark.yellow_blossom_hedge": "阳光花树叶篱", "block.quark.red_blossom_hedge": "火热花树叶篱", "block.quark.matrix_enchanter": "矩阵附魔台", @@ -1109,7 +1105,6 @@ "block.quark.potted_nether_wart": "下界疣盆栽", "block.quark.potted_orange_blossom_sapling": "温暖花树苗盆栽", "block.quark.potted_peony": "牡丹盆栽", - "block.quark.potted_pink_blossom_sapling": "甜蜜花树苗盆栽", "block.quark.potted_potato": "马铃薯盆栽", "block.quark.potted_pumpkin": "南瓜盆栽", "block.quark.potted_red_blossom_sapling": "火热花树苗盆栽", diff --git a/src/main/resources/assets/quark/lang/zh_tw.json b/src/main/resources/assets/quark/lang/zh_tw.json index 5391890e79..b09bc68847 100644 --- a/src/main/resources/assets/quark/lang/zh_tw.json +++ b/src/main/resources/assets/quark/lang/zh_tw.json @@ -890,14 +890,11 @@ "block.quark.lavender_blossom_sapling": "幽靜繁花樹苗", "block.quark.orange_blossom_leaves": "暖風繁花樹葉", "block.quark.orange_blossom_sapling": "暖風繁花樹苗", - "block.quark.pink_blossom_leaves": "甜心繁花樹葉", - "block.quark.pink_blossom_sapling": "甜心繁花樹苗", "block.quark.yellow_blossom_leaves": "艷陽繁花樹葉", "block.quark.yellow_blossom_sapling": "艷陽繁花樹苗", "block.quark.red_blossom_leaves": "火熱繁花樹葉", "block.quark.red_blossom_sapling": "火熱繁花樹苗", "block.quark.yellow_blossom_leaf_carpet": "艷陽繁花地毯", - "block.quark.pink_blossom_leaf_carpet": "甜心繁花地毯", "block.quark.orange_blossom_leaf_carpet": "暖風繁花地毯", "block.quark.lavender_blossom_leaf_carpet": "幽靜繁花地毯", "block.quark.blue_blossom_leaf_carpet": "冷霜繁花地毯", @@ -1086,7 +1083,6 @@ "block.quark.potted_nether_wart": "地獄疙瘩盆栽", "block.quark.potted_orange_blossom_sapling": "暖風繁花盆栽", "block.quark.potted_peony": "牡丹花盆栽", - "block.quark.potted_pink_blossom_sapling": "甜心繁花盆栽", "block.quark.potted_potato": "馬鈴薯盆栽", "block.quark.potted_pumpkin": "南瓜盆栽", "block.quark.potted_red_blossom_sapling": "火熱繁花盆栽", diff --git a/src/main/resources/genscripts/lists/advancements b/src/main/resources/genscripts/lists/advancements index 901ad8eb71..fe14b0e696 100644 --- a/src/main/resources/genscripts/lists/advancements +++ b/src/main/resources/genscripts/lists/advancements @@ -127,7 +127,7 @@ ancient_apple_overlevel parent=minecraft:husbandry/plant_seed type=challenge flag=blossom_trees -item=quark:pink_blossom_sapling +item=quark:red_blossom_sapling get_all_blossom_saplings parent=minecraft:story/smelt_iron diff --git a/src/main/resources/genscripts/lists/blossom b/src/main/resources/genscripts/lists/blossom index 1fee2a8980..62fa80bb55 100644 --- a/src/main/resources/genscripts/lists/blossom +++ b/src/main/resources/genscripts/lists/blossom @@ -4,7 +4,7 @@ lavender_blossom_leaves lavender_blossom_sapling orange_blossom_leaves orange_blossom_sapling -pink_blossom_leaves -pink_blossom_sapling +red_blossom_leaves +red_blossom_sapling yellow_blossom_leaves yellow_blossom_sapling \ No newline at end of file diff --git a/src/main/resources/quark.mixins.json b/src/main/resources/quark.mixins.json index 1f9f3dbe1e..16e6d671f8 100644 --- a/src/main/resources/quark.mixins.json +++ b/src/main/resources/quark.mixins.json @@ -16,6 +16,7 @@ "BaseCoralPlantTypeBlockMixin", "BeaconBlockEntityMixin", "BeehiveBlockEntityMixin", + "BlockBehaviourMixin", "BlockItemMixin", "BoatMixin", "CeilingHangingSignBlockMixin",