Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev

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",
@@ -207,8 +207,8 @@
     },
     {
       "when": {
-        "axis": "x",
+        "sticky_east": "true",
-        "sticky_east": "true"
+        "axis": "x"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x_sticky",
@@ -217,8 +217,8 @@
     },
     {
       "when": {
-        "axis": "y",
+        "sticky_east": "true",
-        "sticky_east": "true"
+        "axis": "y"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y_sticky",
@@ -227,8 +227,8 @@
     },
     {
       "when": {
-        "axis": "z",
+        "sticky_east": "true",
-        "sticky_east": "true"
+        "axis": "z"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z_sticky"
@@ -236,8 +236,8 @@
     },
     {
       "when": {
-        "axis": "x",
+        "sticky_east": "false",
-        "sticky_east": "false"
+        "axis": "x"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x",
@@ -246,8 +246,8 @@
     },
     {
       "when": {
-        "axis": "y",
+        "sticky_east": "false",
-        "sticky_east": "false"
+        "axis": "y"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y",
@@ -256,8 +256,8 @@
     },
     {
       "when": {
-        "axis": "z",
+        "sticky_east": "false",
-        "sticky_east": "false"
+        "axis": "z"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z"

src/generated/resources/assets/create/lang/en_us.json

@@ -517,7 +517,7 @@
 	"create.generic.unit.minutes": "Minutes",
 	"create.generic.unit.rpm": "RPM",
 	"create.generic.unit.stress": "su",
-	"create.generic.unit.degrees": "\u00B0",
+	"create.generic.unit.degrees": "\u00C2\u00B0",
 
 	"create.action.scroll": "Scroll",
 	"create.action.confirm": "Confirm",
@@ -1058,7 +1058,7 @@
 	"block.create.furnace_engine.tooltip.behaviour1": "_Starts_ _powering_ a _Flywheel_ placed in front of it (1m apart). Use a Blast Furnace for higher speeds.",
 
 	"block.create.flywheel.tooltip": "FLYWHEEL",
-	"block.create.flywheel.tooltip.summary": "A large metal wheel to _harness_ _and_ _stabilize_ generated force by an _attached_ _Engine_. Flywheels connect to engines if they are _1m_ _apart_ and at a _90\u00B0_ _Angle_ from each other.",
+	"block.create.flywheel.tooltip.summary": "A large metal wheel to _harness_ _and_ _stabilize_ generated force by an _attached_ _Engine_. Flywheels connect to engines if they are _1m_ _apart_ and at a _90\u00C2\u00B0_ _Angle_ from each other.",
 	"block.create.flywheel.tooltip.condition1": "When Attached to Running Engine",
 	"block.create.flywheel.tooltip.behaviour1": "Provides _Rotational_ _Force_ to a connected contraption based on the generator's strength and speed.",
 
@@ -1109,7 +1109,9 @@
 	"block.create.cart_assembler.tooltip": "CART ASSEMBLER",
 	"block.create.cart_assembler.tooltip.summary": "Mounts a connected Structure onto a _passing_ _Minecart_.",
 	"block.create.cart_assembler.tooltip.condition1": "When Powered by Redstone",
-	"block.create.cart_assembler.tooltip.behaviour1": "_Disassembles_ mounted Structures of _passing_ _carts_ and places them back into the world.",
+	"block.create.cart_assembler.tooltip.behaviour1": "_Assembles_ a connected Structure onto a _Minecart_ and _sends_ the Minecart on its way.",
+	"block.create.cart_assembler.tooltip.condition2": "Otherwise",
+	"block.create.cart_assembler.tooltip.behaviour2": "_Disassembles_ mounted Structures of _passing_ _carts_, places them back into the world and _stops_ the cart.",
 
 	"block.create.rope_pulley.tooltip": "ROPE PULLEY",
 	"block.create.rope_pulley.tooltip.summary": "Moves attached _blocks_ and _structures_ _vertically_. Use _Chassis_ or _Slime_ _Blocks_ to move more than a single block.",

src/main/resources/assets/create/lang/default/tooltips.json

@@ -285,7 +285,9 @@
 	"block.create.cart_assembler.tooltip": "CART ASSEMBLER",
 	"block.create.cart_assembler.tooltip.summary": "Mounts a connected Structure onto a _passing_ _Minecart_.",
 	"block.create.cart_assembler.tooltip.condition1": "When Powered by Redstone",
-	"block.create.cart_assembler.tooltip.behaviour1": "_Disassembles_ mounted Structures of _passing_ _carts_ and places them back into the world.",
+	"block.create.cart_assembler.tooltip.behaviour1": "_Assembles_ a connected Structure onto a _Minecart_ and _sends_ the Minecart on its way.",
+	"block.create.cart_assembler.tooltip.condition2": "Otherwise",
+	"block.create.cart_assembler.tooltip.behaviour2": "_Disassembles_ mounted Structures of _passing_ _carts_, places them back into the world and _stops_ the cart.",
 	
 	"block.create.rope_pulley.tooltip": "ROPE PULLEY",
 	"block.create.rope_pulley.tooltip.summary": "Moves attached _blocks_ and _structures_ _vertically_. Use _Chassis_ or _Slime_ _Blocks_ to move more than a single block.",