post-merge fixup

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",

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!"

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!"
 
 }

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"
         ]
       }
     },

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.render.Compartment;
-import com.simibubi.create.foundation.utility.SuperByteBufferCache;
+import com.simibubi.create.foundation.render.SuperByteBuffer;
-import com.simibubi.create.foundation.utility.SuperByteBufferCache.Compartment;
+import com.simibubi.create.foundation.render.SuperByteBufferCache;
-import com.simibubi.create.foundation.utility.TileEntityRenderHelper;
+import com.simibubi.create.foundation.render.TileEntityRenderHelper;
 
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;