From 45fc0ca7ee3145e0c9cc78900708aebfe3051263 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 19 Feb 2021 20:21:29 +0100 Subject: [PATCH] post-merge fixup --- .../create/blockstates/radial_chassis.json | 24 +++++++------- .../resources/assets/create/lang/en_us.json | 2 ++ .../assets/create/lang/unfinished/es_es.json | 31 +++++++++++++++++- .../data/create/advancements/aesthetics.json | 4 +-- .../ponder/elements/WorldSectionElement.java | 8 ++--- .../assets/create/textures/gui/icons.png | Bin 4765 -> 2719 bytes 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 2e2d16cf1..8bd829ffc 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -149,8 +149,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "x" + "axis": "x", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "y" + "axis": "y", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "z" + "axis": "z", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "x" + "axis": "x", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "y" + "axis": "y", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "z" + "axis": "z", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_x", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 002bcd0e1..7b70e9d81 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1824,6 +1824,8 @@ "create.ponder.brass_hand.scene_4.incoming": "Incoming...", "create.ponder.brass_hand.scene_4.title": "Debug Scene 5: Emitting particles", "create.ponder.brass_hand.scene_5.title": "Debug Scene 6: Basic player interaction", + "create.ponder.brass_hand.scene_6.birbs_interesting": "More birbs = More interesting", + "create.ponder.brass_hand.scene_6.poi": "Point of Interest", "create.ponder.brass_hand.scene_6.title": "Debug Scene 7: Birbs", "_": "Thank you for translating Create!" diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 86d845459..0574cbdcc 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 11", + "_": "Missing Localizations: 36", "_": "->------------------------] Game Elements [------------------------<-", @@ -1800,6 +1800,35 @@ "create.tooltip.randomWipDescription7": "Este quizás no es para ti. ¿Qué tal ese?", "create.tooltip.randomWipDescription8": "Úsalo y arrepiéntete de tu decisión inmediatamente", + + "_": "->------------------------] MetaDoc Text [------------------------<-", + + "create.ponder.hold_to_ponder": "UNLOCALIZED: Hold [%1$s] to Ponder", + "create.ponder.pondering": "UNLOCALIZED: Pondering about...", + "create.ponder.shared.sneak_and": "UNLOCALIZED: Sneak +", + "create.ponder.shared.ctrl_and": "UNLOCALIZED: Ctrl +", + "create.ponder.shaft.scene_0.shaft_relay": "UNLOCALIZED: Shafts will relay rotation in a straight line.", + "create.ponder.shaft.scene_0.title": "UNLOCALIZED: Relaying rotational force using Shafts", + "create.ponder.shaft.scene_1.shaft_can_be_encased": "UNLOCALIZED: Andesite or Brass Casing can be used to encase them.", + "create.ponder.shaft.scene_1.title": "UNLOCALIZED: Encasing Shafts", + "create.ponder.brass_hand.scene_0.x": "UNLOCALIZED: Das X axis", + "create.ponder.brass_hand.scene_0.y": "UNLOCALIZED: Das Y axis", + "create.ponder.brass_hand.scene_0.z": "UNLOCALIZED: Das Z axis", + "create.ponder.brass_hand.scene_0.title": "UNLOCALIZED: Debug Scene 1: Coordinate Space", + "create.ponder.brass_hand.scene_1.change_blocks": "UNLOCALIZED: Blocks can be modified", + "create.ponder.brass_hand.scene_1.title": "UNLOCALIZED: Debug Scene 2: Changing Blocks", + "create.ponder.brass_hand.scene_2.title": "UNLOCALIZED: Debug Scene 3: Showing Fluids", + "create.ponder.brass_hand.scene_2.fluids": "UNLOCALIZED: Fluid rendering test.", + "create.ponder.brass_hand.scene_3.outofbounds": "UNLOCALIZED: Blocks outside of the base plate do not affect scaling", + "create.ponder.brass_hand.scene_3.thanks_to_configureBasePlate": "UNLOCALIZED: configureBasePlate() makes sure of that.", + "create.ponder.brass_hand.scene_3.title": "UNLOCALIZED: Debug Scene 4: Out of bounds / configureBasePlate", + "create.ponder.brass_hand.scene_4.incoming": "UNLOCALIZED: Incoming...", + "create.ponder.brass_hand.scene_4.title": "UNLOCALIZED: Debug Scene 5: Emitting particles", + "create.ponder.brass_hand.scene_5.title": "UNLOCALIZED: Debug Scene 6: Basic player interaction", + "create.ponder.brass_hand.scene_6.birbs_interesting": "UNLOCALIZED: More birbs = More interesting", + "create.ponder.brass_hand.scene_6.poi": "UNLOCALIZED: Point of Interest", + "create.ponder.brass_hand.scene_6.title": "UNLOCALIZED: Debug Scene 7: Birbs", + "_": "Thank you for translating Create!" } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index d723cbe38..59a86f429 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:cogwheel", - "create:large_cogwheel" + "create:large_cogwheel", + "create:cogwheel" ] } }, diff --git a/src/main/java/com/simibubi/create/foundation/ponder/elements/WorldSectionElement.java b/src/main/java/com/simibubi/create/foundation/ponder/elements/WorldSectionElement.java index 4114ba1a4..bc5321c4b 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/elements/WorldSectionElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/elements/WorldSectionElement.java @@ -13,10 +13,10 @@ import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.ponder.PonderScene; import com.simibubi.create.foundation.ponder.PonderWorld; import com.simibubi.create.foundation.ponder.Select; -import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.foundation.utility.SuperByteBufferCache; -import com.simibubi.create.foundation.utility.SuperByteBufferCache.Compartment; -import com.simibubi.create.foundation.utility.TileEntityRenderHelper; +import com.simibubi.create.foundation.render.Compartment; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBufferCache; +import com.simibubi.create.foundation.render.TileEntityRenderHelper; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/resources/assets/create/textures/gui/icons.png b/src/main/resources/assets/create/textures/gui/icons.png index 499eccc3826ff754420db87460668b49e8a36fdf..3276c6033f25f4f3b11ffed88de3f52b4c42e5f5 100644 GIT binary patch literal 2719 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 literal 4765 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