port recent changes

src/generated/resources/.cache/cache

@@ -22,9 +22,11 @@ e555e3c2b2d3f01440e48db4ba88f7e00fd99b6f assets/create/blockstates/basin.json
 f25693a9429f6337149ff24f27900dc4eb82a7c2 assets/create/blockstates/belt.json
 cf9045eb16e5299a1d917c4cb536289f49411276 assets/create/blockstates/birch_window.json
 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets/create/blockstates/birch_window_pane.json
+e0f1e44c9bce4a7478592cf3a8ee7b91d9083d65 assets/create/blockstates/black_sail.json
 58b07d2af6030342f0354f6d3fd0ee128d2d74b4 assets/create/blockstates/black_seat.json
 a71ddf3291bd13d7877f2fe32c42f50407f99afb assets/create/blockstates/black_valve_handle.json
 923aeb2a556f67bc0526f237dd97af2d37b4c9f1 assets/create/blockstates/blaze_burner.json
+ec2ab87734acc209e6be3bc4898b1199f819bfd3 assets/create/blockstates/blue_sail.json
 4854d1ef52130a7887aecc60bcaffbd66f0871a8 assets/create/blockstates/blue_seat.json
 9d7341a5cae5d47788c595167946dfb6441cebd1 assets/create/blockstates/blue_valve_handle.json
 fba967b1f6e44b34a9d9662e2fedfc13aad7f36c assets/create/blockstates/brass_belt_funnel.json
@@ -32,6 +34,7 @@ fba967b1f6e44b34a9d9662e2fedfc13aad7f36c assets/create/blockstates/brass_belt_fu
 b8dd6e505943e06706d0718ece620ab3cf943650 assets/create/blockstates/brass_casing.json
 3057e1121117c0cd651c288cd8e2d46bdf64afb1 assets/create/blockstates/brass_funnel.json
 672eedcd3520c6d39603449165a23be9c612c620 assets/create/blockstates/brass_tunnel.json
+11ebdd9bd0815833e62ec1bea03a4cdd86ce00f3 assets/create/blockstates/brown_sail.json
 e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets/create/blockstates/brown_seat.json
 322289524c058fac66bbe76b4924c3b0c0c33b84 assets/create/blockstates/brown_valve_handle.json
 26f3b6a8f8249e4e622ab200057d75e228762817 assets/create/blockstates/cart_assembler.json
@@ -57,6 +60,7 @@ f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_moto
 fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json
 a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets/create/blockstates/crushing_wheel_controller.json
 b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/cuckoo_clock.json
+b496452f2f7dbbba385e1fc10b560ec266e4b5e7 assets/create/blockstates/cyan_sail.json
 4de72f65bff4e5d9c8153fa3adeee6b61d6f912b assets/create/blockstates/cyan_seat.json
 2c04d57e56849f243aec8a1e769574d24daac1e9 assets/create/blockstates/cyan_valve_handle.json
 1726b1b9e04a0634e7e1fdcf1cf4cc898efc5c2f assets/create/blockstates/dark_oak_window.json
@@ -161,8 +165,10 @@ a4b0337149cb0617cc60061477c7178d37dbb831 assets/create/blockstates/granite_cobbl
 d97fdea02187e63f6b63913357c79a18660d676d assets/create/blockstates/granite_cobblestone_stairs.json
 2f29568407970ea0e3807e0553e0584d127a9014 assets/create/blockstates/granite_cobblestone_wall.json
 f8659e81cd2a623475a6a9aca59149e82de56b1c assets/create/blockstates/granite_pillar.json
+5c40c4a27e1dec747a467dd251700c72a6ceb07d assets/create/blockstates/gray_sail.json
 a5ec5401ba9f3e102a2e1b35837f643847afbca4 assets/create/blockstates/gray_seat.json
 5f17a5868616b33eb157965a661046cab7a1427f assets/create/blockstates/gray_valve_handle.json
+52b849faef96b8ab9d9d64a1518c8f299af057b8 assets/create/blockstates/green_sail.json
 13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json
 f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json
 6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json
@@ -180,10 +186,13 @@ a4cfcdc038af0f93a58d88ea8860b34d73632ff4 assets/create/blockstates/layered_dolom
 038f532f7364c1e793196fcc5856df9ceff93578 assets/create/blockstates/layered_limestone.json
 8535d628f8834be62cdf62ef4b60c2ce3a7af99f assets/create/blockstates/layered_scoria.json
 419d7fffc5cbd392f10211afa8d17e3eb8df8380 assets/create/blockstates/layered_weathered_limestone.json
+029904f21970947a4423a6e0c8c65c4e02f2e8e6 assets/create/blockstates/light_blue_sail.json
 2a0a8b1715700bf1e284ee57ef9f7f163c12f3ee assets/create/blockstates/light_blue_seat.json
 9bee040558a6b24e21f837fc808e17fae1883e71 assets/create/blockstates/light_blue_valve_handle.json
+93537c4e2ab86218a777e7b000c3fcd55a80b1cd assets/create/blockstates/light_gray_sail.json
 d9a2551e001bb315d071bb9f1f013323a66a5d09 assets/create/blockstates/light_gray_seat.json
 8bea8c86de8c218c8932eef140f0ed439e173156 assets/create/blockstates/light_gray_valve_handle.json
+ba2c4e3ddafa3c89a72cc243b14e8518fab369aa assets/create/blockstates/lime_sail.json
 1de3a88c003df03f5006e1bbaa0236589aba08ad assets/create/blockstates/lime_seat.json
 179a3e68b9f2e289eafe0e98e768befbbf91c5c2 assets/create/blockstates/lime_valve_handle.json
 c4dcb169bd1dffe8501bff455e3eb6ba979f60ab assets/create/blockstates/limesand.json
@@ -198,6 +207,7 @@ e7c7b952137c4cb615988ea59b9f14303c9a4dfe assets/create/blockstates/limestone_bri
 10513d55f7c621162a13d474d8f4eb54305d0f60 assets/create/blockstates/limestone_cobblestone_wall.json
 b7506b862d13b3f915c60d38bb7a20afc935f70a assets/create/blockstates/limestone_pillar.json
 69790737767e06f000c7824749c46664a123160e assets/create/blockstates/linear_chassis.json
+85a58ac539775f90903d9ce66374f3f2ffd4fecf assets/create/blockstates/magenta_sail.json
 84c494d24cc58af274fdd054896c680e8095d2d0 assets/create/blockstates/magenta_seat.json
 3bfce5016e5c929b74368dc2d734e62ae34587a4 assets/create/blockstates/magenta_valve_handle.json
 3b3250d6e209403a93d025604a8081087965016e assets/create/blockstates/mechanical_arm.json
@@ -229,6 +239,7 @@ b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/mysterious_cu
 36e46e65003a8d0b8555fe5e8f8dc980d6559bc5 assets/create/blockstates/nozzle.json
 cf60989f63f02067fc4e4ad25033ac83167cdeb0 assets/create/blockstates/oak_window.json
 4a796509c3953171f04f957351282205840b3760 assets/create/blockstates/oak_window_pane.json
+b0be3d4ff92cb123ec21ec2788db35d0f392ba8a assets/create/blockstates/orange_sail.json
 5764a24f6c4fa552b61d2a02135adfc7d93c2e10 assets/create/blockstates/orange_seat.json
 1445074ec21a3735ea912b624c0f9f18a450d2d3 assets/create/blockstates/orange_valve_handle.json
 8e2028e1a0450a592eed5e10276ba19b1195a206 assets/create/blockstates/ornate_iron_window.json
@@ -277,7 +288,12 @@ e1eca91fdcf60b8ac0c2b8cdf6674046b0bc55f4 assets/create/blockstates/paved_limesto
 c17d334e938dcb742550ba8307ca8266a1fc9b49 assets/create/blockstates/paved_weathered_limestone.json
 cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets/create/blockstates/paved_weathered_limestone_slab.json
 d62b0992cec1de45dad1f2c273132225f4ef33a0 assets/create/blockstates/paved_weathered_limestone_stairs.json
+<<<<<<< HEAD
 e29e245d06c46dac94fcd0e01a9bf7fa8e02fb87 assets/create/blockstates/paved_weathered_limestone_wall.json
+=======
+dba4cf86e82ed4502fffed363fbce226a445e774 assets/create/blockstates/paved_weathered_limestone_wall.json
+30971f2f76fe56f144178c33ad6bde5fc9fb61c3 assets/create/blockstates/pink_sail.json
+>>>>>>> mc1.15/dev
 919a79e4a4a5fab0aac3ef48e1c786017d6aa001 assets/create/blockstates/pink_seat.json
 471a3bb474a0ae0453143888d561256cce894e3f assets/create/blockstates/pink_valve_handle.json
 975c97018e9e2419943eaab43aed0970e96feaf7 assets/create/blockstates/piston_extension_pole.json
@@ -310,9 +326,15 @@ ad721e3911f48c61c3639edac1896680a31451ff assets/create/blockstates/polished_weat
 e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggle_latch.json
 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets/create/blockstates/pulley_magnet.json
 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets/create/blockstates/pulse_repeater.json
+d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
+<<<<<<< HEAD
 d2e6f19325be65457e94bea44fd52863c0f66be7 assets/create/blockstates/radial_chassis.json
+=======
+bdd56f32ce0a148b6e466a55ab2777f69fc08cfc assets/create/blockstates/radial_chassis.json
+45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
+>>>>>>> mc1.15/dev
 da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets/create/blockstates/redstone_contact.json
@@ -322,6 +344,7 @@ b76ed5f6d271349b2509708c11e713bb299a57b6 assets/create/blockstates/refined_radia
 e2990fe70ad5d10437a376e70e167d1856277cc1 assets/create/blockstates/rope.json
 e14d5f7252105934295b4e156ec0e6d62d3d6b1c assets/create/blockstates/rope_pulley.json
 cc4cf3420fa290cb844f9cf4dfdd836aa9b70500 assets/create/blockstates/rotation_speed_controller.json
+ff5525783431f5047fc1ebf71d6c5ad526072b14 assets/create/blockstates/sail_frame.json
 7120f29e4b88a1c40125a8cdbe8af3570f4ee352 assets/create/blockstates/schematic_table.json
 36592a6542332b35445931e8e9531adf786b63ba assets/create/blockstates/schematicannon.json
 a5befc14551f043675e985027609aeb7e6bacc0d assets/create/blockstates/scoria.json
@@ -362,12 +385,16 @@ fd7a9c7095372485081436c91489cadb2b0c514e assets/create/blockstates/weathered_lim
 47f8c91ff4c3f5cad782ab469a1fe5f4909dc7f1 assets/create/blockstates/weathered_limestone_cobblestone_stairs.json
 dfa5662bfd5a70bcd87673b1c40bf9106d5e2365 assets/create/blockstates/weathered_limestone_cobblestone_wall.json
 c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets/create/blockstates/weathered_limestone_pillar.json
+512bf17c9ea309b1f7da54440f923530d25e467c assets/create/blockstates/white_sail.json
 4647010162eb4c350fad236d860317eaa1884c77 assets/create/blockstates/white_seat.json
 89000903d0ab8139e919abea7aa0361b34c24e55 assets/create/blockstates/white_valve_handle.json
+c4cd1131113667da0180898b5db3ebad609db8ba assets/create/blockstates/windmill_bearing.json
+e03c48512967845fce09d84b955d3bc7b480fedc assets/create/blockstates/yellow_sail.json
 a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.json
 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
+<<<<<<< HEAD
 33f621fe1a09a46426af59c9352c33e97c2bc00d assets/create/lang/en_ud.json
 25fba2944b4a86281bc40fddba4a8136d53e3c26 assets/create/lang/en_us.json
 52ad08a48ec59354f826b9cfe7eb6ea79ec7bab9 assets/create/lang/unfinished/de_de.json
@@ -385,6 +412,25 @@ b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_windo
 1358ff546e99004444fccca5355853d1738ef191 assets/create/models/block/acacia_window_pane_post.json
 bd33b944ec6ad89850a1d275b3d2843fe6f831cc assets/create/models/block/acacia_window_pane_side.json
 b272035cd746364a0bd3bf13061f51190e9b46d6 assets/create/models/block/acacia_window_pane_side_alt.json
+=======
+ad168f04d430ebd783a845e5928c3273da3f0074 assets/create/lang/en_ud.json
+25b02b7b025f988b0cda9655b2c586c82dfd369c assets/create/lang/en_us.json
+cf9075cacdbd171b33fa0b6cb68365e2c3614b40 assets/create/lang/unfinished/de_de.json
+87ea3d2da2863fa61c5d5b9f535aac8c1703be28 assets/create/lang/unfinished/fr_fr.json
+3349f2726256c99abd7e5268faa806b628d91e4d assets/create/lang/unfinished/it_it.json
+3cf205e25543b7860d6b00f2f91dd799333b9d74 assets/create/lang/unfinished/ja_jp.json
+d112e8b804ca16511c4096b328f3635b4c84a3e9 assets/create/lang/unfinished/ko_kr.json
+78791855041e56a27fb3520b289ca8a144de98ad assets/create/lang/unfinished/nl_nl.json
+d92ac1ec1ebbad873dd6563509767428603b6ba2 assets/create/lang/unfinished/pt_br.json
+5d4f30e05fea3bec9c6c85a5f7767eb3dd0a7dfe assets/create/lang/unfinished/ru_ru.json
+46996569e164858a5f9dc7f60731707d3517b888 assets/create/lang/unfinished/zh_cn.json
+846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
+1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
+1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json
+7d23c8e4543108f5f53b78ccb4908f7a5bb76c54 assets/create/models/block/acacia_window_pane_post.json
+3bdcc6bd616a179ffc22e66307aab538e9bcb75f assets/create/models/block/acacia_window_pane_side.json
+7b5b6809e3ef685a497ba15b549d3918aeb6c135 assets/create/models/block/acacia_window_pane_side_alt.json
+>>>>>>> mc1.15/dev
 7c81658c8839fdb23429e54f847c2a0aee0e866e assets/create/models/block/adjustable_pulley_end_horizontal.json
 20cfb751fc395a0e07c66ce87ab035207f9d1e0e assets/create/models/block/adjustable_pulley_end_horizontal_powered.json
 bb02f94b260be8fe1944b801cc4050b4d213f1df assets/create/models/block/adjustable_pulley_end_vertical.json
@@ -430,6 +476,7 @@ aa5b45c6c657436bd38621344f6728d44ea974ad assets/create/models/block/andesite_cob
 7c0e71f479aeef7bf02f0fb76c4333fa2227b83e assets/create/models/block/andesite_cobblestone_wall_side_tall.json
 51e851b15870c0922cfbe911ef1a2f22062969f3 assets/create/models/block/andesite_funnel.json
 f28da6703691f1b08cfb49208f0f7bb0c5ca816d assets/create/models/block/andesite_funnel_powered.json
+<<<<<<< HEAD
 f77390658e8aeed4352e47b94fd24df116ea1857 assets/create/models/block/andesite_pillar.json
 2294f74b5c30430de89a345af60f6669c975f33a assets/create/models/block/andesite_tunnel/cross.json
 17f860947f51e84a3f9b32b10cdf61f863db3afc assets/create/models/block/andesite_tunnel/straight.json
@@ -442,8 +489,24 @@ a5f0ed76e27d2ca706445f7f7c5f9270f98e34f9 assets/create/models/block/birch_window
 f40c4d4ea6c037158f4b9862a7c11e6024a261e6 assets/create/models/block/birch_window_pane_post.json
 dbfd2a996820d885d9741a3f168aa36c3538cfbd assets/create/models/block/birch_window_pane_side.json
 557b35671ec417597259ba8d0239fe18c14c3d20 assets/create/models/block/birch_window_pane_side_alt.json
+=======
+b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets/create/models/block/andesite_pillar.json
+aaf2e4259bcfcedd3400e9acb2d64c0cf06f7fb1 assets/create/models/block/andesite_tunnel/cross.json
+75f628178fa21a2bd301eea8d1cebf7e94f7d5cc assets/create/models/block/andesite_tunnel/straight.json
+c9aec5c30e6821c8f125202cad236afa48f6c358 assets/create/models/block/andesite_tunnel/t_left.json
+1dcb8fe81a275ef8a49c04db021ad29abe8b38ae assets/create/models/block/andesite_tunnel/t_right.json
+e2801a0c3fe8e1c2485291485b977f581fdc8b7c assets/create/models/block/andesite_tunnel/window.json
+87f90e8256060683b834d57d3c11248d5ea84e34 assets/create/models/block/birch_window.json
+94317904054cbf651846716d8af3bca618d3130f assets/create/models/block/birch_window_pane_noside.json
+7a4cae5b075c4ac96a3113afafa391d024fc117f assets/create/models/block/birch_window_pane_noside_alt.json
+3905ced5892afa60009bf26279f9fa4756c273d4 assets/create/models/block/birch_window_pane_post.json
+62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets/create/models/block/birch_window_pane_side.json
+95d4230eb366f5e7684820c9337e3956ed34042a assets/create/models/block/birch_window_pane_side_alt.json
+2b59d6f937cd542eba670689c30fe16887dfd9a0 assets/create/models/block/black_sail.json
+>>>>>>> mc1.15/dev
 97d79ab99c0fb278a9b5dc54e1c6563868f87b76 assets/create/models/block/black_seat.json
 02747ea1a0e5d4a1cd466bf26878885a89d347fa assets/create/models/block/black_valve_handle.json
+d876627b6e519c6f3f59c7c27cc7b0f903206f7c assets/create/models/block/blue_sail.json
 e58b00a7222152d7facbe0e82f00933b974df747 assets/create/models/block/blue_seat.json
 c7f91468b196fbda137e6b31764870b3bbfda6b6 assets/create/models/block/blue_valve_handle.json
 24dff9a8d22c9a88286d2b7d08384ac9f281a512 assets/create/models/block/brass_belt_funnel_pull_extended.json
@@ -463,8 +526,10 @@ addcf821a2348c0985bf9a72229355cfab818069 assets/create/models/block/brass_belt_f
 a959e03ca339badb49fe58ba53d86a84352e91f3 assets/create/models/block/brass_tunnel/t_left.json
 0585fbe58da3a8ed0dc98cc7ed79ac067312078d assets/create/models/block/brass_tunnel/t_right.json
 a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel/window.json
+8ab097caaa0db0915ae9254f7d65092d9171bc60 assets/create/models/block/brown_sail.json
 4eed0ad902f5e84f2b6c160f3283e8028640e77d assets/create/models/block/brown_seat.json
 6c39677f8c3a84280835c717ea1ef569b7c76a1b assets/create/models/block/brown_valve_handle.json
+<<<<<<< HEAD
 db7279f05c1d89e21da8887a15d3a1cfff4a9cf2 assets/create/models/block/chiseled_dark_scoria.json
 22d4ad2de48739ab754f8dfcd6f84ad2267abf8b assets/create/models/block/chiseled_dolomite.json
 550dc0622377b4736610b1c924dc890c857a0fd0 assets/create/models/block/chiseled_gabbro.json
@@ -473,6 +538,16 @@ db7279f05c1d89e21da8887a15d3a1cfff4a9cf2 assets/create/models/block/chiseled_dar
 041a20dd674277ff4f1613a0a89600f05458edf4 assets/create/models/block/chiseled_weathered_limestone.json
 f9a3f0939ea43b404eb2826b94211a25fca5ebc2 assets/create/models/block/clockwork_bearing.json
 1f01a4b6608f75145734b60ddf4a33ce318425ff assets/create/models/block/copper_casing.json
+=======
+028a07b49c05fe8a93f1d8c229d81e73d887c2df assets/create/models/block/chiseled_dark_scoria.json
+b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets/create/models/block/chiseled_dolomite.json
+cd7751090cf3d55296b8e415d0af9b6f18d69770 assets/create/models/block/chiseled_gabbro.json
+d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets/create/models/block/chiseled_limestone.json
+ac07568fa7b2d3fa84d0fe89a498514d30514291 assets/create/models/block/chiseled_scoria.json
+ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets/create/models/block/chiseled_weathered_limestone.json
+30fe120af3cb32faf0729df4d2cdf868f804be17 assets/create/models/block/clockwork_bearing.json
+70406933cc4fa5471af6e562fd84a397347dba17 assets/create/models/block/copper_casing.json
+>>>>>>> mc1.15/dev
 b2c528cfd24a5cb0cb96c45d0a914f1090f8c32b assets/create/models/block/copper_valve_handle.json
 1ef7060b0ca7e9c0bfc8151f98ca08da31862cda assets/create/models/block/crate/brass/bottom.json
 4ef2c7c3018f2d219f159a3ce58ceb00610b9c5d assets/create/models/block/crate/brass/left.json
@@ -484,6 +559,7 @@ a09f639bde4c61d68592eb06c807e7a6791ff950 assets/create/models/block/crate/brass/
 7635211e4d833748acaea37ea48b1f749c32ea5f assets/create/models/block/crate/creative/right.json
 a123e3c8a9e2ea1665f268cf3991aa7e4b3119c6 assets/create/models/block/crate/creative/single.json
 29ab5cfe7aed1271ede125e91bf78c1372b5f96e assets/create/models/block/crate/creative/top.json
+68843a02a32c156afad85830877b83f9b51c5147 assets/create/models/block/cyan_sail.json
 6704782830b3d872321e895b6903709c18e3778f assets/create/models/block/cyan_seat.json
 f45ef4a5f0aa8482d493661673b1c0ab6d061157 assets/create/models/block/cyan_valve_handle.json
 f5ac5007454cb04490e36f39e9047cc90501b2f6 assets/create/models/block/dark_oak_window.json
@@ -660,6 +736,7 @@ d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/framed_glass
 a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/framed_glass_pane_post.json
 41645919ece236df5804a5a73ef682720194de34 assets/create/models/block/framed_glass_pane_side.json
 8bc0abaabdc62d0c27730dba7eb6da54607b7e96 assets/create/models/block/framed_glass_pane_side_alt.json
+<<<<<<< HEAD
 894518bf911d73cece24d4557ab29829829d70c0 assets/create/models/block/gabbro.json
 d84f558506d4a399f72d86b15f318b234ce67e58 assets/create/models/block/gabbro_bricks.json
 6ca3de3137526e3e103b9759c9f79edcaec3bab3 assets/create/models/block/gabbro_bricks_slab.json
@@ -699,8 +776,47 @@ ddc8bf8dc62464d424ab812f801dd7a1f68072d0 assets/create/models/block/granite_cobb
 87f6b4e30f2cdd0ddb3b48e43f15317b386597e6 assets/create/models/block/granite_cobblestone_wall_side.json
 5c7340740d822deae7aa32c15c36531476862fbb assets/create/models/block/granite_cobblestone_wall_side_tall.json
 f55c5825c63f345a95e822a2113e76b5a62d8f7c assets/create/models/block/granite_pillar.json
+=======
+af8bceaa94d714ab377ab9cef1a46ec8cd2b6382 assets/create/models/block/gabbro.json
+d21fdbd5ae4013fed068e6ae015d68880d4d3d5c assets/create/models/block/gabbro_bricks.json
+acdb20098521f67a530dd809190b1c024464749d assets/create/models/block/gabbro_bricks_slab.json
+10621d5aecf9d97bbf0ffec5540d6590ba88eb75 assets/create/models/block/gabbro_bricks_slab_top.json
+dfb61cb5f05c385fe9a459685804eef7a5961e15 assets/create/models/block/gabbro_bricks_stairs.json
+c61f0ee76ba24ecb4f597f83b45ecea3ccb9531a assets/create/models/block/gabbro_bricks_stairs_inner.json
+6dc59aaa66608e8d11b67ce2c5432f7b38003113 assets/create/models/block/gabbro_bricks_stairs_outer.json
+9b851103cec9334e98008a8955df62f52edeab1f assets/create/models/block/gabbro_bricks_wall_post.json
+ca28cec552b4d3401854c2d00d43b3a3e01995f2 assets/create/models/block/gabbro_bricks_wall_side.json
+fbdc91941c4694507a759d105dc4284914a2eaa7 assets/create/models/block/gabbro_cobblestone.json
+c660c81a9faaf7cd12b50d2a329e52c377cb96a5 assets/create/models/block/gabbro_cobblestone_slab.json
+b5c4037b01c2e02eee1275a36d62b2f364a49775 assets/create/models/block/gabbro_cobblestone_slab_top.json
+75589542f32d2cdad96afb2348cd6fbff2475b07 assets/create/models/block/gabbro_cobblestone_stairs.json
+f278ec09c13f98ccbce1a8488d4d51c72f398ed4 assets/create/models/block/gabbro_cobblestone_stairs_inner.json
+094d753164a282b2a5608202ab38bd354abb1a14 assets/create/models/block/gabbro_cobblestone_stairs_outer.json
+5e50c62a9db350f3a2c0e4b1c37a8dc0d149f287 assets/create/models/block/gabbro_cobblestone_wall_post.json
+820235f51e7c3b4c05a327c3aa66618ea1e89c9c assets/create/models/block/gabbro_cobblestone_wall_side.json
+ede9c9209f9cee3d8e1ffc5008b1b8b026aee998 assets/create/models/block/gabbro_pillar.json
+392dd57e5b96214335867799347e21ac0d05457a assets/create/models/block/granite_bricks.json
+0ee90049ce09f1f1c96063bc7239cd1fadbdb947 assets/create/models/block/granite_bricks_slab.json
+37737d6767ba08b6bd96de1ff3b920522dc3cd51 assets/create/models/block/granite_bricks_slab_top.json
+e1fe76be531aec81e97a4b28f5e7cd426e48975f assets/create/models/block/granite_bricks_stairs.json
+a976ff37a2acc9f84a37c397f06c08edc0a7674f assets/create/models/block/granite_bricks_stairs_inner.json
+44189d38e42d2e2ab2c1115e569d60379f9d90a3 assets/create/models/block/granite_bricks_stairs_outer.json
+f949f1e763f745f140e763043cc16d68c7ee0f1f assets/create/models/block/granite_bricks_wall_post.json
+1d0e735ed822d17825f20270640510a68c835a3f assets/create/models/block/granite_bricks_wall_side.json
+6b9e3507606968748e48517f3aa29c2c1ee4b16e assets/create/models/block/granite_cobblestone.json
+99b6c148a801868be5b265a3f7a9b86e3bc46718 assets/create/models/block/granite_cobblestone_slab.json
+a54dbe2ab2ddca316efb05d8d3094dc146ced339 assets/create/models/block/granite_cobblestone_slab_top.json
+d52844bdcf33a2f0111c7664a848b510a0f13b8d assets/create/models/block/granite_cobblestone_stairs.json
+e2fc1797ddb503b887cf0871526e7d889df32a05 assets/create/models/block/granite_cobblestone_stairs_inner.json
+d25cb5553bfd89cd3fca61ebd2204bf2a44cc3da assets/create/models/block/granite_cobblestone_stairs_outer.json
+cf267628d47aa424bc20977e69e255ceda3ddfe4 assets/create/models/block/granite_cobblestone_wall_post.json
+a4f50b75a3186829fc5d62ee4e33997cd202dbd5 assets/create/models/block/granite_cobblestone_wall_side.json
+349a58ac4e4535d0fe9ea467632ed904da2c6098 assets/create/models/block/granite_pillar.json
+a68cd40ffb769b195437107f4a2c2188b222b74a assets/create/models/block/gray_sail.json
+>>>>>>> mc1.15/dev
 6eb5e59e803e1055968b90f3099cd0a17a1d3fd5 assets/create/models/block/gray_seat.json
 7e213be39cc928363bf2b096f055439211050b8d assets/create/models/block/gray_valve_handle.json
+17b651233c62b928f0228562a7f6e7a2b7b2d6b7 assets/create/models/block/green_sail.json
 1438b8ce54ac5557b8f10dcef94f3525eae19461 assets/create/models/block/green_seat.json
 cc7ce9b6bc687ad5027a67c3bf22bdf5bcd71674 assets/create/models/block/green_valve_handle.json
 b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/horizontal_framed_glass.json
@@ -709,6 +825,7 @@ d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_f
 a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/horizontal_framed_glass_pane_post.json
 41645919ece236df5804a5a73ef682720194de34 assets/create/models/block/horizontal_framed_glass_pane_side.json
 8bc0abaabdc62d0c27730dba7eb6da54607b7e96 assets/create/models/block/horizontal_framed_glass_pane_side_alt.json
+<<<<<<< HEAD
 35253c91ed72c7c2ce981c384d334c1113851469 assets/create/models/block/jungle_window.json
 65da656d412d973865f50ab7f02e278fe5398bea assets/create/models/block/jungle_window_pane_noside.json
 9f4144df2e6b35c1fad04e594be5adb3b107bdb8 assets/create/models/block/jungle_window_pane_noside_alt.json
@@ -724,12 +841,33 @@ e1add9f62cf886a7989f7ebb545906da16ad7a41 assets/create/models/block/layered_dolo
 cecf946818c65370b685dfeaade50819183acb41 assets/create/models/block/layered_limestone.json
 258fb9644d396872719c56ae1ca89f50667a1077 assets/create/models/block/layered_scoria.json
 60b05926e706d5dd27f3cb4997120c948797f2f4 assets/create/models/block/layered_weathered_limestone.json
+=======
+2536b29d5d87ba7da1d0f29c791572f67d1bd951 assets/create/models/block/jungle_window.json
+50ad1922e3fcc045c9ea9fc085fdeeb53ab95c7a assets/create/models/block/jungle_window_pane_noside.json
+38e4df0859d04d1a2dd4973b530748eb39c9f6c9 assets/create/models/block/jungle_window_pane_noside_alt.json
+bf353e0eb2f8906a14bc35edd4ba0c0100ac211c assets/create/models/block/jungle_window_pane_post.json
+41db69ebd3815264bba50a842888d436105a5ebf assets/create/models/block/jungle_window_pane_side.json
+45ae3d910768519c5490f0c55c986eb0fef0bccd assets/create/models/block/jungle_window_pane_side_alt.json
+08db5db16af40320d5d28f68d0c59bea8ca4d181 assets/create/models/block/layered_andesite.json
+072766a01b510ab062c22c811577d15a5822b7dc assets/create/models/block/layered_dark_scoria.json
+3592d257cf99bb6aa507a0e4a88fd26bca992e8f assets/create/models/block/layered_diorite.json
+e9b639cb29051249a9999dd05e09eb820159cd40 assets/create/models/block/layered_dolomite.json
+ff78465839cbd36a356cd4153c721c88b1f0b297 assets/create/models/block/layered_gabbro.json
+0fe90b060613a824effaeeff6b3d13399681cbf0 assets/create/models/block/layered_granite.json
+8f1014b1fdef246c2ce525f33ade4f03c85d0217 assets/create/models/block/layered_limestone.json
+9408ce7ba29a96053c9333b15a05d716752392c6 assets/create/models/block/layered_scoria.json
+da71aca99ac5cf3731896be47e15d774397a3330 assets/create/models/block/layered_weathered_limestone.json
+19bd08ad6ac351e6eee2131f7b4c11a768bf8f08 assets/create/models/block/light_blue_sail.json
+>>>>>>> mc1.15/dev
 1a28b07da68d1461cd04c971ae548d94165e0cf3 assets/create/models/block/light_blue_seat.json
 68e01f8d8a31f07f236383e19b49ae1be4cbe3f4 assets/create/models/block/light_blue_valve_handle.json
+73f14b905d5fdb433751a33b963852de6491722a assets/create/models/block/light_gray_sail.json
 292bec1b9f962b17b29147d982a9b177618b7eb9 assets/create/models/block/light_gray_seat.json
 42338c4965da63962ea08077dc9e899aaf4c3c65 assets/create/models/block/light_gray_valve_handle.json
+8292d043ebfe280340526a6a0f96d4160099e213 assets/create/models/block/lime_sail.json
 31c9474210d8535c5417021fe042d4cc31e17328 assets/create/models/block/lime_seat.json
 74008bd0d775b0e2e96b43be2e51d0f3c3abdf21 assets/create/models/block/lime_valve_handle.json
+<<<<<<< HEAD
 fccac0de94fff5f4e180fc9dbddeb0f8ddf3baab assets/create/models/block/limesand.json
 3c49d63386b3f5326051edbf6e2f0f8f0e2ff4f3 assets/create/models/block/limestone.json
 84920646b4df506f94e64611ee231f3af51b5379 assets/create/models/block/limestone_bricks.json
@@ -755,9 +893,35 @@ c54e5a17495f88fa21b3488e8da32a365452c36c assets/create/models/block/limestone_co
 7991d6620d2225b1a026e2b62dc076cf0a33613d assets/create/models/block/linear_chassis_bottom.json
 56e585805c6235552ce5e15ff2f125ff8ec0fa2d assets/create/models/block/linear_chassis_top.json
 12b35c916e3ee83ee4fd1e309c73403dec9a7297 assets/create/models/block/linear_chassis_top_bottom.json
+=======
+ce6fb36a386c895486e021823eb008b0fa4862c3 assets/create/models/block/limesand.json
+a2cbc86d24fdd70c5f33c8b30ba52a8928dde63f assets/create/models/block/limestone.json
+447686a6861773e03c5c18f2de4bc11d06c65f78 assets/create/models/block/limestone_bricks.json
+4aa8f22c5c48b20170f7050ad7ecf65d08c1a6fe assets/create/models/block/limestone_bricks_slab.json
+7a890ab6513ead1b4d20b023e7a04a4d4d8b8c3d assets/create/models/block/limestone_bricks_slab_top.json
+180c37c3ecec8e036a12840b1440c6b9d7b21cef assets/create/models/block/limestone_bricks_stairs.json
+a30fc3563f85b189a16cb4b2af6cbb587b33b354 assets/create/models/block/limestone_bricks_stairs_inner.json
+cb8d4ba5a0e1372520f55ddd659ed8f944700730 assets/create/models/block/limestone_bricks_stairs_outer.json
+bd46a9a9650fc893b0403a4427dace9fc2c0002a assets/create/models/block/limestone_bricks_wall_post.json
+774de72109796d55c5548e4194461ce27083a20d assets/create/models/block/limestone_bricks_wall_side.json
+59202c99e39fc26497cd7c27b2e5edc9b1310457 assets/create/models/block/limestone_cobblestone.json
+fe6a5228bf9ca394b234afd82467efe65544afc2 assets/create/models/block/limestone_cobblestone_slab.json
+d1718b257af8f892a6ed28638399a57cc6c3d8dd assets/create/models/block/limestone_cobblestone_slab_top.json
+3a15866b7c6df7e035afcc4b32321d8dad07d5f8 assets/create/models/block/limestone_cobblestone_stairs.json
+fd0a970c68c7025040bede0a07fef46c9047f611 assets/create/models/block/limestone_cobblestone_stairs_inner.json
+abef3f97c28321ded3bafc90918377981038d7b2 assets/create/models/block/limestone_cobblestone_stairs_outer.json
+eee8ae85daa99fcd594da3d4af393726af69493b assets/create/models/block/limestone_cobblestone_wall_post.json
+0effd13c1ff224f4c2d7017c6505f48d31815934 assets/create/models/block/limestone_cobblestone_wall_side.json
+7336e008b3af80e054c9f15be381b7fe307e97d4 assets/create/models/block/limestone_pillar.json
+20432687c62402a4bc0f2415113e7470231cdf03 assets/create/models/block/linear_chassis.json
+595bfec2293c44deae49147016cb7971bdd721df assets/create/models/block/linear_chassis_bottom.json
+999ce855842170f47db9d1e8e8636c24f7d3ad3d assets/create/models/block/linear_chassis_top.json
+b9abbd1dcf71e0a1416fd998a82a560c06cef5a3 assets/create/models/block/linear_chassis_top_bottom.json
+ec6b5f636e163ff5e361d486cf628ca1af4849a1 assets/create/models/block/magenta_sail.json
+>>>>>>> mc1.15/dev
 cbee001cd1bb1125a97d1bb2d1e6e5a68f129303 assets/create/models/block/magenta_seat.json
 bc5a03a5552eb4a518abefe5e8615f14ee13ca29 assets/create/models/block/magenta_valve_handle.json
-0492070642fda75b943080022368505f2d065730 assets/create/models/block/mechanical_bearing.json
+2e67f27a895c9163a5d1be62897d5e66b119767a assets/create/models/block/mechanical_bearing.json
 edf6ee4e590ebf162c00aa952d992f1bee2cad8a assets/create/models/block/mossy_andesite.json
 55256e4df0038a619d80d3e6c50b0f3e3682e90a assets/create/models/block/mossy_dark_scoria.json
 7b9609eaf8933de6db1a7114fd6631e7d9a16dd1 assets/create/models/block/mossy_diorite.json
@@ -767,6 +931,7 @@ f2f7cda5de21279ff8e359142c523e07a3377477 assets/create/models/block/mossy_granit
 de9b0f933881cc735ae0acf2bd71e6eafa732ff8 assets/create/models/block/mossy_limestone.json
 f88a9558a20033d4955e7b6de4f8aa23b1a11b9f assets/create/models/block/mossy_scoria.json
 8c3296378aa7e5dc1bc7dfdde2f0a436b8bb8b78 assets/create/models/block/mossy_weathered_limestone.json
+<<<<<<< HEAD
 50f28bf7a7de95caf12b4f040994f0f3da72a55a assets/create/models/block/natural_scoria.json
 e3cd8b33b8c5f0543e4f6728a5b3e05642f9efe1 assets/create/models/block/oak_window.json
 54a3b3158f8c914788812aa44515b798b2a9e2f3 assets/create/models/block/oak_window_pane_noside.json
@@ -774,6 +939,16 @@ b9c27f90d4d258e3fdcd713aaa42142f5d46a79e assets/create/models/block/oak_window_p
 8c3fdc51742897d110641ba9127f857297300edb assets/create/models/block/oak_window_pane_post.json
 8f77db5a66b165d2ca85f9119666907dcf65105f assets/create/models/block/oak_window_pane_side.json
 b3e056a176e86660fc2d3a51f9ba8b01eebb56c5 assets/create/models/block/oak_window_pane_side_alt.json
+=======
+24cbd7e60a7769a8fc9f530978ef7094ae65a9eb assets/create/models/block/natural_scoria.json
+269ec2c32ba22a216b1c6831e6284ef98e78ee75 assets/create/models/block/oak_window.json
+f324403f578d724c118055ca04e6bec23607ea90 assets/create/models/block/oak_window_pane_noside.json
+e55363147cc27fba84590c7e24460603988118e3 assets/create/models/block/oak_window_pane_noside_alt.json
+88883e266828422f86ec71db455a41f0279926fd assets/create/models/block/oak_window_pane_post.json
+aa12818d00d1995e5b8a218cb613215ec0161d23 assets/create/models/block/oak_window_pane_side.json
+488dfd3f4bd82ab1b5b751b4a46881befb8d6819 assets/create/models/block/oak_window_pane_side_alt.json
+ff9b51fcaffe54e321b9479f035f4ea7b278bfec assets/create/models/block/orange_sail.json
+>>>>>>> mc1.15/dev
 fda0628a09ef726e3e8323b2f38b6a3e612dc2ca assets/create/models/block/orange_seat.json
 3b07f3f1985495051d173725b01ddd52b5f70ac4 assets/create/models/block/orange_valve_handle.json
 de5ecd753303b2c5dc3819299b9a316f0d7035f6 assets/create/models/block/ornate_iron_window.json
@@ -791,6 +966,7 @@ ca08c15006d65701d72bb88852df884236822522 assets/create/models/block/overgrown_di
 3368bbdf335c81b9e84adc30afeab9261256279c assets/create/models/block/overgrown_limestone.json
 c21c58e982ec0eb1c88948ac53b570b26bf1c9bc assets/create/models/block/overgrown_scoria.json
 6d7842c5c0f58a3cb3150e54bee2b51e7138df45 assets/create/models/block/overgrown_weathered_limestone.json
+<<<<<<< HEAD
 8dfe5334887c09375f2571aa3835f2dd9de76875 assets/create/models/block/oxidized/copper_block_0.json
 3f5af8864db20346df2463066265d7f6709a5e65 assets/create/models/block/oxidized/copper_block_1.json
 ee0f11c96fafc164fd9ac64fde0f89cfd527a65a assets/create/models/block/oxidized/copper_block_2.json
@@ -913,6 +1089,122 @@ f924c6104378768a3a645f5e77f9ed80d2c31e5a assets/create/models/block/paved_weathe
 46e3eeeefd47f7e6007e53bb1b22de2c6c2a5923 assets/create/models/block/paved_weathered_limestone_wall_post.json
 c7941c0bcbdf7ec7e2d34679afac744cf81b7489 assets/create/models/block/paved_weathered_limestone_wall_side.json
 39aaea370e31fa032e471d3b8f0ebf0586ee1a03 assets/create/models/block/paved_weathered_limestone_wall_side_tall.json
+=======
+e151c82942df13d7f4296b6b717b12036c4c47fe assets/create/models/block/oxidized/copper_block_0.json
+35cb12fe13b6f39d2baad9b5a1638b6c5b364513 assets/create/models/block/oxidized/copper_block_1.json
+a7ea046b36c810816dd749727fcc3f1008807c4c assets/create/models/block/oxidized/copper_block_2.json
+e06ed91723927def43bd21d9b26230c07e80151b assets/create/models/block/oxidized/copper_block_3.json
+45dc4f29c527b614ce3b12706342233a6de82fa4 assets/create/models/block/oxidized/copper_block_4.json
+3890ed69f41efe49233c063c572c6bfb8319e37b assets/create/models/block/oxidized/copper_block_5.json
+6b681b9829a2493ee5312d4021e9302cb23d7e28 assets/create/models/block/oxidized/copper_block_6.json
+b1ed190a331ba21ffeba378e9526364874a22a9d assets/create/models/block/oxidized/copper_block_7.json
+375323c5dfaf643cdce4792e2c86ed6033d43412 assets/create/models/block/oxidized/copper_ore_0.json
+e5be33b30e6e83ea1cfdf09201fde1255b0f7a11 assets/create/models/block/oxidized/copper_ore_1.json
+cf9ab024daedfaab9e4f3f35cb788e259c3616a4 assets/create/models/block/oxidized/copper_ore_2.json
+8f24fce14e52cc4082bf292c9ca8043c98023e0a assets/create/models/block/oxidized/copper_ore_3.json
+db2990e91a12fd5c5a039b724da9377bb2a861a2 assets/create/models/block/oxidized/copper_ore_4.json
+ffc37d15dde98e7e03d189f55fca33ac203bd1e0 assets/create/models/block/oxidized/copper_ore_5.json
+4bfbc1352c961f6beeb35ca44bdc8f4084e7edc0 assets/create/models/block/oxidized/copper_ore_6.json
+90daa6f691b18a078eab36a21c0a2d6fadfe20c3 assets/create/models/block/oxidized/copper_ore_7.json
+2a88da386c48ff915c9a7fb6b1d96bde796020bb assets/create/models/block/oxidized/copper_shingles_0.json
+79c45f98817de41f23e2a6a2a2197fdaf3e8ee8b assets/create/models/block/oxidized/copper_shingles_1.json
+0085be85c60675694cfc97d39eb595327c953d02 assets/create/models/block/oxidized/copper_shingles_2.json
+b4987ed1fbd44719e59cf911d606b964d51a734c assets/create/models/block/oxidized/copper_shingles_3.json
+33d060556bd43b1b51f9a990fc802b204f07ceeb assets/create/models/block/oxidized/copper_shingles_4.json
+c9f722cd27fb18239f796eb1fa11a73e5339005a assets/create/models/block/oxidized/copper_shingles_5.json
+4df00795cde9497a0910584c6a53b62bfb18fef1 assets/create/models/block/oxidized/copper_shingles_6.json
+712f8b01330a1aeff2efce5ac1ec2fdd84b622c7 assets/create/models/block/oxidized/copper_shingles_7.json
+d23868f342aa1d821c2971f16b62915d24f257cd assets/create/models/block/oxidized/copper_tiles_0.json
+14d893f509073bc0ee6b8a487d1ec4457f717e7a assets/create/models/block/oxidized/copper_tiles_1.json
+9d531696a9e989ab090f653d50152fcdf0b8519f assets/create/models/block/oxidized/copper_tiles_2.json
+84129b54eb4484c59ad5f3b95b5dea4130a934bc assets/create/models/block/oxidized/copper_tiles_3.json
+0e4b39cd5d14470ee9055c3332d3c930d985e075 assets/create/models/block/oxidized/copper_tiles_4.json
+c3f2f3574f33ea87c8c32a88c60b386b2ce5c59e assets/create/models/block/oxidized/copper_tiles_5.json
+1bdc82a5d6deecaa6e62986bfa4d83ed80cad269 assets/create/models/block/oxidized/copper_tiles_6.json
+4ba81cdb32477181225521b13de34b5cb81d3ab1 assets/create/models/block/oxidized/copper_tiles_7.json
+081d87f990e01211789e9d0dc43acfceb6982aaa assets/create/models/block/paved_andesite.json
+30b9aafb43ecfffcbffdf0aa19b5243e38065ff4 assets/create/models/block/paved_andesite_covered.json
+ab78afb3c487976c2dc5dcefa12153fd4a064ca8 assets/create/models/block/paved_andesite_slab.json
+7883fa378c843ad87593798e8129eb82f6f2e034 assets/create/models/block/paved_andesite_slab_top.json
+d2d8c145ee2ae181370d53224d23df7ec2f3a1c1 assets/create/models/block/paved_andesite_stairs.json
+7481fc2f5a2b3ee2259b410da2c1f35e9bc0dff8 assets/create/models/block/paved_andesite_stairs_inner.json
+1226bf0720fa814125f7718ec5f2216b36e75b81 assets/create/models/block/paved_andesite_stairs_outer.json
+8856b9a15c3239be81cd49a25495367eb755bb9c assets/create/models/block/paved_andesite_wall_post.json
+c5814ebc7106b7d729f444f782cc03b91ebdf66d assets/create/models/block/paved_andesite_wall_side.json
+bee20297f99cb4377b9c478c86db0c10fd59fddc assets/create/models/block/paved_dark_scoria.json
+40a4bc726fa798d6c969dcb0fd8a04941c0e18ff assets/create/models/block/paved_dark_scoria_covered.json
+c7bcf573bc82403bb84ac8df63bec1c445cd8e30 assets/create/models/block/paved_dark_scoria_slab.json
+9f66f54331e40df74c6b63987d6183aca11695d3 assets/create/models/block/paved_dark_scoria_slab_top.json
+5fa06fd6002ec820528623d47ffb67d3c7ac71d9 assets/create/models/block/paved_dark_scoria_stairs.json
+313a75f8469ed545da798ad922b55188af1f152b assets/create/models/block/paved_dark_scoria_stairs_inner.json
+f86a35c6f20a4582311677bd4ed515cfc52f6719 assets/create/models/block/paved_dark_scoria_stairs_outer.json
+f4e0b3486f97dfca7dc0508d807afe037d79a40a assets/create/models/block/paved_dark_scoria_wall_post.json
+a5201829b4ec5ff4f940c1b8d903f6766cb62f46 assets/create/models/block/paved_dark_scoria_wall_side.json
+ed010fd12474e33023399848eaa2560e67fb1786 assets/create/models/block/paved_diorite.json
+9f0f979d9e15a87a909cc7ee523c9efa2fee188f assets/create/models/block/paved_diorite_covered.json
+4dc52f0705c0d3add4abf4273d1021cf907c5f10 assets/create/models/block/paved_diorite_slab.json
+98556b2a6bab79bd34464c5b54b832ae716dccb0 assets/create/models/block/paved_diorite_slab_top.json
+b745c52b431c44683ef6f6eb35d29a795323ac71 assets/create/models/block/paved_diorite_stairs.json
+4a45dccbf43ffd8a3e6d2afb41156e24bf69c262 assets/create/models/block/paved_diorite_stairs_inner.json
+b06dabc15eca7c4d8e41eb784de259a2fb0b32b1 assets/create/models/block/paved_diorite_stairs_outer.json
+e3349e5f33144dca393a08fe573b499917a6491b assets/create/models/block/paved_diorite_wall_post.json
+727dfa282f0f9c9f462243c6b85edd3b964982d5 assets/create/models/block/paved_diorite_wall_side.json
+af2c89fcdaa2e414ca309e3cee25fe316f976269 assets/create/models/block/paved_dolomite.json
+2c907a7d85c6f078fd8c7cab25d7fa0fce95cbb8 assets/create/models/block/paved_dolomite_covered.json
+cd87ae72be668bf69f61b83ca0e8579963556d69 assets/create/models/block/paved_dolomite_slab.json
+a2e38092ec694840be0cd5d0dd632586668166da assets/create/models/block/paved_dolomite_slab_top.json
+1257a4336e687c8a8ae083d7277be594d392df49 assets/create/models/block/paved_dolomite_stairs.json
+876d6a25ac6bd8a69b3a302ccd9f5db6de20855f assets/create/models/block/paved_dolomite_stairs_inner.json
+f352f5468190893ccf05f77fc93c312c1bee75b2 assets/create/models/block/paved_dolomite_stairs_outer.json
+0b280906a41d046dd4340f6cfcf9439abbefa388 assets/create/models/block/paved_dolomite_wall_post.json
+7dd9db1faa5075f4c024a7150bbaa36aa206a004 assets/create/models/block/paved_dolomite_wall_side.json
+bf650bbe4a716461ee6629d55a80e4fdbf186e7d assets/create/models/block/paved_gabbro.json
+3b61df4ad67c9dcc732b1af9efa11ae6fe82c8f0 assets/create/models/block/paved_gabbro_covered.json
+386cfdccfc679e32a4ef3c298a5b17f079b7f40d assets/create/models/block/paved_gabbro_slab.json
+01d58ff2bb85cc74163aa4c6e528ebd5529342a6 assets/create/models/block/paved_gabbro_slab_top.json
+52a5f96e46d53261097a4e190510b64f9f2a4f97 assets/create/models/block/paved_gabbro_stairs.json
+97101aeefced27810dd89adc753b1a3e9526f3b6 assets/create/models/block/paved_gabbro_stairs_inner.json
+648982e8e37f75b4146096dc04e2ce46c69f25dc assets/create/models/block/paved_gabbro_stairs_outer.json
+405bf0ad098f7e525b0b46b2e0810a45ec3f22f2 assets/create/models/block/paved_gabbro_wall_post.json
+2b03c0f5fa9ff9b5a18fb64eb1963ee49a585236 assets/create/models/block/paved_gabbro_wall_side.json
+737ddffd50beb12e64fc651abf6b39eef15678b8 assets/create/models/block/paved_granite.json
+6520e67aedc7f09ae1e0ccf249421dbbbc01c410 assets/create/models/block/paved_granite_covered.json
+cf9afa3923d1dd6f9082ea2579c671663cb12aa2 assets/create/models/block/paved_granite_slab.json
+981101ec1847e17bd7115580995059fcdbb0a39a assets/create/models/block/paved_granite_slab_top.json
+a56941299579280b1ac970802b15b91d0f2af60f assets/create/models/block/paved_granite_stairs.json
+9f98d88d6194a740afe26fab7b510ad0ba7b612a assets/create/models/block/paved_granite_stairs_inner.json
+b1d2b9eaef07034c619ff897d22440a8e3f30624 assets/create/models/block/paved_granite_stairs_outer.json
+d5190b5ebfd581f66a63f7c8af191e484851fb25 assets/create/models/block/paved_granite_wall_post.json
+1313a39aac0091a92ebdcd67efa5682b0fa8b6c2 assets/create/models/block/paved_granite_wall_side.json
+5caa126fbc2aa3e970c04a93b369e43dbe75ba4e assets/create/models/block/paved_limestone.json
+598dab6d11f56cce1d98c46855ccde3f8c3a40db assets/create/models/block/paved_limestone_covered.json
+40b0930304bfbed399e0fe4a46d6d4ee23015060 assets/create/models/block/paved_limestone_slab.json
+7234c2cc3f40224fa881e7347ab72b154e102bb8 assets/create/models/block/paved_limestone_slab_top.json
+7b30942c7e504f0d4656a81bcc11eaa83eddbebb assets/create/models/block/paved_limestone_stairs.json
+ff51dfa74e7c3f7c7f6c05ccafc39333b6c1e1ad assets/create/models/block/paved_limestone_stairs_inner.json
+9e70c6f40945e723ebe1525bfe317c221a1493e6 assets/create/models/block/paved_limestone_stairs_outer.json
+0711327be8ecf3dff399a22f10ed4962c311fc9d assets/create/models/block/paved_limestone_wall_post.json
+7bf11f179347567575bd839b6df5982c54309a47 assets/create/models/block/paved_limestone_wall_side.json
+df6fdefa2a2bdd6ab737244234c907f88cf38070 assets/create/models/block/paved_scoria.json
+3041e4b37080bb6ed2ccaa4e7727791bdac14394 assets/create/models/block/paved_scoria_covered.json
+c2034068ee2c9a9dfa7d7070df8742891a599576 assets/create/models/block/paved_scoria_slab.json
+5d6f360d60157b54c9f676a71390ea5bec4ba1a7 assets/create/models/block/paved_scoria_slab_top.json
+ac2017f2746b34b173eef62cf60586d4a3dacbc3 assets/create/models/block/paved_scoria_stairs.json
+a07f07b9e03f07fa4681b291191a9c15527f956c assets/create/models/block/paved_scoria_stairs_inner.json
+cd54fcdacb9a762bba771ddcfe6d4bd824495e7b assets/create/models/block/paved_scoria_stairs_outer.json
+c495e4fee97b022fd1f3c97ff51543c79bab1cab assets/create/models/block/paved_scoria_wall_post.json
+7524fedd7bf1283eb2ee2747af8031a2cade5f97 assets/create/models/block/paved_scoria_wall_side.json
+651289c401a89ee5a1a21497153067e7e46918cb assets/create/models/block/paved_weathered_limestone.json
+afe2c1f8a14119f3746e741214fd0438bf0ed26a assets/create/models/block/paved_weathered_limestone_covered.json
+f09a45d1d83aad870018f779472510a9d6201a4b assets/create/models/block/paved_weathered_limestone_slab.json
+a36fff1ba5d2b5e40468c106902e083b41a0d20d assets/create/models/block/paved_weathered_limestone_slab_top.json
+cc36e21013b80b1dfa041b55047096db127ffa51 assets/create/models/block/paved_weathered_limestone_stairs.json
+8589358359ef3a2fbe054ca61da13c4042e2f431 assets/create/models/block/paved_weathered_limestone_stairs_inner.json
+743fc37d4c96834f9bd0697ad7990c721436b901 assets/create/models/block/paved_weathered_limestone_stairs_outer.json
+34ba32e570e0a54501db071b9f8c38513edea93d assets/create/models/block/paved_weathered_limestone_wall_post.json
+daf65510d95730bcf0373d746f2a2dbfe6b44fc0 assets/create/models/block/paved_weathered_limestone_wall_side.json
+1b5f9e819cd4b5f5fe6e8c24920b916e8d93c95e assets/create/models/block/pink_sail.json
+>>>>>>> mc1.15/dev
 ecc60ce7ee6b753073a99c597db95d6d9df3d438 assets/create/models/block/pink_seat.json
 7ada61878d3a3c1d3cc33bcf9a80c21b8f9aaff2 assets/create/models/block/pink_valve_handle.json
 84fdb35acc12ae9580496f458def3e49aa0551ea assets/create/models/block/polished_dark_scoria.json
@@ -980,7 +1272,12 @@ c934df1cfe097bcc0f0c21d1b1a3f3b53e50e831 assets/create/models/block/polished_wea
 f22d7d8263dcabd726aa04784031ae9062633579 assets/create/models/block/powered_toggle_latch_off_powered.json
 e6097d9ab9dc9954cbc750020bc33c7a423b73c6 assets/create/models/block/powered_toggle_latch_on_powered.json
 622239a3a09fcac7235b9670eb395a530839a59b assets/create/models/block/pulse_repeater_powered.json
+<<<<<<< HEAD
 d469dce70d15759baed35025b8c7fa403c8b3b26 assets/create/models/block/pulse_repeater_pulsing.json
+=======
+0102e253c941904f12de7acdd46b0079ee3ccf69 assets/create/models/block/pulse_repeater_pulsing.json
+b56fad63b82434564bc41ae9c01e3b427203fb5b assets/create/models/block/purple_sail.json
+>>>>>>> mc1.15/dev
 96adc7865ebe64b43865bc2fe914830c11258856 assets/create/models/block/purple_seat.json
 062406aacf25e099f9b28a3bf7cacfcaa1da4ef6 assets/create/models/block/purple_valve_handle.json
 27d64a828607f94296c0b86cdb35fad996bc5d23 assets/create/models/block/radial_chassis_side_x.json
@@ -989,6 +1286,7 @@ a9885a3f69e3e2a2812c33bafd9140fcc5cc7c25 assets/create/models/block/radial_chass
 92a48c22cf2af0a3156844322f6bb469883608fb assets/create/models/block/radial_chassis_side_y_sticky.json
 522f4733118d6fba172696e9478c8f9fe88b236e assets/create/models/block/radial_chassis_side_z.json
 bffca231a146a6ac49e028f3790cdcbf375e98b0 assets/create/models/block/radial_chassis_side_z_sticky.json
+f0099576080a0f2bb09dd85e55777bad69f9f265 assets/create/models/block/red_sail.json
 12d4f4119b994c5d71c96ab3aa09beb89dad1e10 assets/create/models/block/red_seat.json
 0064825ee3c1702c524d34abb6adb66906586851 assets/create/models/block/red_valve_handle.json
 61ce6e1ba7fee30683c86b09ec35da4fbff8f9cb assets/create/models/block/refined_radiance_casing.json
@@ -1064,6 +1362,8 @@ acf3900465101f9dd78d2301eab1063cdb461582 assets/create/models/block/weathered_li
 8c6feec0411e95f9aae18f9f38b4e045156857e8 assets/create/models/block/weathered_limestone_pillar.json
 1377e12f56dce1466ce44078d7154870c5cf7b2a assets/create/models/block/white_seat.json
 899f33d51cf36cb1c283bc7e6363f9d451e5736e assets/create/models/block/white_valve_handle.json
+f2bee22fe03ac047fbe73ca2c5c759f09bf646df assets/create/models/block/windmill_bearing.json
+071ca07daceea4d0db7ed41e815d47589fdb14b7 assets/create/models/block/yellow_sail.json
 0a0e2cc973e35586ae00ed17b919383868e992e8 assets/create/models/block/yellow_seat.json
 55edee7b0833ab19b98694fab21ae0c8e91f76fd assets/create/models/block/yellow_valve_handle.json
 36c27bad342c82aa8dc097da87637dca042cce17 assets/create/models/block/zinc_block.json
@@ -1116,8 +1416,13 @@ afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets/create/models/item/chiseled_gabb
 a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets/create/models/item/chiseled_scoria.json
 70232ce9b88119fb383717e2c1ad113f7aad6a99 assets/create/models/item/chiseled_weathered_limestone.json
 fe67c3f380d17735a9436a4579a8be1a02b8e4a0 assets/create/models/item/chute.json
+<<<<<<< HEAD
 6680a68526576ded5dac2aa3bc9fb9de3e744146 assets/create/models/item/cinder_flour.json
 b1531a7bd3f7f27b9587d13e818a93dc2d088bc8 assets/create/models/item/clockwork_bearing.json
+=======
+d418205c83d3e57c830755ee8c09e2962353e493 assets/create/models/item/cinder_flour.json
+c1da21be9f1af4f7a2ef4ec9cd92195d65ada316 assets/create/models/item/clockwork_bearing.json
+>>>>>>> mc1.15/dev
 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets/create/models/item/clutch.json
 dcb09deae110077bcddf090996b51cc66e9a7de3 assets/create/models/item/cogwheel.json
 7717e3b21cff39f497f07687c70c1fa40eaa756d assets/create/models/item/content_observer.json
@@ -1294,7 +1599,7 @@ d245aa4994ff197b1ffeb7980d05f96bd20cdeb3 assets/create/models/item/linear_chassi
 d912be3e87f2beaa8e22747f867739139667241b assets/create/models/item/magenta_seat.json
 928c5e3747fb758d2610475258cc168b0d4ee7b6 assets/create/models/item/magenta_valve_handle.json
 932facf4bf93b471e8630f4132a4284a9f4d0d39 assets/create/models/item/mechanical_arm.json
-49dcc373c33f6fc3760add10eb51bd96cd4fd028 assets/create/models/item/mechanical_bearing.json
+e19c7a06697adc2da9d66c5c81e1c6ff131acb65 assets/create/models/item/mechanical_bearing.json
 65ac4f19973ddeb1bb4d672f57319130e736e116 assets/create/models/item/mechanical_crafter.json
 b416a3a2545a63d6839f7f2cb958c58e485a7eb6 assets/create/models/item/mechanical_drill.json
 bbf18e5d54128375139c712e93b35ec25f59f2d0 assets/create/models/item/mechanical_harvester.json
@@ -1303,7 +1608,7 @@ f8d0d4b2a890ea7a69ab0c390947b48fe0478d3f assets/create/models/item/mechanical_pi
 726ae61699dc379a4f535c1be3ec2672a2f03583 assets/create/models/item/mechanical_plough.json
 6c2acb80e53256fbb85f76851f335f9248ace6da assets/create/models/item/mechanical_press.json
 4e363477e3e8059dd7b2bad04046521b31923d1b assets/create/models/item/mechanical_pump.json
-bca99d467ec8ead10124becb60ac24b39be83de4 assets/create/models/item/mechanical_saw.json
+3fc1fcb2016d2782c3667c21575423122b66705a assets/create/models/item/mechanical_saw.json
 0eb5726c8c0de462f432411c210d6132b2c446a4 assets/create/models/item/millstone.json
 363c5a2b8ac945b676c838cdf7b0494c3ab13599 assets/create/models/item/minecart_contraption.json
 01e3fda31e549a3b6a1e5e615b59478e8f06f16a assets/create/models/item/minecart_coupling.json
@@ -1419,9 +1724,16 @@ ef52b3734a47e96c5f83d60da73110e925737933 assets/create/models/item/refined_radia
 6daff6b82b33374d7add65e352e05ecb2fd9ebdd assets/create/models/item/rope_pulley.json
 0817505d2d3ee516424100b985ca3fe2d2e7f01e assets/create/models/item/rose_quartz.json
 acfbf487ee65c2c58d89cb2644e33fda75751fde assets/create/models/item/rotation_speed_controller.json
+<<<<<<< HEAD
 5fa0bfe8642e2614a7e97d27af1a95dd2e012097 assets/create/models/item/sand_paper.json
 3202829de06e9c532dc8a61c955458648b70d645 assets/create/models/item/schematic.json
 3f07bc7d4587d78de463ae2ce236e4f363b923cd assets/create/models/item/schematic_and_quill.json
+=======
+171c343f7f536008f79ea1d63e0a443d064e9ef1 assets/create/models/item/sail_frame.json
+be86c8156d55d2f128feb66abd70923b3be765cc assets/create/models/item/sand_paper.json
+69196df5122a27573112dad49b334dea96aafed0 assets/create/models/item/schematic.json
+533483999f61e3b091af567a473875247edaedb3 assets/create/models/item/schematic_and_quill.json
+>>>>>>> mc1.15/dev
 8dd5caa4d7a0ee45bd9b39e09c4503159933d089 assets/create/models/item/schematic_table.json
 0a1c4080ca572106c19a0ba6e2df4baba5f45d35 assets/create/models/item/schematicannon.json
 22a6dfdc3cbb1b6ac20ec123b490e15c72dfbfcf assets/create/models/item/scoria.json
@@ -1467,10 +1779,17 @@ f2cd30c585a25e336868ee4f8dd80799ecb986c6 assets/create/models/item/weathered_lim
 3d26cb5616182ba6926d0bf703119ebfbeacbe31 assets/create/models/item/weathered_limestone_cobblestone_stairs.json
 ea1d735b557a71bbb2b35e5f03ba571d54c38dbe assets/create/models/item/weathered_limestone_cobblestone_wall.json
 40bed7f5e9e97da45c5d9cebc3fcf87b2b13a808 assets/create/models/item/weathered_limestone_pillar.json
+<<<<<<< HEAD
 30c449f637e8d56b7670b81ec2a90942e2972739 assets/create/models/item/wheat_flour.json
 9502a51ed2f6a110b6d41731a5948be4d70c8af8 assets/create/models/item/whisk.json
+=======
+8914910270736f8f15364c623cd08d4638383cc5 assets/create/models/item/wheat_flour.json
+0cc80844db689404d4722c93f1002b0bed05edcd assets/create/models/item/whisk.json
+c6253e0f8db3c3992d3f78fe5045e276d39d5b22 assets/create/models/item/white_sail.json
+>>>>>>> mc1.15/dev
 69328eb4f91c4407fbcad5e3c4b88363f1a9572c assets/create/models/item/white_seat.json
 be7a2d59d43083d7f2427193dcb9d68004224dd3 assets/create/models/item/white_valve_handle.json
+d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bearing.json
 2527b52413965a3e84b4718e08a9b8bb30a741ea assets/create/models/item/wrench.json
 4b49bc2418410cded5f0b7da3430f1a22e049f18 assets/create/models/item/yellow_seat.json
 790daf016f980801e7587b548a325082c65f6f03 assets/create/models/item/yellow_valve_handle.json
@@ -1617,6 +1936,7 @@ f639481c8e1485019bf120463e67811b6d2d8ef9 data/create/advancements/recipes/create
 dba0696069fe0850120dc6e1ca1ab741b0fe6d21 data/create/advancements/recipes/create.base/crafting/kinetics/red_valve_handle_from_other_valve_handle.json
 74522fbb454832fc0eefa5f52b82b7d7d4e9b7fb data/create/advancements/recipes/create.base/crafting/kinetics/rope_pulley.json
 48e29ec1b301bf4857db06913ee340f49d61cdf9 data/create/advancements/recipes/create.base/crafting/kinetics/rotation_speed_controller.json
+e9faf71b9597deecd2c1fb566f3c438ddc243e82 data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json
 b463cf9343f8d08b8ed3e87f46a19facadd657b0 data/create/advancements/recipes/create.base/crafting/kinetics/secondary_linear_chassisfrom_conversion.json
 191213ef824e7b73d66bb3aecc3115306b445e5a data/create/advancements/recipes/create.base/crafting/kinetics/sequenced_gearshift.json
 cd8cefee21a1690f9158b8e8661a92d20ad0f535 data/create/advancements/recipes/create.base/crafting/kinetics/shaft.json
@@ -1631,9 +1951,11 @@ f3fc3d4fee0712906f833aa17185f0bacb21922f data/create/advancements/recipes/create
 89401c0a6dffa62dbffdbb63986f580a4878402e data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearboxfrom_conversion.json
 4ab6ae87b6c3a29c0c2966dad2fa335a39fafe78 data/create/advancements/recipes/create.base/crafting/kinetics/water_wheel.json
 7c146cc51139c2a8e287a60c8d645fa6f6f48cb1 data/create/advancements/recipes/create.base/crafting/kinetics/whisk.json
+f876dcbd2877c921613a4af481c89d66664c1ea8 data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json
 37e545b016a7c5cd283168ac71ace6467a5ad3ef data/create/advancements/recipes/create.base/crafting/kinetics/white_seat.json
 856760c4b120f7b29a94dd22fe04d62df061d409 data/create/advancements/recipes/create.base/crafting/kinetics/white_seat_from_other_seat.json
 b73e6f8b89e6ef94167b6fa3d0837a27222edb01 data/create/advancements/recipes/create.base/crafting/kinetics/white_valve_handle_from_other_valve_handle.json
+6b783787a32446a39bb553359a7db58f71492a42 data/create/advancements/recipes/create.base/crafting/kinetics/windmill_bearing.json
 ddbe7ae23f48dcaee3ad44a0e597c24380b51682 data/create/advancements/recipes/create.base/crafting/kinetics/wrench.json
 14c1cac4545f544a78bfd80cf7dd6355794c6679 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat.json
 e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json
@@ -2115,9 +2437,11 @@ d3202a337c15c8b8ec41fa5879bb94327bb75057 data/create/loot_tables/blocks/andesite
 c7f81e30c31837a287d6d6040cdb02c7dec11441 data/create/loot_tables/blocks/belt.json
 67a8e2513c3cb09e6fe80279fda94f79d5018c37 data/create/loot_tables/blocks/birch_window.json
 bf1d5843f93533f84bc4adec5b77da2114fa2025 data/create/loot_tables/blocks/birch_window_pane.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/black_sail.json
 cccc209d172cc7bac76f1b4ac79085ee90742ab2 data/create/loot_tables/blocks/black_seat.json
 f3573f47b8a914aa222633893e158f84fcd6f3d8 data/create/loot_tables/blocks/black_valve_handle.json
 a2313c9b7d114396fca3c86a740d23fce3873679 data/create/loot_tables/blocks/blaze_burner.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/blue_sail.json
 3834f7ac2bbc42cead02d4973842adb9ad97e6bf data/create/loot_tables/blocks/blue_seat.json
 fcddccd1bf45c2f4ad5f1520e209a4f04487274a data/create/loot_tables/blocks/blue_valve_handle.json
 1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data/create/loot_tables/blocks/brass_belt_funnel.json
@@ -2125,6 +2449,7 @@ fcddccd1bf45c2f4ad5f1520e209a4f04487274a data/create/loot_tables/blocks/blue_val
 8a14258ad5d79d9e4dc5a318905644b446196420 data/create/loot_tables/blocks/brass_casing.json
 1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data/create/loot_tables/blocks/brass_funnel.json
 6c8e784677d1a843b6c707484c79751acdb46ebc data/create/loot_tables/blocks/brass_tunnel.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/brown_sail.json
 d415862a0abe20e8c5c2c8125bb672065330a9bc data/create/loot_tables/blocks/brown_seat.json
 fedfe922f568c06adc2dfdd641b9abc90ba5af8a data/create/loot_tables/blocks/brown_valve_handle.json
 0be542fef3bc0e1a0d556883568a1400a8b97df1 data/create/loot_tables/blocks/cart_assembler.json
@@ -2150,6 +2475,7 @@ d8f2f8921b9200b1d9476a77ee1be32c25308ac3 data/create/loot_tables/blocks/creative
 c28fa42746a4d5ca2f824001b67e58673810169e data/create/loot_tables/blocks/crushing_wheel.json
 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/crushing_wheel_controller.json
 d370ee874b5b6b98e9a8c368218fe61f644d956d data/create/loot_tables/blocks/cuckoo_clock.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/cyan_sail.json
 49a14b9e93abdf02a7aef9c0c4085ac89617fae4 data/create/loot_tables/blocks/cyan_seat.json
 fe24fd296812fea3f838defa2ca6270523d9d48e data/create/loot_tables/blocks/cyan_valve_handle.json
 fd309e1d39dcbcb25c3361edecd8c9afa0f847d0 data/create/loot_tables/blocks/dark_oak_window.json
@@ -2254,8 +2580,10 @@ fa0ddf45d108f55550164113cb5cfd002586a9d4 data/create/loot_tables/blocks/granite_
 feca8a1f62e0e13fcb2252d5f782d74938b84431 data/create/loot_tables/blocks/granite_cobblestone_stairs.json
 1d225a68b09d6f389aa7ed48aa05979bdaa482a9 data/create/loot_tables/blocks/granite_cobblestone_wall.json
 87a4ac3db5ec80613b940abccc72fc4b37cee0ba data/create/loot_tables/blocks/granite_pillar.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/gray_sail.json
 d014357b3a467b23473c8223f32471a04a9ff94c data/create/loot_tables/blocks/gray_seat.json
 35f916fd0f8465a070270615dbddd716ff68d5bb data/create/loot_tables/blocks/gray_valve_handle.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/green_sail.json
 a71599eecd3f1179e3d0367623460e798828aa6d data/create/loot_tables/blocks/green_seat.json
 865ebead9601b29e6326dc9e1d4c1ca92f3b7a3b data/create/loot_tables/blocks/green_valve_handle.json
 9bdc47ea3ffc52f037f12f40f387e6b72a352c4e data/create/loot_tables/blocks/hand_crank.json
@@ -2273,10 +2601,13 @@ fa8a5922f7346a15a80b5c7e5dfc26d24ea98728 data/create/loot_tables/blocks/layered_
 197ecf9c00c06f6014ecbec678a5466492902cb0 data/create/loot_tables/blocks/layered_limestone.json
 0ec9e366708637a01e600a2a12cc267d81b3f69b data/create/loot_tables/blocks/layered_scoria.json
 54816065cd735dfe53b1eb551110ba18c6e3746a data/create/loot_tables/blocks/layered_weathered_limestone.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/light_blue_sail.json
 b403848d3a4b4ad7a048e70c21e200e40d0c67e3 data/create/loot_tables/blocks/light_blue_seat.json
 32afe3fff74ccda4151567961fa6c0b8e3735358 data/create/loot_tables/blocks/light_blue_valve_handle.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/light_gray_sail.json
 0cc2b20cb6e2dae6cf9d759c85926663f6066c99 data/create/loot_tables/blocks/light_gray_seat.json
 8cc64a1dfb7ce7be2c063248d912c68ad2fe999c data/create/loot_tables/blocks/light_gray_valve_handle.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/lime_sail.json
 f7893090c6ecb4862c90c408b7f9ce8316f8b608 data/create/loot_tables/blocks/lime_seat.json
 cae6d16c8967164698efbce3b91018a8e79a81e9 data/create/loot_tables/blocks/lime_valve_handle.json
 7dfd638cc6f0d22bbc8fcbdb7212a3bfc8c85223 data/create/loot_tables/blocks/limesand.json
@@ -2291,6 +2622,7 @@ cb315814960850b5080598b89ee94c833b5048f7 data/create/loot_tables/blocks/limeston
 92fb16606f289ad33860270d098fad2522b24e09 data/create/loot_tables/blocks/limestone_cobblestone_wall.json
 371115e5ceb08c07a9ab2371509960c31e0baa8a data/create/loot_tables/blocks/limestone_pillar.json
 aa751d2e8a7889907c08c4bec6f6ca266230b6d7 data/create/loot_tables/blocks/linear_chassis.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/magenta_sail.json
 9e5e017cd3b4f544f487a5ca22ef610a4addc8ec data/create/loot_tables/blocks/magenta_seat.json
 517e983d7387ec0d86845d4cf3deaa6d68c71170 data/create/loot_tables/blocks/magenta_valve_handle.json
 e64c32da44b7e92dbef36fcb448c42b9bd9ae47c data/create/loot_tables/blocks/mechanical_arm.json
@@ -2322,6 +2654,7 @@ d3ea271bb5774c73d44ab2e73195c9d5a4ff9c92 data/create/loot_tables/blocks/nixie_tu
 6237eb3999181f1db09ca01b08e7785b70722d3b data/create/loot_tables/blocks/nozzle.json
 0b2b142cfb3ebe9d4506e498a8e31f48d00db58d data/create/loot_tables/blocks/oak_window.json
 90cc4d5857f47c48e2b82f394de9567023c5c8ce data/create/loot_tables/blocks/oak_window_pane.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/orange_sail.json
 2333aaea940816b6bc8454ba24e0c9f52af94ac0 data/create/loot_tables/blocks/orange_seat.json
 13338687962ef5b48dd9d142a2a862637d5c6953 data/create/loot_tables/blocks/orange_valve_handle.json
 267e9e24fac93e3496a80fcb6ed8e9d1c329d2d2 data/create/loot_tables/blocks/ornate_iron_window.json
@@ -2371,6 +2704,7 @@ dfeba5c6de20e9ec0252e43b7c4046f017284d3d data/create/loot_tables/blocks/paved_we
 32eed137f13c25a7b9db2fb457901e0c03cabb16 data/create/loot_tables/blocks/paved_weathered_limestone_slab.json
 67b9227237ed2a8c09c4183c0f2ab1b3bd07084b data/create/loot_tables/blocks/paved_weathered_limestone_stairs.json
 d3e4ab984aef19ee21a1c5b868eb3fde96c05afd data/create/loot_tables/blocks/paved_weathered_limestone_wall.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/pink_sail.json
 6f32e1217986407e41358e9417de63602c78e810 data/create/loot_tables/blocks/pink_seat.json
 d85b09659f08a73513c57b1b2e5ec7fc4b6f340a data/create/loot_tables/blocks/pink_valve_handle.json
 1087b6c6d88dc7c71ed81e1d3e180fe065e6d098 data/create/loot_tables/blocks/piston_extension_pole.json
@@ -2403,9 +2737,11 @@ fbe98efcb1a5970b6795fdbbb671fee704c0945f data/create/loot_tables/blocks/portable
 a3fb7d3e3bf9dc73ce754002f10c469d57db1f71 data/create/loot_tables/blocks/powered_toggle_latch.json
 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/pulley_magnet.json
 e8fb62c91226ac107dee45c5ebc54c8dd0aee224 data/create/loot_tables/blocks/pulse_repeater.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/purple_sail.json
 d7f6caa568e6508177a644fb78dc18ce26c9b2c0 data/create/loot_tables/blocks/purple_seat.json
 773e4dc856044dabfe9d2323cbda0460dfb626ee data/create/loot_tables/blocks/purple_valve_handle.json
 768420dab8785909891e52c4d77a182d99ba11d3 data/create/loot_tables/blocks/radial_chassis.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/red_sail.json
 71b0fa3b174efe94a2a735ab2426c376c0ef674a data/create/loot_tables/blocks/red_seat.json
 59ee0fd35978068fbce0882e0b207db7eeb202c0 data/create/loot_tables/blocks/red_valve_handle.json
 f5907a694206facc01f61f3428f72488486761c7 data/create/loot_tables/blocks/redstone_contact.json
@@ -2415,6 +2751,7 @@ f5907a694206facc01f61f3428f72488486761c7 data/create/loot_tables/blocks/redstone
 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/rope.json
 cecaac07bd275bb1ae9e302f0bf44b581e74105d data/create/loot_tables/blocks/rope_pulley.json
 aa6af37356d65105efab2503ffe75f778cfe873b data/create/loot_tables/blocks/rotation_speed_controller.json
+30de11bec82606fead9d6bff7bba0232e97f1039 data/create/loot_tables/blocks/sail_frame.json
 069701cb804b6522c18624a0d4f3f949ff8b0281 data/create/loot_tables/blocks/schematic_table.json
 c4a89145334addfd0dd1fedf7fa75ba07a7d3490 data/create/loot_tables/blocks/schematicannon.json
 af1bbbb8236b4ab05a6a8edc6db960bc758cbdf3 data/create/loot_tables/blocks/scoria.json
@@ -2455,8 +2792,11 @@ c2a62f12680d04ed4f586c501bb026e367243dd2 data/create/loot_tables/blocks/weathere
 a89f425c47c3831071b556697169a3124370aed7 data/create/loot_tables/blocks/weathered_limestone_cobblestone_stairs.json
 e8f3af61d9a2fd1ff5b32c9bb474ed005e6d70c4 data/create/loot_tables/blocks/weathered_limestone_cobblestone_wall.json
 54358a64639957cc66ffa5296ff45723f7adf00e data/create/loot_tables/blocks/weathered_limestone_pillar.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/white_sail.json
 969eda31556feb5a68e350762848d17453275fee data/create/loot_tables/blocks/white_seat.json
 79fe374f8e677088f928a3a49ff5eeed6128d165 data/create/loot_tables/blocks/white_valve_handle.json
+941ea78ea7c0f0061c3d3569ecea333ae6a16bf1 data/create/loot_tables/blocks/windmill_bearing.json
+28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/yellow_sail.json
 37ead431a278928a09b260ae06a448e2c791a73e data/create/loot_tables/blocks/yellow_seat.json
 899bb208908a2f9bec5e544ff47526f3e24db720 data/create/loot_tables/blocks/yellow_valve_handle.json
 94661e726b3d19271550359ae898a5590939512e data/create/loot_tables/blocks/zinc_block.json
@@ -2550,7 +2890,7 @@ b7fa20d10c0e0e7270b1c0d6f3881b8e25b39bea data/create/recipes/crafting/kinetics/g
 9899501f18e7f3452d4ab4bf658079ab414aa176 data/create/recipes/crafting/kinetics/green_seat.json
 6f65a84e00f25d956a6ae834678ff781569b243a data/create/recipes/crafting/kinetics/green_seat_from_other_seat.json
 63edaccace961a65aa7bd406d36894c7ca4816b8 data/create/recipes/crafting/kinetics/green_valve_handle_from_other_valve_handle.json
-9af4b862db77034f61d2d35e45db00f8dda6dc4b data/create/recipes/crafting/kinetics/hand_crank.json
+9f08bdaeec88e04a43c2dc103869f9648deee079 data/create/recipes/crafting/kinetics/hand_crank.json
 237541c1c318b8426734c1c43be31fbd01413d39 data/create/recipes/crafting/kinetics/large_cogwheel.json
 a33e3301fc6d3a446e61a1c4b8a93aff079baeba data/create/recipes/crafting/kinetics/light_blue_seat.json
 958bb5d3aeb8d8e5dbf5d97cf5fd9ff5151575dc data/create/recipes/crafting/kinetics/light_blue_seat_from_other_seat.json
@@ -2598,6 +2938,7 @@ af84b939ced1c0254a27469f857f571afbadc4f6 data/create/recipes/crafting/kinetics/r
 5a10019d23726940152e26af3239d55d16bc7880 data/create/recipes/crafting/kinetics/red_valve_handle_from_other_valve_handle.json
 af525e135eb927b64462120d201ecae7a7ec61ed data/create/recipes/crafting/kinetics/rope_pulley.json
 e9f1597d40f62c2247b319303f375f0da271346f data/create/recipes/crafting/kinetics/rotation_speed_controller.json
+d0d7fb94621f6f02fa3137666f20e677022d9d5b data/create/recipes/crafting/kinetics/sail_frame.json
 66922e18791c87fadb7629cdf32d3dd2f50ccd13 data/create/recipes/crafting/kinetics/secondary_linear_chassisfrom_conversion.json
 a17db27e61baa45f8a6ecb46a6d2a5a464704f8b data/create/recipes/crafting/kinetics/sequenced_gearshift.json
 2e36438665bfb97265fd4e6ea85505970eae67fd data/create/recipes/crafting/kinetics/shaft.json
@@ -2612,9 +2953,11 @@ af5854ee2fa3be195ad9abcdeebe6ed7306b651c data/create/recipes/crafting/kinetics/s
 057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json
 4fb009b86a51b2e259bd1f73848803f6276dd820 data/create/recipes/crafting/kinetics/water_wheel.json
 f508d510576c93712e7f5265345a32e8818bbf0d data/create/recipes/crafting/kinetics/whisk.json
+d80a741d2f0d4f742217b43d7e4d37f003ec9f9d data/create/recipes/crafting/kinetics/white_sail.json
 f4d88aa2edea548d29cf2678a111d8bb5db7720a data/create/recipes/crafting/kinetics/white_seat.json
 7e0d276cd56f04f35d02c25810bffdf8fc297fcd data/create/recipes/crafting/kinetics/white_seat_from_other_seat.json
 4d3890621caa0bdbb752a395c1f5761dbbc1121e data/create/recipes/crafting/kinetics/white_valve_handle_from_other_valve_handle.json
+8508255518d3718a0d8c2f536f69ffe9ed48a855 data/create/recipes/crafting/kinetics/windmill_bearing.json
 3ec8bb5660656f1c676035d8ba5460462c1d1865 data/create/recipes/crafting/kinetics/wrench.json
 5579e58473474c4e59efd1ee39ddf0140d66b618 data/create/recipes/crafting/kinetics/yellow_seat.json
 f055d233ac7ee9eac840a658afa01bedd793ff38 data/create/recipes/crafting/kinetics/yellow_seat_from_other_seat.json
@@ -3184,12 +3527,20 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone
 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json
 f9ecec40e11a87de73c9dc7c2963c1cb10b1a180 data/create/tags/blocks/brittle.json
 246ee2ec4e778e38a362f319506564886d4e0e76 data/create/tags/blocks/fan_heaters.json
+<<<<<<< HEAD
 798ef82869dbe22682121504a372e95607a785dc data/create/tags/blocks/fan_transparent.json
 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/non_movable.json
 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json
 50936b211d94167a35ec78c89954082a336b6269 data/create/tags/blocks/valve_handles.json
 7fa13854a216ee49c0ae3b1e0e23c4cd1fbc4859 data/create/tags/blocks/windmill_sails.json
 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/windowable.json
+=======
+551299f2f784435859bef13057c2b033eaefc784 data/create/tags/blocks/fan_transparent.json
+c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json
+6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json
+50936b211d94167a35ec78c89954082a336b6269 data/create/tags/blocks/valve_handles.json
+eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails.json
+>>>>>>> mc1.15/dev
 081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data/create/tags/items/create_ingots.json
 d2dc4ff179ef7b2aa9276455c196e15d44aa95a8 data/create/tags/items/crushed_ores.json
 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json

src/generated/resources/assets/create/blockstates/black_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/black_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/black_sail"
+    },
+    "facing=north": {
+      "model": "create:block/black_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/black_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/black_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/black_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/blue_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/blue_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/blue_sail"
+    },
+    "facing=north": {
+      "model": "create:block/blue_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/blue_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/blue_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/blue_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/brown_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/brown_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/brown_sail"
+    },
+    "facing=north": {
+      "model": "create:block/brown_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/brown_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/brown_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/brown_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/cyan_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/cyan_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/cyan_sail"
+    },
+    "facing=north": {
+      "model": "create:block/cyan_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/cyan_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/cyan_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/cyan_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/gray_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/gray_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/gray_sail"
+    },
+    "facing=north": {
+      "model": "create:block/gray_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/gray_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/gray_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/gray_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/green_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/green_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/green_sail"
+    },
+    "facing=north": {
+      "model": "create:block/green_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/green_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/green_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/green_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/light_blue_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/light_blue_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/light_blue_sail"
+    },
+    "facing=north": {
+      "model": "create:block/light_blue_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/light_blue_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/light_blue_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/light_blue_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/light_gray_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/light_gray_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/light_gray_sail"
+    },
+    "facing=north": {
+      "model": "create:block/light_gray_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/light_gray_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/light_gray_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/light_gray_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/lime_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/lime_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/lime_sail"
+    },
+    "facing=north": {
+      "model": "create:block/lime_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/lime_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/lime_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/lime_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/magenta_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/magenta_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/magenta_sail"
+    },
+    "facing=north": {
+      "model": "create:block/magenta_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/magenta_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/magenta_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/magenta_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/orange_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/orange_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/orange_sail"
+    },
+    "facing=north": {
+      "model": "create:block/orange_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/orange_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/orange_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/orange_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/pink_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/pink_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/pink_sail"
+    },
+    "facing=north": {
+      "model": "create:block/pink_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/pink_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/pink_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/pink_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/purple_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/purple_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/purple_sail"
+    },
+    "facing=north": {
+      "model": "create:block/purple_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/purple_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/purple_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/purple_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/radial_chassis.json

@@ -89,8 +89,8 @@
     },
     {
       "when": {
-        "sticky_west": "true",
+        "axis": "x",
-        "axis": "x"
+        "sticky_west": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x_sticky",
@@ -99,8 +99,8 @@
     },
     {
       "when": {
-        "sticky_west": "true",
+        "axis": "y",
-        "axis": "y"
+        "sticky_west": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y_sticky",
@@ -109,8 +109,8 @@
     },
     {
       "when": {
-        "sticky_west": "true",
+        "axis": "z",
-        "axis": "z"
+        "sticky_west": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z_sticky",
@@ -119,8 +119,8 @@
     },
     {
       "when": {
-        "sticky_west": "false",
+        "axis": "x",
-        "axis": "x"
+        "sticky_west": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x",
@@ -129,8 +129,8 @@
     },
     {
       "when": {
-        "sticky_west": "false",
+        "axis": "y",
-        "axis": "y"
+        "sticky_west": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y",
@@ -139,8 +139,8 @@
     },
     {
       "when": {
-        "sticky_west": "false",
+        "axis": "z",
-        "axis": "z"
+        "sticky_west": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z",
@@ -207,8 +207,8 @@
     },
     {
       "when": {
-        "sticky_east": "true",
+        "axis": "x",
-        "axis": "x"
+        "sticky_east": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x_sticky",
@@ -217,8 +217,8 @@
     },
     {
       "when": {
-        "sticky_east": "true",
+        "axis": "y",
-        "axis": "y"
+        "sticky_east": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y_sticky",
@@ -227,8 +227,8 @@
     },
     {
       "when": {
-        "sticky_east": "true",
+        "axis": "z",
-        "axis": "z"
+        "sticky_east": "true"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z_sticky"
@@ -236,8 +236,8 @@
     },
     {
       "when": {
-        "sticky_east": "false",
+        "axis": "x",
-        "axis": "x"
+        "sticky_east": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_x",
@@ -246,8 +246,8 @@
     },
     {
       "when": {
-        "sticky_east": "false",
+        "axis": "y",
-        "axis": "y"
+        "sticky_east": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_y",
@@ -256,8 +256,8 @@
     },
     {
       "when": {
-        "sticky_east": "false",
+        "axis": "z",
-        "axis": "z"
+        "sticky_east": "false"
       },
       "apply": {
         "model": "create:block/radial_chassis_side_z"

src/generated/resources/assets/create/blockstates/red_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/red_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/red_sail"
+    },
+    "facing=north": {
+      "model": "create:block/red_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/red_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/red_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/red_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/sail_frame.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/sail_frame",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/sail_frame"
+    },
+    "facing=north": {
+      "model": "create:block/sail_frame",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/sail_frame",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/sail_frame",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/sail_frame",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/white_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/white_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/white_sail"
+    },
+    "facing=north": {
+      "model": "create:block/white_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/white_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/white_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/white_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/windmill_bearing.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/windmill_bearing",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/windmill_bearing"
+    },
+    "facing=north": {
+      "model": "create:block/windmill_bearing",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/windmill_bearing",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/windmill_bearing",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/windmill_bearing",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/create/blockstates/yellow_sail.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create:block/yellow_sail",
+      "x": 180
+    },
+    "facing=up": {
+      "model": "create:block/yellow_sail"
+    },
+    "facing=north": {
+      "model": "create:block/yellow_sail",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create:block/yellow_sail",
+      "x": 90,
+      "y": 180
+    },
+    "facing=west": {
+      "model": "create:block/yellow_sail",
+      "x": 90,
+      "y": 270
+    },
+    "facing=east": {
+      "model": "create:block/yellow_sail",
+      "x": 90,
+      "y": 90
+    }
+  }
+}

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

@@ -23,9 +23,11 @@
   "block.create.belt": "\u0287\u05DF\u01DD\u15FA",
   "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA",
   "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA",
+  "block.create.black_sail": "\u05DF\u0131\u0250S \u029E\u0254\u0250\u05DF\u15FA",
   "block.create.black_seat": "\u0287\u0250\u01DDS \u029E\u0254\u0250\u05DF\u15FA",
   "block.create.black_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u029E\u0254\u0250\u05DF\u15FA",
   "block.create.blaze_burner": "\u0279\u01DDu\u0279n\u15FA \u01DDz\u0250\u05DF\u15FA",
+  "block.create.blue_sail": "\u05DF\u0131\u0250S \u01DDn\u05DF\u15FA",
   "block.create.blue_seat": "\u0287\u0250\u01DDS \u01DDn\u05DF\u15FA",
   "block.create.blue_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DDn\u05DF\u15FA",
   "block.create.brass_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA ss\u0250\u0279\u15FA",
@@ -33,6 +35,7 @@
   "block.create.brass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u0279\u15FA",
   "block.create.brass_funnel": "\u05DF\u01DDuun\u2132 ss\u0250\u0279\u15FA",
   "block.create.brass_tunnel": "\u05DF\u01DDuun\u27D8 ss\u0250\u0279\u15FA",
+  "block.create.brown_sail": "\u05DF\u0131\u0250S u\u028Do\u0279\u15FA",
   "block.create.brown_seat": "\u0287\u0250\u01DDS u\u028Do\u0279\u15FA",
   "block.create.brown_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u028Do\u0279\u15FA",
   "block.create.cart_assembler": "\u0279\u01DD\u05DFq\u026F\u01DDss\u2C6F \u0287\u0279\u0250\u0186",
@@ -58,6 +61,7 @@
   "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186",
   "block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186",
   "block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186",
+  "block.create.cyan_sail": "\u05DF\u0131\u0250S u\u0250\u028E\u0186",
   "block.create.cyan_seat": "\u0287\u0250\u01DDS u\u0250\u028E\u0186",
   "block.create.cyan_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u0250\u028E\u0186",
   "block.create.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1",
@@ -162,8 +166,10 @@
   "block.create.granite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131u\u0250\u0279\u2141",
   "block.create.granite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131u\u0250\u0279\u2141",
   "block.create.granite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131u\u0250\u0279\u2141",
+  "block.create.gray_sail": "\u05DF\u0131\u0250S \u028E\u0250\u0279\u2141",
   "block.create.gray_seat": "\u0287\u0250\u01DDS \u028E\u0250\u0279\u2141",
   "block.create.gray_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u028E\u0250\u0279\u2141",
+  "block.create.green_sail": "\u05DF\u0131\u0250S u\u01DD\u01DD\u0279\u2141",
   "block.create.green_seat": "\u0287\u0250\u01DDS u\u01DD\u01DD\u0279\u2141",
   "block.create.green_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u01DD\u01DD\u0279\u2141",
   "block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H",
@@ -181,10 +187,13 @@
   "block.create.layered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u028E\u0250\uA780",
   "block.create.layered_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u0279\u01DD\u028E\u0250\uA780",
   "block.create.layered_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0279\u01DD\u028E\u0250\uA780",
+  "block.create.light_blue_sail": "\u05DF\u0131\u0250S \u01DDn\u05DF\u15FA \u0287\u0265b\u0131\uA780",
   "block.create.light_blue_seat": "\u0287\u0250\u01DDS \u01DDn\u05DF\u15FA \u0287\u0265b\u0131\uA780",
   "block.create.light_blue_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DDn\u05DF\u15FA \u0287\u0265b\u0131\uA780",
+  "block.create.light_gray_sail": "\u05DF\u0131\u0250S \u028E\u0250\u0279\u2141 \u0287\u0265b\u0131\uA780",
   "block.create.light_gray_seat": "\u0287\u0250\u01DDS \u028E\u0250\u0279\u2141 \u0287\u0265b\u0131\uA780",
   "block.create.light_gray_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u028E\u0250\u0279\u2141 \u0287\u0265b\u0131\uA780",
+  "block.create.lime_sail": "\u05DF\u0131\u0250S \u01DD\u026F\u0131\uA780",
   "block.create.lime_seat": "\u0287\u0250\u01DDS \u01DD\u026F\u0131\uA780",
   "block.create.lime_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DD\u026F\u0131\uA780",
   "block.create.limesand": "pu\u0250s\u01DD\u026F\u0131\uA780",
@@ -199,6 +208,7 @@
   "block.create.limestone_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780",
   "block.create.limestone_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780",
   "block.create.linear_chassis": "s\u0131ss\u0250\u0265\u0186 \u0279\u0250\u01DDu\u0131\uA780",
+  "block.create.magenta_sail": "\u05DF\u0131\u0250S \u0250\u0287u\u01DDb\u0250W",
   "block.create.magenta_seat": "\u0287\u0250\u01DDS \u0250\u0287u\u01DDb\u0250W",
   "block.create.magenta_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u0250\u0287u\u01DDb\u0250W",
   "block.create.mechanical_arm": "\u026F\u0279\u2C6F \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW",
@@ -230,6 +240,7 @@
   "block.create.nozzle": "\u01DD\u05DFzzoN",
   "block.create.oak_window": "\u028Dopu\u0131M \u029E\u0250O",
   "block.create.oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O",
+  "block.create.orange_sail": "\u05DF\u0131\u0250S \u01DDbu\u0250\u0279O",
   "block.create.orange_seat": "\u0287\u0250\u01DDS \u01DDbu\u0250\u0279O",
   "block.create.orange_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DDbu\u0250\u0279O",
   "block.create.ornate_iron_window": "\u028Dopu\u0131M uo\u0279I \u01DD\u0287\u0250u\u0279O",
@@ -279,6 +290,7 @@
   "block.create.paved_weathered_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500",
   "block.create.paved_weathered_limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500",
   "block.create.paved_weathered_limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500",
+  "block.create.pink_sail": "\u05DF\u0131\u0250S \u029Eu\u0131\u0500",
   "block.create.pink_seat": "\u0287\u0250\u01DDS \u029Eu\u0131\u0500",
   "block.create.pink_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u029Eu\u0131\u0500",
   "block.create.piston_extension_pole": "\u01DD\u05DFo\u0500 uo\u0131su\u01DD\u0287x\u018E uo\u0287s\u0131\u0500",
@@ -311,9 +323,11 @@
   "block.create.powered_toggle_latch": "\u0265\u0254\u0287\u0250\uA780 \u01DD\u05DFbbo\u27D8 p\u01DD\u0279\u01DD\u028Do\u0500",
   "block.create.pulley_magnet": "\u0287\u01DDub\u0250W \u028E\u01DD\u05DF\u05DFn\u0500",
   "block.create.pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500",
+  "block.create.purple_sail": "\u05DF\u0131\u0250S \u01DD\u05DFd\u0279n\u0500",
   "block.create.purple_seat": "\u0287\u0250\u01DDS \u01DD\u05DFd\u0279n\u0500",
   "block.create.purple_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DD\u05DFd\u0279n\u0500",
   "block.create.radial_chassis": "s\u0131ss\u0250\u0265\u0186 \u05DF\u0250\u0131p\u0250\u1D1A",
+  "block.create.red_sail": "\u05DF\u0131\u0250S p\u01DD\u1D1A",
   "block.create.red_seat": "\u0287\u0250\u01DDS p\u01DD\u1D1A",
   "block.create.red_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B p\u01DD\u1D1A",
   "block.create.redstone_contact": "\u0287\u0254\u0250\u0287uo\u0186 \u01DDuo\u0287sp\u01DD\u1D1A",
@@ -323,6 +337,7 @@
   "block.create.rope": "\u01DDdo\u1D1A",
   "block.create.rope_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DDdo\u1D1A",
   "block.create.rotation_speed_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u01DDdS uo\u0131\u0287\u0250\u0287o\u1D1A",
+  "block.create.sail_frame": "\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0131\u0250S",
   "block.create.schematic_table": "\u01DD\u05DFq\u0250\u27D8 \u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S",
   "block.create.schematicannon": "uouu\u0250\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S",
   "block.create.scoria": "\u0250\u0131\u0279o\u0254S",
@@ -363,8 +378,11 @@
   "block.create.weathered_limestone_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM",
   "block.create.weathered_limestone_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM",
   "block.create.weathered_limestone_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM",
+  "block.create.white_sail": "\u05DF\u0131\u0250S \u01DD\u0287\u0131\u0265M",
   "block.create.white_seat": "\u0287\u0250\u01DDS \u01DD\u0287\u0131\u0265M",
   "block.create.white_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u01DD\u0287\u0131\u0265M",
+  "block.create.windmill_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u05DF\u0131\u026Fpu\u0131M",
+  "block.create.yellow_sail": "\u05DF\u0131\u0250S \u028Do\u05DF\u05DF\u01DD\u028E",
   "block.create.yellow_seat": "\u0287\u0250\u01DDS \u028Do\u05DF\u05DF\u01DD\u028E",
   "block.create.yellow_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u028Do\u05DF\u05DF\u01DD\u028E",
   "block.create.zinc_block": "\u029E\u0254o\u05DF\u15FA \u0254u\u0131Z",

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

@@ -26,9 +26,11 @@
 	"block.create.belt": "Belt",
 	"block.create.birch_window": "Birch Window",
 	"block.create.birch_window_pane": "Birch Window Pane",
+	"block.create.black_sail": "Black Sail",
 	"block.create.black_seat": "Black Seat",
 	"block.create.black_valve_handle": "Black Valve Handle",
 	"block.create.blaze_burner": "Blaze Burner",
+	"block.create.blue_sail": "Blue Sail",
 	"block.create.blue_seat": "Blue Seat",
 	"block.create.blue_valve_handle": "Blue Valve Handle",
 	"block.create.brass_belt_funnel": "Brass Belt Funnel",
@@ -36,6 +38,7 @@
 	"block.create.brass_casing": "Brass Casing",
 	"block.create.brass_funnel": "Brass Funnel",
 	"block.create.brass_tunnel": "Brass Tunnel",
+	"block.create.brown_sail": "Brown Sail",
 	"block.create.brown_seat": "Brown Seat",
 	"block.create.brown_valve_handle": "Brown Valve Handle",
 	"block.create.cart_assembler": "Cart Assembler",
@@ -61,6 +64,7 @@
 	"block.create.crushing_wheel": "Crushing Wheel",
 	"block.create.crushing_wheel_controller": "Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "Cuckoo Clock",
+	"block.create.cyan_sail": "Cyan Sail",
 	"block.create.cyan_seat": "Cyan Seat",
 	"block.create.cyan_valve_handle": "Cyan Valve Handle",
 	"block.create.dark_oak_window": "Dark Oak Window",
@@ -165,8 +169,10 @@
 	"block.create.granite_cobblestone_stairs": "Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "Granite Cobblestone Wall",
 	"block.create.granite_pillar": "Granite Pillar",
+	"block.create.gray_sail": "Gray Sail",
 	"block.create.gray_seat": "Gray Seat",
 	"block.create.gray_valve_handle": "Gray Valve Handle",
+	"block.create.green_sail": "Green Sail",
 	"block.create.green_seat": "Green Seat",
 	"block.create.green_valve_handle": "Green Valve Handle",
 	"block.create.hand_crank": "Hand Crank",
@@ -184,10 +190,13 @@
 	"block.create.layered_limestone": "Layered Limestone",
 	"block.create.layered_scoria": "Layered Scoria",
 	"block.create.layered_weathered_limestone": "Layered Weathered Limestone",
+	"block.create.light_blue_sail": "Light Blue Sail",
 	"block.create.light_blue_seat": "Light Blue Seat",
 	"block.create.light_blue_valve_handle": "Light Blue Valve Handle",
+	"block.create.light_gray_sail": "Light Gray Sail",
 	"block.create.light_gray_seat": "Light Gray Seat",
 	"block.create.light_gray_valve_handle": "Light Gray Valve Handle",
+	"block.create.lime_sail": "Lime Sail",
 	"block.create.lime_seat": "Lime Seat",
 	"block.create.lime_valve_handle": "Lime Valve Handle",
 	"block.create.limesand": "Limesand",
@@ -202,6 +211,7 @@
 	"block.create.limestone_cobblestone_wall": "Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Limestone Pillar",
 	"block.create.linear_chassis": "Linear Chassis",
+	"block.create.magenta_sail": "Magenta Sail",
 	"block.create.magenta_seat": "Magenta Seat",
 	"block.create.magenta_valve_handle": "Magenta Valve Handle",
 	"block.create.mechanical_arm": "Mechanical Arm",
@@ -233,6 +243,7 @@
 	"block.create.nozzle": "Nozzle",
 	"block.create.oak_window": "Oak Window",
 	"block.create.oak_window_pane": "Oak Window Pane",
+	"block.create.orange_sail": "Orange Sail",
 	"block.create.orange_seat": "Orange Seat",
 	"block.create.orange_valve_handle": "Orange Valve Handle",
 	"block.create.ornate_iron_window": "Ornate Iron Window",
@@ -282,6 +293,7 @@
 	"block.create.paved_weathered_limestone_slab": "Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "Pink Sail",
 	"block.create.pink_seat": "Pink Seat",
 	"block.create.pink_valve_handle": "Pink Valve Handle",
 	"block.create.piston_extension_pole": "Piston Extension Pole",
@@ -314,9 +326,11 @@
 	"block.create.powered_toggle_latch": "Powered Toggle Latch",
 	"block.create.pulley_magnet": "Pulley Magnet",
 	"block.create.pulse_repeater": "Pulse Repeater",
+	"block.create.purple_sail": "Purple Sail",
 	"block.create.purple_seat": "Purple Seat",
 	"block.create.purple_valve_handle": "Purple Valve Handle",
 	"block.create.radial_chassis": "Radial Chassis",
+	"block.create.red_sail": "Red Sail",
 	"block.create.red_seat": "Red Seat",
 	"block.create.red_valve_handle": "Red Valve Handle",
 	"block.create.redstone_contact": "Redstone Contact",
@@ -326,6 +340,7 @@
 	"block.create.rope": "Rope",
 	"block.create.rope_pulley": "Rope Pulley",
 	"block.create.rotation_speed_controller": "Rotation Speed Controller",
+	"block.create.sail_frame": "Sail Frame",
 	"block.create.schematic_table": "Schematic Table",
 	"block.create.schematicannon": "Schematicannon",
 	"block.create.scoria": "Scoria",
@@ -366,8 +381,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Weathered Limestone Pillar",
+	"block.create.white_sail": "White Sail",
 	"block.create.white_seat": "White Seat",
 	"block.create.white_valve_handle": "White Valve Handle",
+	"block.create.windmill_bearing": "Windmill Bearing",
+	"block.create.yellow_sail": "Yellow Sail",
 	"block.create.yellow_seat": "Yellow Seat",
 	"block.create.yellow_valve_handle": "Yellow Valve Handle",
 	"block.create.zinc_block": "Zinc Block",
@@ -580,6 +598,8 @@
 	"create.generic.unit.stress": "su",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "%1$smB",
+	"create.generic.clockwise": "Clockwise",
+	"create.generic.counter_clockwise": "Counter-Clockwise",
 
 	"create.action.scroll": "Scroll",
 	"create.action.confirm": "Confirm",
@@ -673,6 +693,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "Clock Hands",
+	"create.contraptions.clockwork.hour_first": "Hour hand first",
+	"create.contraptions.clockwork.minute_first": "Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "24-Hour hand first",
 
 	"create.logistics.filter": "Filter",
 	"create.logistics.recipe_filter": "Recipe Filter",
@@ -769,9 +794,9 @@
 	"create.schematics.uploadTooLarge": "Your schematic exceeds limitations specified by the server.",
 	"create.schematics.maxAllowedSize": "The maximum allowed schematic file size is:",
 
-	"create.gui.schematicTable.title": "Schematic Table",
 	"create.gui.schematicTable.refresh": "Refresh Files",
 	"create.gui.schematicTable.open_folder": "Open Folder",
+	"create.gui.schematicTable.title": "Schematic Table",
 	"create.gui.schematicTable.availableSchematics": "Available Schematics",
 	"create.gui.schematicTable.noSchematics": "No Schematics Saved",
 	"create.gui.schematicTable.uploading": "Uploading...",
@@ -859,6 +884,30 @@
 	"create.item_attributes.in_item_group.inverted": "is not in group '%1$s'",
 	"create.item_attributes.added_by": "was added by %1$s",
 	"create.item_attributes.added_by.inverted": "was not added by %1$s",
+	"create.item_attributes.has_enchant": "is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "does not contain %1$s",
+	"create.item_attributes.has_name": "has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "does not have the custom name %1$s",
+	"create.item_attributes.book_author": "was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "is an original",
+	"create.item_attributes.book_copy_original.inverted": "is not an original",
+	"create.item_attributes.book_copy_first": "is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "No attributes selected",
 	"create.gui.attribute_filter.selected_attributes": "Selected attributes:",

src/generated/resources/assets/create/lang/unfinished/de_de.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 972",
+	"_": "Missing Localizations: 1021",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Mechanischer Riemen",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "UNLOCALIZED: Brass Casing",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "UNLOCALIZED: Cart Assembler",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Mahlwerkrad",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Kalksand",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Kalksteinsäule",
 	"block.create.linear_chassis": "Schubgerüst",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "UNLOCALIZED: Nozzle",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Kolben-Pleuelverlängerung",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch",
 	"block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet",
 	"block.create.pulse_repeater": "Pulsierender Verstärker",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Drehgerüst",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "Redstone-Kontakt",
@@ -327,6 +341,7 @@
 	"block.create.rope": "UNLOCALIZED: Rope",
 	"block.create.rope_pulley": "UNLOCALIZED: Rope Pulley",
 	"block.create.rotation_speed_controller": "UNLOCALIZED: Rotation Speed Controller",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Bauplantisch",
 	"block.create.schematicannon": "Bauplankanone",
 	"block.create.scoria": "UNLOCALIZED: Scoria",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Verwitterte Kalksteinsäule",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "UNLOCALIZED: Zinc Block",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "UNLOCALIZED: su",
 	"create.generic.unit.degrees": "UNLOCALIZED: °",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Wechseln",
 	"create.action.confirm": "Bestätigen",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Filter",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "Dein Bauplan ist zu groß.",
 	"create.schematics.maxAllowedSize": "Die maximale Bauplan-Dateigröße ist:",
 
-	"create.gui.schematicTable.title": "Bauplantisch",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Bauplantisch",
 	"create.gui.schematicTable.availableSchematics": "Verfügbare Baupläne",
 	"create.gui.schematicTable.noSchematics": "Keine gespeicherten Baupläne",
 	"create.gui.schematicTable.uploading": "Hochladen...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "UNLOCALIZED: was added by %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "UNLOCALIZED: No attributes selected",
 	"create.gui.attribute_filter.selected_attributes": "UNLOCALIZED: Selected attributes:",

src/generated/resources/assets/create/lang/unfinished/fr_fr.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 601",
+	"_": "Missing Localizations: 650",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Tapis roulant",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "Boîtier en laiton",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "Assembleur de wagon",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Roue de concassage",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "Horloge à coucou",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "Manivelle",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Chaux",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Pillier de calcaire",
 	"block.create.linear_chassis": "Châssis linéaire",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "Buse",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Pôle d'extension de piston",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "Verrou alimenté à bascule",
 	"block.create.pulley_magnet": "Aimant de poulie",
 	"block.create.pulse_repeater": "Répéteur d'impulsions",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Châssis radial",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "redstone_contact Redstone",
@@ -327,6 +341,7 @@
 	"block.create.rope": "Corde",
 	"block.create.rope_pulley": "Poulie à corde",
 	"block.create.rotation_speed_controller": "Contrôleur de vitesse de rotation",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Table à schéma",
 	"block.create.schematicannon": "Schémacanon",
 	"block.create.scoria": "Scorie",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Pillier de calcaire patinées",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "UNLOCALIZED: Zinc Block",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "us",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Faire défiler",
 	"create.action.confirm": "Confirmer",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Filtre",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "Votre schéma est trop grand.",
 	"create.schematics.maxAllowedSize": "La taille de fichier schématique maximale autorisée est:",
 
-	"create.gui.schematicTable.title": "Table à schéma",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Table à schéma",
 	"create.gui.schematicTable.availableSchematics": "Schémas disponibles",
 	"create.gui.schematicTable.noSchematics": "Aucun schéma enregistré",
 	"create.gui.schematicTable.uploading": "Téléchargement...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "a été ajouté par %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "Aucun attribut sélectionné",
 	"create.gui.attribute_filter.selected_attributes": "Attributs sélectionnés:",

src/generated/resources/assets/create/lang/unfinished/it_it.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 585",
+	"_": "Missing Localizations: 634",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Nastro Meccanico",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "Involucro di Ottone",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "Assemblatore Carrello da Miniera",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Ruota di Frantumazione",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "Orologio a Cucù",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "Manovella",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Silico Calcare",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Pilastro di Calcare",
 	"block.create.linear_chassis": "Telaio Lineare",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "Ugello",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Palo Pistome",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "Leva Alimentata Alterata",
 	"block.create.pulley_magnet": "Magnete della Puleggia",
 	"block.create.pulse_repeater": "Ripetitore di Impulsi",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Telaio Radiale",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "Contatto Redstone",
@@ -327,6 +341,7 @@
 	"block.create.rope": "Corda",
 	"block.create.rope_pulley": "Puleggia della Corda",
 	"block.create.rotation_speed_controller": "Regolatore di Velocità di Rotazione",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Banco Schematico",
 	"block.create.schematicannon": "Cannoneschematico",
 	"block.create.scoria": "Scoria",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Pilastro di Calcare Consumato",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "Blocco di Zinco",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "su",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Scorri",
 	"create.action.confirm": "Conferma",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Filtro",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "La schematica è troppo grande.",
 	"create.schematics.maxAllowedSize": "La dimensione massima consentita del file schematica è:",
 
-	"create.gui.schematicTable.title": "Banco Schematico",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Banco Schematico",
 	"create.gui.schematicTable.availableSchematics": "Schatiche disponibili",
 	"create.gui.schematicTable.noSchematics": "Nessuna Schatica Salvata",
 	"create.gui.schematicTable.uploading": "Caricamento...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "è stato aggiunto da %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "Nessun attributo selezionato",
 	"create.gui.attribute_filter.selected_attributes": "Attributi selezionati:",

src/generated/resources/assets/create/lang/unfinished/ja_jp.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 584",
+	"_": "Missing Localizations: 633",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "メカニカルベルト",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "真鍮ケーシング",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "カートアセンブラ",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "破砕ホイール",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "鳩時計",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "ハンドクランク",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "石灰砕砂",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "石灰岩の柱",
 	"block.create.linear_chassis": "リニアシャーシ",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "ノズル",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "ピストン延長ポール",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "パワードトグルラッチ",
 	"block.create.pulley_magnet": "プーリーマグネット",
 	"block.create.pulse_repeater": "パルスリピーター",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "ラジアルシャーシ",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "レッドストーンコンタクト",
@@ -327,6 +341,7 @@
 	"block.create.rope": "ロープ",
 	"block.create.rope_pulley": "ローププーリー",
 	"block.create.rotation_speed_controller": "回転速度制御器",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "概略図テーブル",
 	"block.create.schematicannon": "概略図砲",
 	"block.create.scoria": "スコリア",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "風化した石灰岩の柱",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "亜鉛ブロック",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "su",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "スクロール",
 	"create.action.confirm": "確認",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "フィルタ",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "概略図が大きすぎます。",
 	"create.schematics.maxAllowedSize": "最大許容概略図ファイルサイズは:",
 
-	"create.gui.schematicTable.title": "概略図テーブル",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "概略図テーブル",
 	"create.gui.schematicTable.availableSchematics": "利用可能な概略図",
 	"create.gui.schematicTable.noSchematics": "保存された概略図はありません",
 	"create.gui.schematicTable.uploading": "アップロードしています...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "%1$s によって追加されたか",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "属性が選択されていません",
 	"create.gui.attribute_filter.selected_attributes": "選択された属性:",

src/generated/resources/assets/create/lang/unfinished/ko_kr.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 585",
+	"_": "Missing Localizations: 634",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "컨베이어 벨트",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "황동 케이스",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "카트 조립기",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "분쇄 휠",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "뻐꾸기 시계",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "핸드 크랭크",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "석회모래",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "석회암 기둥",
 	"block.create.linear_chassis": "직선 섀시",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "노즐",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "피스톤 연장 축",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "레드스톤 토글 걸쇠",
 	"block.create.pulley_magnet": "도르래 자석",
 	"block.create.pulse_repeater": "펄스 리피터",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "원형 섀시",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "동형 감지기",
@@ -327,6 +341,7 @@
 	"block.create.rope": "밧줄",
 	"block.create.rope_pulley": "밧줄 도르래",
 	"block.create.rotation_speed_controller": "회전 속도 컨트롤러",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "청사진 테이블",
 	"block.create.schematicannon": "청사진 대포",
 	"block.create.scoria": "스코리아",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "풍화된 석회암 기둥",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "아연 블럭",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "su",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "스크롤하세요",
 	"create.action.confirm": "확인",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "필터",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "청사진이 너무 큽니다!.",
 	"create.schematics.maxAllowedSize": "최대 청사진 파일 크기는:",
 
-	"create.gui.schematicTable.title": "청사진 테이블",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "청사진 테이블",
 	"create.gui.schematicTable.availableSchematics": "이용가능한 청사진",
 	"create.gui.schematicTable.noSchematics": "저장된 청사진 없음",
 	"create.gui.schematicTable.uploading": "업로딩 중...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "%1$s가 추가함",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "속성이 선택되지 않음",
 	"create.gui.attribute_filter.selected_attributes": "선택된 속성:",

src/generated/resources/assets/create/lang/unfinished/nl_nl.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 913",
+	"_": "Missing Localizations: 962",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Mechanische Transportband",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "UNLOCALIZED: Brass Casing",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "Kar Assembler",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Verpulveraar",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Kalkzand",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Kalksteen Pillar",
 	"block.create.linear_chassis": "Lineaar Frame",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "UNLOCALIZED: Nozzle",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Zuiger Verlengpaal",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch",
 	"block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet",
 	"block.create.pulse_repeater": "Pulse Versterker",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Rotation Frame",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "Redstone redstone_contact",
@@ -327,6 +341,7 @@
 	"block.create.rope": "UNLOCALIZED: Rope",
 	"block.create.rope_pulley": "UNLOCALIZED: Rope Pulley",
 	"block.create.rotation_speed_controller": "UNLOCALIZED: Rotation Speed Controller",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Bouwtekening Tafel",
 	"block.create.schematicannon": "Bouwtekeningkannon",
 	"block.create.scoria": "UNLOCALIZED: Scoria",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Verweerde Kalksteen Pilaar",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "UNLOCALIZED: Zinc Block",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "UNLOCALIZED: su",
 	"create.generic.unit.degrees": "UNLOCALIZED: °",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Scroll",
 	"create.action.confirm": "Bevestigen",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Filter",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "Jouw Bouwtekening is te groot!",
 	"create.schematics.maxAllowedSize": "De maximum toegestane grote van een Bouwtekings bestand is:",
 
-	"create.gui.schematicTable.title": "Bouwtekening Tafel",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Bouwtekening Tafel",
 	"create.gui.schematicTable.availableSchematics": "Beschikbare Bouwtekeningen",
 	"create.gui.schematicTable.noSchematics": "Geen Bouwtekeningen opgeslagen",
 	"create.gui.schematicTable.uploading": "Uploaden...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "UNLOCALIZED: was added by %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "UNLOCALIZED: No attributes selected",
 	"create.gui.attribute_filter.selected_attributes": "UNLOCALIZED: Selected attributes:",

src/generated/resources/assets/create/lang/unfinished/pt_br.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 979",
+	"_": "Missing Localizations: 1028",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Esteira Mecânica",
 	"block.create.birch_window": "UNLOCALIZED: Birch Window",
 	"block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "UNLOCALIZED: Brass Casing",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "UNLOCALIZED: Cart Assembler",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Roda de Moer",
 	"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
 	"block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "UNLOCALIZED: Granite Cobblestone Stairs",
 	"block.create.granite_cobblestone_wall": "UNLOCALIZED: Granite Cobblestone Wall",
 	"block.create.granite_pillar": "UNLOCALIZED: Granite Pillar",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "UNLOCALIZED: Layered Limestone",
 	"block.create.layered_scoria": "UNLOCALIZED: Layered Scoria",
 	"block.create.layered_weathered_limestone": "UNLOCALIZED: Layered Weathered Limestone",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Areia Calcária",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall",
 	"block.create.limestone_pillar": "Pilar de Calcário",
 	"block.create.linear_chassis": "Chassis de Translado",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "UNLOCALIZED: Nozzle",
 	"block.create.oak_window": "UNLOCALIZED: Oak Window",
 	"block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "UNLOCALIZED: Ornate Iron Window",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "UNLOCALIZED: Paved Weathered Limestone Slab",
 	"block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs",
 	"block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Vara de Extensão do Pistão",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch",
 	"block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet",
 	"block.create.pulse_repeater": "Repetidor de Pulso",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Chassis de Rotação",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "Contato de Redstone",
@@ -327,6 +341,7 @@
 	"block.create.rope": "UNLOCALIZED: Rope",
 	"block.create.rope_pulley": "UNLOCALIZED: Rope Pulley",
 	"block.create.rotation_speed_controller": "UNLOCALIZED: Rotation Speed Controller",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Mesa de Esquematizar",
 	"block.create.schematicannon": "Esquemaannon",
 	"block.create.scoria": "UNLOCALIZED: Scoria",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs",
 	"block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall",
 	"block.create.weathered_limestone_pillar": "Pilar de Calcário Resistido",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "UNLOCALIZED: Zinc Block",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "UNLOCALIZED: su",
 	"create.generic.unit.degrees": "UNLOCALIZED: °",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Rolar",
 	"create.action.confirm": "Confirmar",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion",
 	"create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating",
 	"create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Filtros",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "Seu esquema é muito grande",
 	"create.schematics.maxAllowedSize": "O tamanho máximo permitido para o esquema é:",
 
-	"create.gui.schematicTable.title": "Mesa de Desenho",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Mesa de Desenho",
 	"create.gui.schematicTable.availableSchematics": "UNLOCALIZED: Available Schematics",
 	"create.gui.schematicTable.noSchematics": "UNLOCALIZED: No Schematics Saved",
 	"create.gui.schematicTable.uploading": "Importando...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "UNLOCALIZED: was added by %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "UNLOCALIZED: No attributes selected",
 	"create.gui.attribute_filter.selected_attributes": "UNLOCALIZED: Selected attributes:",

src/generated/resources/assets/create/lang/unfinished/ru_ru.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 254",
+	"_": "Missing Localizations: 303",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "Конвейер",
 	"block.create.birch_window": "Берёзовое окно",
 	"block.create.birch_window_pane": "Панель берёзового окна",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "Латунный корпус",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "Сборщик вагонеток",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "Колесо дробления",
 	"block.create.crushing_wheel_controller": "Контроллер колеса дробления",
 	"block.create.cuckoo_clock": "Часы с кукушкой",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "Окно из тёмного дуба",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "Ступени из гранит-булыжника",
 	"block.create.granite_cobblestone_wall": "Стена из гранит-булыжника",
 	"block.create.granite_pillar": "Гранитная колонна",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "Рукоятка",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "Слоистый известняк",
 	"block.create.layered_scoria": "Слоистый пепел",
 	"block.create.layered_weathered_limestone": "Слоистый выветренный известняк",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "Известковый песок",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "Стена из известняк-булыжника",
 	"block.create.limestone_pillar": "Известковая колонна",
 	"block.create.linear_chassis": "Линейное шасси",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "Форсунка",
 	"block.create.oak_window": "Дубовое окно",
 	"block.create.oak_window_pane": "Панель из дубового окна",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "Украшенное железное окно",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "Плита из мощёного выветренного известняка",
 	"block.create.paved_weathered_limestone_stairs": "Ступени из мощёного выветренного известняка",
 	"block.create.paved_weathered_limestone_wall": "Стена из мощёного выветренного известняка",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "Удлинитель поршня",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "Механизированная рычаг-защёлка",
 	"block.create.pulley_magnet": "Шкивный магнит",
 	"block.create.pulse_repeater": "Импульсный повторитель",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "Радиальное шасси",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "Контакт сигнала красного камня",
@@ -327,6 +341,7 @@
 	"block.create.rope": "Канат",
 	"block.create.rope_pulley": "Лебёдка",
 	"block.create.rotation_speed_controller": "Регулятор скорости вращения",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "Схематичный стол",
 	"block.create.schematicannon": "Схематичная пушка",
 	"block.create.scoria": "Пепел",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "Ступени из известняк-булыжника",
 	"block.create.weathered_limestone_cobblestone_wall": "Стена из известняк-булыжника",
 	"block.create.weathered_limestone_pillar": "Колонна из выветренного известняка",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "Цинковый блок",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "Н*м",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "Прокрутка",
 	"create.action.confirm": "Подтвердить",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "Всегда лицом к движению",
 	"create.contraptions.cart_movement_mode.rotate_paused": "Пауза во время вращения",
 	"create.contraptions.cart_movement_mode.rotation_locked": "Блокировка вращения",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "Фильтр",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "Ваша схематика слишком велика.",
 	"create.schematics.maxAllowedSize": "Максимально допустимый размер файла:",
 
-	"create.gui.schematicTable.title": "Схематичный стол",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "Схематичный стол",
 	"create.gui.schematicTable.availableSchematics": "Доступные схемы",
 	"create.gui.schematicTable.noSchematics": "Схемы не сохранены",
 	"create.gui.schematicTable.uploading": "Загрузка ...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "был добавлен %1$s",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "Атрибуты не выбраны",
 	"create.gui.attribute_filter.selected_attributes": "Выбранные атрибуты:",

src/generated/resources/assets/create/lang/unfinished/zh_cn.json

@@ -1,5 +1,5 @@
 {
-	"_": "Missing Localizations: 267",
+	"_": "Missing Localizations: 316",
 
 	"_": "->------------------------]  Game Elements  [------------------------<-",
 
@@ -27,9 +27,11 @@
 	"block.create.belt": "传送带",
 	"block.create.birch_window": "白桦窗户",
 	"block.create.birch_window_pane": "白桦窗户板",
+	"block.create.black_sail": "UNLOCALIZED: Black Sail",
 	"block.create.black_seat": "UNLOCALIZED: Black Seat",
 	"block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle",
 	"block.create.blaze_burner": "UNLOCALIZED: Blaze Burner",
+	"block.create.blue_sail": "UNLOCALIZED: Blue Sail",
 	"block.create.blue_seat": "UNLOCALIZED: Blue Seat",
 	"block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle",
 	"block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel",
@@ -37,6 +39,7 @@
 	"block.create.brass_casing": "黄铜机壳",
 	"block.create.brass_funnel": "UNLOCALIZED: Brass Funnel",
 	"block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel",
+	"block.create.brown_sail": "UNLOCALIZED: Brown Sail",
 	"block.create.brown_seat": "UNLOCALIZED: Brown Seat",
 	"block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle",
 	"block.create.cart_assembler": "矿车装配站",
@@ -62,6 +65,7 @@
 	"block.create.crushing_wheel": "粉碎轮",
 	"block.create.crushing_wheel_controller": "粉碎轮控制器",
 	"block.create.cuckoo_clock": "布谷鸟闹钟",
+	"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
 	"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
 	"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
 	"block.create.dark_oak_window": "深色橡木窗户",
@@ -166,8 +170,10 @@
 	"block.create.granite_cobblestone_stairs": "花岗岩圆石楼梯",
 	"block.create.granite_cobblestone_wall": "花岗岩圆石墙",
 	"block.create.granite_pillar": "竖纹花岗岩",
+	"block.create.gray_sail": "UNLOCALIZED: Gray Sail",
 	"block.create.gray_seat": "UNLOCALIZED: Gray Seat",
 	"block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle",
+	"block.create.green_sail": "UNLOCALIZED: Green Sail",
 	"block.create.green_seat": "UNLOCALIZED: Green Seat",
 	"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
 	"block.create.hand_crank": "手摇曲柄",
@@ -185,10 +191,13 @@
 	"block.create.layered_limestone": "层叠石灰岩",
 	"block.create.layered_scoria": "层叠熔渣",
 	"block.create.layered_weathered_limestone": "层叠风化石灰岩",
+	"block.create.light_blue_sail": "UNLOCALIZED: Light Blue Sail",
 	"block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat",
 	"block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle",
+	"block.create.light_gray_sail": "UNLOCALIZED: Light Gray Sail",
 	"block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat",
 	"block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle",
+	"block.create.lime_sail": "UNLOCALIZED: Lime Sail",
 	"block.create.lime_seat": "UNLOCALIZED: Lime Seat",
 	"block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle",
 	"block.create.limesand": "石灰沙",
@@ -203,6 +212,7 @@
 	"block.create.limestone_cobblestone_wall": "石灰岩圆石墙",
 	"block.create.limestone_pillar": "竖纹石灰岩",
 	"block.create.linear_chassis": "机壳底盘",
+	"block.create.magenta_sail": "UNLOCALIZED: Magenta Sail",
 	"block.create.magenta_seat": "UNLOCALIZED: Magenta Seat",
 	"block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle",
 	"block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm",
@@ -234,6 +244,7 @@
 	"block.create.nozzle": "分散网",
 	"block.create.oak_window": "橡木窗户",
 	"block.create.oak_window_pane": "橡木窗户板",
+	"block.create.orange_sail": "UNLOCALIZED: Orange Sail",
 	"block.create.orange_seat": "UNLOCALIZED: Orange Seat",
 	"block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle",
 	"block.create.ornate_iron_window": "华丽铁窗户",
@@ -283,6 +294,7 @@
 	"block.create.paved_weathered_limestone_slab": "风化石灰岩铺路石台阶",
 	"block.create.paved_weathered_limestone_stairs": "风化石灰岩铺路石楼梯",
 	"block.create.paved_weathered_limestone_wall": "风化石灰岩铺路石墙",
+	"block.create.pink_sail": "UNLOCALIZED: Pink Sail",
 	"block.create.pink_seat": "UNLOCALIZED: Pink Seat",
 	"block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle",
 	"block.create.piston_extension_pole": "活塞杆",
@@ -315,9 +327,11 @@
 	"block.create.powered_toggle_latch": "T触发器",
 	"block.create.pulley_magnet": "传送带磁铁",
 	"block.create.pulse_repeater": "脉冲中继器",
+	"block.create.purple_sail": "UNLOCALIZED: Purple Sail",
 	"block.create.purple_seat": "UNLOCALIZED: Purple Seat",
 	"block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle",
 	"block.create.radial_chassis": "旋转底盘",
+	"block.create.red_sail": "UNLOCALIZED: Red Sail",
 	"block.create.red_seat": "UNLOCALIZED: Red Seat",
 	"block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle",
 	"block.create.redstone_contact": "信号检测器",
@@ -327,6 +341,7 @@
 	"block.create.rope": "绳索",
 	"block.create.rope_pulley": "绳索滑轮",
 	"block.create.rotation_speed_controller": "转速控制器",
+	"block.create.sail_frame": "UNLOCALIZED: Sail Frame",
 	"block.create.schematic_table": "蓝图桌",
 	"block.create.schematicannon": "蓝图加农炮",
 	"block.create.scoria": "熔渣",
@@ -367,8 +382,11 @@
 	"block.create.weathered_limestone_cobblestone_stairs": "风化石灰岩圆石楼梯",
 	"block.create.weathered_limestone_cobblestone_wall": "风化石灰岩圆石墙",
 	"block.create.weathered_limestone_pillar": "竖纹风化石灰岩",
+	"block.create.white_sail": "UNLOCALIZED: White Sail",
 	"block.create.white_seat": "UNLOCALIZED: White Seat",
 	"block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle",
+	"block.create.windmill_bearing": "UNLOCALIZED: Windmill Bearing",
+	"block.create.yellow_sail": "UNLOCALIZED: Yellow Sail",
 	"block.create.yellow_seat": "UNLOCALIZED: Yellow Seat",
 	"block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle",
 	"block.create.zinc_block": "锌块",
@@ -581,6 +599,8 @@
 	"create.generic.unit.stress": "su",
 	"create.generic.unit.degrees": "°",
 	"create.generic.unit.millibuckets": "UNLOCALIZED: %1$smB",
+	"create.generic.clockwise": "UNLOCALIZED: Clockwise",
+	"create.generic.counter_clockwise": "UNLOCALIZED: Counter-Clockwise",
 
 	"create.action.scroll": "滚轮",
 	"create.action.confirm": "确认",
@@ -674,6 +694,11 @@
 	"create.contraptions.cart_movement_mode.rotate": "结构与矿车保持相同方向",
 	"create.contraptions.cart_movement_mode.rotate_paused": "矿车转向时机器停止工作",
 	"create.contraptions.cart_movement_mode.rotation_locked": "结构方向保持不变",
+	"create.contraptions.windmill.rotation_direction": "UNLOCALIZED: Rotation Direction",
+	"create.contraptions.clockwork.clock_hands": "UNLOCALIZED: Clock Hands",
+	"create.contraptions.clockwork.hour_first": "UNLOCALIZED: Hour hand first",
+	"create.contraptions.clockwork.minute_first": "UNLOCALIZED: Minute hand first",
+	"create.contraptions.clockwork.hour_first_24": "UNLOCALIZED: 24-Hour hand first",
 
 	"create.logistics.filter": "过滤器",
 	"create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter",
@@ -770,9 +795,9 @@
 	"create.schematics.uploadTooLarge": "你的蓝图太大",
 	"create.schematics.maxAllowedSize": "允许的最大蓝图文件大小为:",
 
-	"create.gui.schematicTable.title": "蓝图桌",
 	"create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files",
 	"create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder",
+	"create.gui.schematicTable.title": "蓝图桌",
 	"create.gui.schematicTable.availableSchematics": "可用蓝图",
 	"create.gui.schematicTable.noSchematics": "没有保存的蓝图",
 	"create.gui.schematicTable.uploading": "正在上传...",
@@ -860,6 +885,30 @@
 	"create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'",
 	"create.item_attributes.added_by": "由%1$s添加",
 	"create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s",
+	"create.item_attributes.has_enchant": "UNLOCALIZED: is enchanted with %1$s",
+	"create.item_attributes.has_enchant.inverted": "UNLOCALIZED: is not enchanted with %1$s",
+	"create.item_attributes.has_fluid": "UNLOCALIZED: contains %1$s",
+	"create.item_attributes.has_fluid.inverted": "UNLOCALIZED: does not contain %1$s",
+	"create.item_attributes.has_name": "UNLOCALIZED: has the custom name %1$s",
+	"create.item_attributes.has_name.inverted": "UNLOCALIZED: does not have the custom name %1$s",
+	"create.item_attributes.book_author": "UNLOCALIZED: was authored by %1$s",
+	"create.item_attributes.book_author.inverted": "UNLOCALIZED: was not authored by %1$s",
+	"create.item_attributes.book_copy_original": "UNLOCALIZED: is an original",
+	"create.item_attributes.book_copy_original.inverted": "UNLOCALIZED: is not an original",
+	"create.item_attributes.book_copy_first": "UNLOCALIZED: is a first-generation copy",
+	"create.item_attributes.book_copy_first.inverted": "UNLOCALIZED: is not a first-generation copy",
+	"create.item_attributes.book_copy_second": "UNLOCALIZED: is a second-generation copy",
+	"create.item_attributes.book_copy_second.inverted": "UNLOCALIZED: is not a second-generation copy",
+	"create.item_attributes.book_copy_tattered": "UNLOCALIZED: is a tattered mess",
+	"create.item_attributes.book_copy_tattered.inverted": "UNLOCALIZED: is not a tattered mess",
+	"create.item_attributes.astralsorcery_crystal": "UNLOCALIZED: has crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_crystal.inverted": "UNLOCALIZED: does not have crystal attribute %1$s",
+	"create.item_attributes.astralsorcery_constellation": "UNLOCALIZED: is attuned to %1$s",
+	"create.item_attributes.astralsorcery_constellation.inverted": "UNLOCALIZED: is not attuned to %1$s",
+	"create.item_attributes.astralsorcery_perk_gem": "UNLOCALIZED: has perk attribute %1$s",
+	"create.item_attributes.astralsorcery_perk_gem.inverted": "UNLOCALIZED: does not have perk attribute %1$s",
+	"create.item_attributes.astralsorcery_amulet": "UNLOCALIZED: improves %1$s",
+	"create.item_attributes.astralsorcery_amulet.inverted": "UNLOCALIZED: does not improve %1$s",
 
 	"create.gui.attribute_filter.no_selected_attributes": "没有标记任何属性",
 	"create.gui.attribute_filter.selected_attributes": "已选择的属性:",

src/generated/resources/assets/create/models/block/black_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_black"
+  }
+}

src/generated/resources/assets/create/models/block/blue_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_blue"
+  }
+}

src/generated/resources/assets/create/models/block/brown_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_brown"
+  }
+}

src/generated/resources/assets/create/models/block/clockwork_bearing.json

@@ -2,6 +2,7 @@
   "parent": "create:block/bearing/block",
   "textures": {
     "side": "create:block/clockwork_bearing_side",
+    "nook": "create:block/brass_casing",
     "back": "create:block/brass_gearbox"
   }
 }

src/generated/resources/assets/create/models/block/cyan_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_cyan"
+  }
+}

src/generated/resources/assets/create/models/block/gray_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_gray"
+  }
+}

src/generated/resources/assets/create/models/block/green_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_green"
+  }
+}

src/generated/resources/assets/create/models/block/light_blue_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_light_blue"
+  }
+}

src/generated/resources/assets/create/models/block/light_gray_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_light_gray"
+  }
+}

src/generated/resources/assets/create/models/block/lime_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_lime"
+  }
+}

src/generated/resources/assets/create/models/block/magenta_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_magenta"
+  }
+}

src/generated/resources/assets/create/models/block/mechanical_bearing.json

@@ -2,6 +2,7 @@
   "parent": "create:block/bearing/block",
   "textures": {
     "side": "create:block/mechanical_bearing_side",
+    "nook": "create:block/brass_casing",
     "back": "create:block/gearbox"
   }
 }

src/generated/resources/assets/create/models/block/orange_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_orange"
+  }
+}

src/generated/resources/assets/create/models/block/pink_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_pink"
+  }
+}

src/generated/resources/assets/create/models/block/purple_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_purple"
+  }
+}

src/generated/resources/assets/create/models/block/red_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_red"
+  }
+}

src/generated/resources/assets/create/models/block/windmill_bearing.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/bearing/block",
+  "textures": {
+    "side": "create:block/windmill_bearing_side",
+    "nook": "create:block/andesite_casing",
+    "back": "create:block/gearbox"
+  }
+}

src/generated/resources/assets/create/models/block/yellow_sail.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create:block/white_sail",
+  "textures": {
+    "0": "create:block/sail/canvas_yellow"
+  }
+}

src/generated/resources/assets/create/models/item/clockwork_bearing.json

@@ -1,6 +1,7 @@
 {
   "parent": "create:block/bearing/item",
   "textures": {
+    "top": "create:block/bearing_top",
     "side": "create:block/clockwork_bearing_side",
     "back": "create:block/brass_gearbox"
   }

src/generated/resources/assets/create/models/item/mechanical_bearing.json

@@ -1,6 +1,7 @@
 {
   "parent": "create:block/bearing/item",
   "textures": {
+    "top": "create:block/bearing_top",
     "side": "create:block/mechanical_bearing_side",
     "back": "create:block/gearbox"
   }

src/generated/resources/assets/create/models/item/sail_frame.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/sail_frame"
+}

src/generated/resources/assets/create/models/item/white_sail.json

@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/white_sail"
+}

src/generated/resources/assets/create/models/item/windmill_bearing.json

@@ -0,0 +1,8 @@
+{
+  "parent": "create:block/bearing/item",
+  "textures": {
+    "top": "create:block/bearing_top_wooden",
+    "side": "create:block/windmill_bearing_side",
+    "back": "create:block/gearbox"
+  }
+}

src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/kinetics/sail_frame"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "create:andesite_alloy"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/kinetics/sail_frame"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/kinetics/white_sail"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "create:sail_frame"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/kinetics/white_sail"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/windmill_bearing.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/kinetics/windmill_bearing"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "create:andesite_alloy"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/kinetics/windmill_bearing"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/black_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/blue_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/brown_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/cyan_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/gray_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/green_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/light_blue_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/light_gray_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/lime_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/magenta_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/orange_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/pink_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/purple_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/red_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/sail_frame.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:sail_frame"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/white_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/windmill_bearing.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:windmill_bearing"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/loot_tables/blocks/yellow_sail.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:white_sail"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/generated/resources/data/create/recipes/crafting/kinetics/hand_crank.json

@@ -1,19 +1,19 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    " B ",
+    " S ",
     "CCC",
-    "  S"
+    "  A"
   ],
   "key": {
-    "S": {
+    "A": {
       "item": "create:andesite_alloy"
     },
     "C": {
       "tag": "minecraft:planks"
     },
-    "B": {
+    "S": {
-      "tag": "forge:ingots/brass"
+      "item": "create:shaft"
     }
   },
   "result": {

src/generated/resources/data/create/recipes/crafting/kinetics/sail_frame.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SSS",
+    "SAS",
+    "SSS"
+  ],
+  "key": {
+    "A": {
+      "item": "create:andesite_alloy"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "create:sail_frame",
+    "count": 8
+  }
+}

src/generated/resources/data/create/recipes/crafting/kinetics/white_sail.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "FFF",
+    "FWF",
+    "FFF"
+  ],
+  "key": {
+    "F": {
+      "item": "create:sail_frame"
+    },
+    "W": {
+      "tag": "minecraft:wool"
+    }
+  },
+  "result": {
+    "item": "create:white_sail",
+    "count": 8
+  }
+}

src/generated/resources/data/create/recipes/crafting/kinetics/windmill_bearing.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " B ",
+    " C ",
+    " I "
+  ],
+  "key": {
+    "I": {
+      "item": "create:shaft"
+    },
+    "B": {
+      "item": "create:turntable"
+    },
+    "C": {
+      "tag": "forge:stone"
+    }
+  },
+  "result": {
+    "item": "create:windmill_bearing"
+  }
+}

src/generated/resources/data/create/tags/blocks/fan_transparent.json

@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "create:blaze_burner",
+    "create:sail_frame",
     "#minecraft:fences",
     "minecraft:iron_bars"
   ]

src/generated/resources/data/create/tags/blocks/sails.json

@@ -0,0 +1,20 @@
+{
+  "replace": false,
+  "values": [
+    "create:orange_sail",
+    "create:magenta_sail",
+    "create:light_blue_sail",
+    "create:yellow_sail",
+    "create:lime_sail",
+    "create:pink_sail",
+    "create:gray_sail",
+    "create:light_gray_sail",
+    "create:cyan_sail",
+    "create:purple_sail",
+    "create:blue_sail",
+    "create:brown_sail",
+    "create:green_sail",
+    "create:red_sail",
+    "create:black_sail"
+  ]
+}

src/generated/resources/data/create/tags/blocks/windmill_sails.json

@@ -1,6 +1,23 @@
 {
   "replace": false,
   "values": [
+    "create:sail_frame",
+    "create:white_sail",
+    "create:orange_sail",
+    "create:magenta_sail",
+    "create:light_blue_sail",
+    "create:yellow_sail",
+    "create:lime_sail",
+    "create:pink_sail",
+    "create:gray_sail",
+    "create:light_gray_sail",
+    "create:cyan_sail",
+    "create:purple_sail",
+    "create:blue_sail",
+    "create:brown_sail",
+    "create:green_sail",
+    "create:red_sail",
+    "create:black_sail",
     "#minecraft:wool"
   ]
 }

src/main/java/com/simibubi/create/AllBlockPartials.java

@@ -51,17 +51,16 @@ public class AllBlockPartials {
 		SAW_BLADE_HORIZONTAL_REVERSED = get("mechanical_saw/blade_horizontal_reversed"),
 		SAW_BLADE_VERTICAL_ACTIVE = get("mechanical_saw/blade_vertical_active"),
 		SAW_BLADE_VERTICAL_INACTIVE = get("mechanical_saw/blade_vertical_inactive"),
-		SAW_BLADE_VERTICAL_REVERSED = get("mechanical_saw/blade_vertical_reversed"),
+		SAW_BLADE_VERTICAL_REVERSED = get("mechanical_saw/blade_vertical_reversed"), GAUGE_DIAL = get("gauge/dial"),
-		GAUGE_DIAL = get("gauge/dial"),
 		GAUGE_INDICATOR = get("gauge/indicator"), GAUGE_HEAD_SPEED = get("gauge/speedometer/head"),
 		GAUGE_HEAD_STRESS = get("gauge/stressometer/head"), BEARING_TOP = get("bearing/top"),
-		DRILL_HEAD = get("mechanical_drill/head"), HARVESTER_BLADE = get("mechanical_harvester/blade"),
+		BEARING_TOP_WOODEN = get("bearing/top_wooden"), DRILL_HEAD = get("mechanical_drill/head"),
-		DEPLOYER_POLE = get("deployer/pole"), DEPLOYER_HAND_POINTING = get("deployer/hand_pointing"),
+		HARVESTER_BLADE = get("mechanical_harvester/blade"), DEPLOYER_POLE = get("deployer/pole"),
-		DEPLOYER_HAND_PUNCHING = get("deployer/hand_punching"), DEPLOYER_HAND_HOLDING = get("deployer/hand_holding"),
+		DEPLOYER_HAND_POINTING = get("deployer/hand_pointing"), DEPLOYER_HAND_PUNCHING = get("deployer/hand_punching"),
-		ANALOG_LEVER_HANDLE = get("analog_lever/handle"), ANALOG_LEVER_INDICATOR = get("analog_lever/indicator"),
+		DEPLOYER_HAND_HOLDING = get("deployer/hand_holding"), ANALOG_LEVER_HANDLE = get("analog_lever/handle"),
-		BELT_FUNNEL_FLAP = get("belt_funnel/flap"), BELT_TUNNEL_FLAP = get("belt_tunnel/flap"),
+		ANALOG_LEVER_INDICATOR = get("analog_lever/indicator"), BELT_FUNNEL_FLAP = get("belt_funnel/flap"),
-		FLEXPEATER_INDICATOR = get("diodes/indicator"), FLYWHEEL = get("flywheel/wheel"),
+		BELT_TUNNEL_FLAP = get("belt_tunnel/flap"), FLEXPEATER_INDICATOR = get("diodes/indicator"),
-		FLYWHEEL_UPPER_ROTATING = get("flywheel/upper_rotating_connector"),
+		FLYWHEEL = get("flywheel/wheel"), FLYWHEEL_UPPER_ROTATING = get("flywheel/upper_rotating_connector"),
 
 		FLYWHEEL_LOWER_ROTATING = get("flywheel/lower_rotating_connector"),
 		FLYWHEEL_UPPER_SLIDING = get("flywheel/upper_sliding_connector"),

src/main/java/com/simibubi/create/AllBlocks.java

@@ -48,6 +48,8 @@ import com.simibubi.create.content.contraptions.components.saw.SawBlock;
 import com.simibubi.create.content.contraptions.components.saw.SawGenerator;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
+import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
+import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour;
 import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
@@ -347,7 +349,7 @@ public class AllBlocks {
 	public static final BlockEntry<HandCrankBlock> HAND_CRANK = REGISTRATE.block("hand_crank", HandCrankBlock::new)
 		.initialProperties(SharedProperties::wooden)
 		.blockstate(BlockStateGen.directionalBlockProvider(true))
-		.transform(StressConfigDefaults.setCapacity(32.0))
+		.transform(StressConfigDefaults.setCapacity(8.0))
 		.tag(AllBlockTags.BRITTLE.tag)
 		.item()
 		.transform(customItemModel())
@@ -594,16 +596,21 @@ public class AllBlocks {
 					.getString() + "/head"))))
 			.register();
 
+	public static final BlockEntry<WindmillBearingBlock> WINDMILL_BEARING =
+		REGISTRATE.block("windmill_bearing", WindmillBearingBlock::new)
+			.transform(BuilderTransformers.bearing("windmill", "gearbox", true))
+			.transform(StressConfigDefaults.setCapacity(512.0))
+			.register();
+
 	public static final BlockEntry<MechanicalBearingBlock> MECHANICAL_BEARING =
 		REGISTRATE.block("mechanical_bearing", MechanicalBearingBlock::new)
-			.transform(BuilderTransformers.bearing("mechanical", "gearbox"))
+			.transform(BuilderTransformers.bearing("mechanical", "gearbox", false))
-			.transform(StressConfigDefaults.setCapacity(512.0))
 			.transform(StressConfigDefaults.setImpact(4.0))
 			.register();
 
 	public static final BlockEntry<ClockworkBearingBlock> CLOCKWORK_BEARING =
 		REGISTRATE.block("clockwork_bearing", ClockworkBearingBlock::new)
-			.transform(BuilderTransformers.bearing("clockwork", "brass_gearbox"))
+			.transform(BuilderTransformers.bearing("clockwork", "brass_gearbox", false))
 			.transform(StressConfigDefaults.setImpact(4.0))
 			.register();
 
@@ -707,9 +714,7 @@ public class AllBlocks {
 		.onRegister(addMovementBehaviour(new SawMovementBehaviour()))
 		.addLayer(() -> RenderType::getCutoutMipped)
 		.item()
-		.model((c, p) -> p.blockItem(() -> c.getEntry()
+		.transform(customItemModel())
-			.getBlock(), "/horizontal"))
-		.build()
 		.register();
 
 	public static final BlockEntry<DeployerBlock> DEPLOYER = REGISTRATE.block("deployer", DeployerBlock::new)
@@ -749,6 +754,7 @@ public class AllBlocks {
 			.register();
 
 	static {
+		// SEATS
 		for (DyeColor colour : DyeColor.values()) {
 			String colourName = colour.getString();
 			SeatMovementBehaviour movementBehaviour = new SeatMovementBehaviour();
@@ -786,6 +792,46 @@ public class AllBlocks {
 		}
 	}
 
+	public static final BlockEntry<SailBlock> SAIL_FRAME = REGISTRATE.block("sail_frame", p -> SailBlock.frame(p))
+		.initialProperties(SharedProperties::wooden)
+		.properties(Block.Properties::nonOpaque)
+		.blockstate(BlockStateGen.directionalBlockProvider(false))
+		.tag(AllBlockTags.WINDMILL_SAILS.tag)
+		.tag(AllBlockTags.FAN_TRANSPARENT.tag)
+		.simpleItem()
+		.register();
+
+	public static final BlockEntry<?>[] DYED_SAILS = new BlockEntry<?>[DyeColor.values().length];
+
+	public static final BlockEntry<SailBlock> SAIL = REGISTRATE.block("white_sail", p -> SailBlock.withCanvas(p))
+		.initialProperties(SharedProperties::wooden)
+		.properties(Block.Properties::nonOpaque)
+		.blockstate(BlockStateGen.directionalBlockProvider(false))
+		.tag(AllBlockTags.WINDMILL_SAILS.tag)
+		.simpleItem()
+		.register();
+
+	static {
+		// DYED SAILS
+		for (DyeColor colour : DyeColor.values()) {
+			if (colour == DyeColor.WHITE) {
+				DYED_SAILS[colour.ordinal()] = SAIL;
+				continue;
+			}
+			String colourName = colour.getString();
+			DYED_SAILS[colour.ordinal()] = REGISTRATE.block(colourName + "_sail", p -> SailBlock.withCanvas(p))
+				.properties(Block.Properties::nonOpaque)
+				.initialProperties(SharedProperties::wooden)
+				.blockstate((c, p) -> p.directionalBlock(c.get(), p.models()
+					.withExistingParent(colourName + "_sail", p.modLoc("block/white_sail"))
+					.texture("0", p.modLoc("block/sail/canvas_" + colourName))))
+				.tag(AllBlockTags.WINDMILL_SAILS.tag)
+				.tag(AllBlockTags.SAILS.tag)
+				.loot((p, b) -> p.registerDropping(b, SAIL.get()))
+				.register();
+		}
+	}
+
 	public static final BlockEntry<CasingBlock> ANDESITE_CASING = REGISTRATE.block("andesite_casing", CasingBlock::new)
 		.transform(BuilderTransformers.casing(AllSpriteShifts.ANDESITE_CASING))
 		.register();

src/main/java/com/simibubi/create/AllShapes.java

@@ -36,6 +36,9 @@ public class AllShapes {
 		PULLEY = shape(0, 0, 0, 16, 16, 2).add(1, 1, 2, 15, 15, 14)
 			.add(0, 0, 14, 16, 16, 16)
 			.forHorizontalAxis(),
+		SAIL_FRAME_COLLISION = shape(0, 5, 0, 16, 9, 16).erase(2, 0, 2, 14, 16, 14).forDirectional(),
+		SAIL_FRAME = shape(0, 5, 0, 16, 9, 16).forDirectional(),
+		SAIL = shape(0, 5, 0, 16, 10, 16).forDirectional(),
 		SPEED_CONTROLLER = shape(0, 0, 0, 16, 2, 16).add(1, 1, 1, 15, 15, 15)
 			.erase(0, 8, 5, 16, 16, 11)
 			.add(2, 9, 2, 14, 14, 14)
@@ -130,10 +133,12 @@ public class AllShapes {
 
 	BASIN_BLOCK_SHAPE = shape(0, 2, 0, 16, 16, 16).erase(2, 2, 2, 14, 16, 14)
 		.add(2, 0, 2, 14, 2, 14)
-		.build(), BASIN_COLLISION_SHAPE =
+		.build(), BASIN_RAYTRACE_SHAPE =
-			shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 16, 14)
+			shape(0, 2, 0, 16, 16, 16).add(2, 0, 2, 14, 2, 14)
-				.add(2, 0, 2, 14, 2, 14)
 				.build(),
+		BASIN_COLLISION_SHAPE = shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 16, 14)
+			.add(2, 0, 2, 14, 2, 14)
+			.build(),
 		HEATER_BLOCK_SHAPE = shape(2, 0, 2, 14, 14, 14).add(0, 0, 0, 16, 4, 16)
 			.build(),
 		HEATER_BLOCK_SPECIAL_COLLISION_SHAPE = shape(0, 0, 0, 16, 4, 16).build(),

src/main/java/com/simibubi/create/AllTags.java

@@ -106,7 +106,7 @@ public class AllTags {
 	}
 
 	public static enum AllBlockTags {
-		WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE, NON_MOVABLE, BRITTLE, SEATS, VALVE_HANDLES, FAN_TRANSPARENT, SLIMY_LOGS(TIC)
+		WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE, NON_MOVABLE, BRITTLE, SEATS, SAILS, VALVE_HANDLES, FAN_TRANSPARENT, SLIMY_LOGS(TIC)
 
 		;
 

src/main/java/com/simibubi/create/AllTileEntities.java

@@ -37,6 +37,7 @@ import com.simibubi.create.content.contraptions.components.saw.SawTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingTileEntity;
+import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonRenderer;
@@ -278,6 +279,12 @@ public class AllTileEntities {
 		.renderer(() -> MechanicalPistonRenderer::new)
 		.register();
 
+	public static final TileEntityEntry<WindmillBearingTileEntity> WINDMILL_BEARING = Create.registrate()
+		.tileEntity("windmill_bearing", WindmillBearingTileEntity::new)
+		.validBlocks(AllBlocks.WINDMILL_BEARING)
+		.renderer(() -> BearingRenderer::new)
+		.register();
+	
 	public static final TileEntityEntry<MechanicalBearingTileEntity> MECHANICAL_BEARING = Create.registrate()
 		.tileEntity("mechanical_bearing", MechanicalBearingTileEntity::new)
 		.validBlocks(AllBlocks.MECHANICAL_BEARING)

src/main/java/com/simibubi/create/content/AllSections.java

@@ -16,9 +16,6 @@ public enum AllSections {
 	/** Item transport and other Utility */
 	LOGISTICS(Palette.Yellow),
 
-	/** Helpful gadgets and other shenanigans */
-	CURIOSITIES(Palette.Purple),
-
 	/** Tools for strucuture movement and replication */
 	SCHEMATICS(Palette.Blue),
 
@@ -27,6 +24,9 @@ public enum AllSections {
 
 	/** Base materials, ingredients and tools */
 	MATERIALS(Palette.Green),
+	
+	/** Helpful gadgets and other shenanigans */
+	CURIOSITIES(Palette.Purple),
 
 	/** Fallback section */
 	UNASSIGNED(Palette.Gray)

src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java

@@ -186,6 +186,8 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT
 				if (AllItems.CRAFTER_SLOT_COVER.isIn(heldItem)) {
 					if (crafter.covered)
 						return ActionResultType.PASS;
+					if (!crafter.inventory.isEmpty())
+						return ActionResultType.PASS;
 					crafter.covered = true;
 					crafter.markDirty();
 					crafter.sendData();

src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java

@@ -68,9 +68,10 @@ public class HandCrankTileEntity extends GeneratingKineticTileEntity {
 				updateGeneratedRotation();
 		}
 	}
-
+	
 	@Override
 	protected Block getStressConfigKey() {
 		return AllBlocks.HAND_CRANK.get();
 	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java

@@ -35,7 +35,7 @@ public class BeltPressingCallbacks {
 			return PASS;
 		if (!pressTe.running)
 			return PASS;
-		if (pressTe.runningTicks != 30)
+		if (pressTe.runningTicks != MechanicalPressTileEntity.CYCLE / 2)
 			return HOLD;
 
 		Optional<PressingRecipe> recipe = pressTe.getRecipe(transported.stack);

src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java

@@ -4,10 +4,8 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity.Mode;
 import com.simibubi.create.foundation.block.ITE;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BlockItemUseContext;
@@ -19,10 +17,8 @@ import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
-import net.minecraft.world.World;
 
-public class MechanicalPressBlock extends HorizontalKineticBlock
+public class MechanicalPressBlock extends HorizontalKineticBlock implements ITE<MechanicalPressTileEntity> {
-		implements ITE<MechanicalPressTileEntity> {
 
 	public MechanicalPressBlock(Properties properties) {
 		super(properties);
@@ -32,7 +28,6 @@ public class MechanicalPressBlock extends HorizontalKineticBlock
 	public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
 		if (context.getEntity() instanceof PlayerEntity)
 			return AllShapes.CASING_14PX.get(Direction.DOWN);
-
 		return AllShapes.MECHANICAL_PROCESSOR_SHAPE;
 	}
 
@@ -41,22 +36,6 @@ public class MechanicalPressBlock extends HorizontalKineticBlock
 		return !AllBlocks.BASIN.has(worldIn.getBlockState(pos.down()));
 	}
 
-	@Override
-	public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
-			boolean isMoving) {
-		if (worldIn.isRemote)
-			return;
-
-		withTileEntityDo(worldIn, pos, te -> {
-			if (!worldIn.isBlockPowered(pos)) {
-				te.finished = false;
-				return;
-			}
-			if (!te.finished && !te.running && te.getSpeed() != 0)
-				te.start(Mode.WORLD);
-		});
-	}
-
 	@Override
 	public TileEntity createTileEntity(BlockState state, IBlockReader world) {
 		return AllTileEntities.MECHANICAL_PRESS.create();
@@ -72,12 +51,14 @@ public class MechanicalPressBlock extends HorizontalKineticBlock
 
 	@Override
 	public Axis getRotationAxis(BlockState state) {
-		return state.get(HORIZONTAL_FACING).getAxis();
+		return state.get(HORIZONTAL_FACING)
+			.getAxis();
 	}
 
 	@Override
 	public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) {
-		return face.getAxis() == state.get(HORIZONTAL_FACING).getAxis();
+		return face.getAxis() == state.get(HORIZONTAL_FACING)
+			.getAxis();
 	}
 
 	@Override

src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.content.contraptions.processing.BasinOperatingTileEntity;
@@ -16,6 +17,7 @@ import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.item.SmartInventory;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour;
+import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
@@ -49,6 +51,8 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 	public int prevRunningTicks;
 	public int runningTicks;
 	static final int CYCLE = 240;
+	static final int ENTITY_SCAN = 10;
+	int entityScanCooldown;
 
 	public boolean running;
 	public Mode mode;
@@ -57,6 +61,7 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 	public MechanicalPressTileEntity(TileEntityType<? extends MechanicalPressTileEntity> type) {
 		super(type);
 		mode = Mode.WORLD;
+		entityScanCooldown = ENTITY_SCAN;
 	}
 
 	@Override
@@ -106,10 +111,11 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 	public float getRenderedHeadOffset(float partialTicks) {
 		if (!running)
 			return 0;
+		int runningTicks = Math.abs(this.runningTicks);
 		float ticks = MathHelper.lerp(partialTicks, prevRunningTicks, runningTicks);
 		if (runningTicks < (CYCLE * 2) / 3)
-			return (float) MathHelper.clamp(Math.pow(ticks / CYCLE * 2, 3), 0, mode.headOffset);
+			return (float) MathHelper.clamp(Math.pow(ticks / CYCLE * 2, 3), 0, 1) * mode.headOffset;
-		return MathHelper.clamp((CYCLE - ticks) / CYCLE * 3 * mode.headOffset, 0, mode.headOffset);
+		return MathHelper.clamp((CYCLE - ticks) / CYCLE * 3, 0, 1) * mode.headOffset;
 	}
 
 	public void start(Mode mode) {
@@ -132,8 +138,39 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 	public void tick() {
 		super.tick();
 
-		if (!running || world == null)
+		if (!running || world == null) {
+			if (hasWorld() && !world.isRemote) {
+
+				if (getSpeed() == 0)
+					return;
+				if (entityScanCooldown > 0)
+					entityScanCooldown--;
+				if (entityScanCooldown <= 0) {
+					entityScanCooldown = ENTITY_SCAN;
+					if (TileEntityBehaviour.get(world, pos.down(2), TransportedItemStackHandlerBehaviour.TYPE) != null)
+						return;
+					if (AllBlocks.BASIN.has(world.getBlockState(pos.down(2))))
+						return;
+
+					for (ItemEntity itemEntity : world.getEntitiesWithinAABB(ItemEntity.class,
+						new AxisAlignedBB(pos.down()).shrink(.125f))) {
+						ItemStack stack = itemEntity.getItem();
+						Optional<PressingRecipe> recipe = getRecipe(stack);
+						if (!recipe.isPresent())
+							continue;
+						start(Mode.WORLD);
+						return;
+					}
+				}
+
+			}
 			return;
+		}
+
+		if (world.isRemote && runningTicks == -CYCLE / 2) {
+			prevRunningTicks = CYCLE / 2;
+			return;
+		}
 
 		if (runningTicks == CYCLE / 2) {
 			if (inWorld())
@@ -150,8 +187,6 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 
 		if (!world.isRemote && runningTicks > CYCLE) {
 			finished = true;
-			if (inWorld())
-				finished = world.isBlockPowered(pos);
 			running = false;
 
 			if (onBasin() && matchBasinRecipe(currentRecipe))
@@ -164,8 +199,12 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity {
 
 		prevRunningTicks = runningTicks;
 		runningTicks += getRunningTickSpeed();
-		if (prevRunningTicks < CYCLE / 2 && runningTicks >= CYCLE / 2)
+		if (prevRunningTicks < CYCLE / 2 && runningTicks >= CYCLE / 2) {
 			runningTicks = CYCLE / 2;
+			// Pause the ticks until a packet is received
+			if (world.isRemote)
+				runningTicks = -(CYCLE / 2);
+		}
 	}
 
 	protected void applyCompactingOnBasin() {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java

@@ -12,6 +12,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.bea
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingTileEntity;
+import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
 import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
@@ -176,14 +177,14 @@ public class BlockMovementTraits {
 			return direction == state.get(EngineBlock.HORIZONTAL_FACING).getOpposite();
 		if (block instanceof BellBlock) {
 			BellAttachment attachment = state.get(BlockStateProperties.BELL_ATTACHMENT);
-			if (attachment == BellAttachment.FLOOR) {
+			if (attachment == BellAttachment.FLOOR) 
 				return direction == Direction.DOWN;
-			}
+			if (attachment == BellAttachment.CEILING) 
-			if (attachment == BellAttachment.CEILING) {
 				return direction == Direction.UP;
-			}
 			return direction == state.get(HorizontalBlock.HORIZONTAL_FACING);
 		}
+		if (state.getBlock() instanceof SailBlock)
+			return direction.getAxis() != state.get(SailBlock.FACING).getAxis();
 		return false;
 	}
 
@@ -206,7 +207,9 @@ public class BlockMovementTraits {
 			return facing == Direction.DOWN;
 		if (state.getBlock() instanceof CarpetBlock)
 			return facing == Direction.UP;
+		if (state.getBlock() instanceof SailBlock)
+			return facing.getAxis() == state.get(SailBlock.FACING).getAxis();
 		return isBrittle(state);
 	}
-
+	
 }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java

@@ -27,7 +27,9 @@ public class BearingRenderer extends KineticTileEntityRenderer {
 		IBearingTileEntity bearingTe = (IBearingTileEntity) te;
 		final Direction facing = te.getBlockState()
 			.get(BlockStateProperties.FACING);
-		SuperByteBuffer superBuffer = AllBlockPartials.BEARING_TOP.renderOn(te.getBlockState());
+		AllBlockPartials top =
+			bearingTe.isWoodenTop() ? AllBlockPartials.BEARING_TOP_WOODEN : AllBlockPartials.BEARING_TOP;
+		SuperByteBuffer superBuffer = top.renderOn(te.getBlockState());
 
 		float interpolatedAngle = bearingTe.getInterpolatedAngle(partialTicks - 1);
 		kineticRotationTransform(superBuffer, te, facing.getAxis(), (float) (interpolatedAngle / 180 * Math.PI), light);

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java

@@ -1,11 +1,18 @@
 package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
 
+import java.util.List;
+
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkContraption.HandType;
+import com.simibubi.create.foundation.gui.AllIcons;
+import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
+import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions;
+import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
+import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 
 import net.minecraft.block.BlockState;
@@ -31,11 +38,27 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 	protected boolean running;
 	protected boolean assembleNextTick;
 
+	protected ScrollOptionBehaviour<ClockHands> operationMode;
+
 	public ClockworkBearingTileEntity(TileEntityType<? extends ClockworkBearingTileEntity> type) {
 		super(type);
 		setLazyTickRate(3);
 	}
 
+	@Override
+	public void addBehaviours(List<TileEntityBehaviour> behaviours) {
+		super.addBehaviours(behaviours);
+		operationMode = new ScrollOptionBehaviour(ClockHands.class,
+			Lang.translate("contraptions.clockwork.clock_hands"), this, getMovementModeSlot());
+		operationMode.requiresWrench();
+		behaviours.add(operationMode);
+	}
+
+	@Override
+	public boolean isWoodenTop() {
+		return false;
+	}
+
 	@Override
 	public void tick() {
 		super.tick();
@@ -51,9 +74,11 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 				boolean canDisassemble = true;
 				if (speed == 0 && (canDisassemble || hourHand == null || hourHand.getContraption().blocks.isEmpty())) {
 					if (hourHand != null)
-						hourHand.getContraption().stop(world);
+						hourHand.getContraption()
+							.stop(world);
 					if (minuteHand != null)
-						minuteHand.getContraption().stop(world);
+						minuteHand.getContraption()
+							.stop(world);
 					disassemble();
 				}
 				return;
@@ -79,15 +104,18 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 	}
 
 	protected void applyRotations() {
-		Axis axis = getBlockState().get(BlockStateProperties.FACING).getAxis();
+		Axis axis = getBlockState().get(BlockStateProperties.FACING)
+			.getAxis();
 		Direction direction = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis);
 		Vector3d directionVec = Vector3d.of(direction.getDirectionVec());
 		if (hourHand != null) {
-			Vector3d vec = new Vector3d(1, 1, 1).scale(hourAngle).mul(directionVec);
+			Vector3d vec = new Vector3d(1, 1, 1).scale(hourAngle)
+				.mul(directionVec);
 			hourHand.rotateTo(vec.x, vec.y, vec.z);
 		}
 		if (minuteHand != null) {
-			Vector3d vec = new Vector3d(1, 1, 1).scale(minuteAngle).mul(directionVec);
+			Vector3d vec = new Vector3d(1, 1, 1).scale(minuteAngle)
+				.mul(directionVec);
 			minuteHand.rotateTo(vec.x, vec.y, vec.z);
 		}
 	}
@@ -103,10 +131,9 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 		float speed = getAngularSpeed() / 2f;
 
 		if (speed != 0) {
-			int dayTime = (int) (world.getDayTime() % 24000);
+			ClockHands mode = ClockHands.values()[operationMode.getValue()];
-			int hours = (dayTime / 1000 + 6) % 24;
+			float hourTarget = mode == ClockHands.HOUR_FIRST ? getHourTarget(false)
-			int offset = getBlockState().get(ClockworkBearingBlock.FACING).getAxisDirection().getOffset();
+				: mode == ClockHands.MINUTE_FIRST ? getMinuteTarget() : getHourTarget(true);
-			float hourTarget = (float) (offset * -360 / 12f * (hours % 12));
 			float shortestAngleDiff = AngleHelper.getShortestAngleDiff(hourAngle, hourTarget);
 			if (shortestAngleDiff < 0) {
 				speed = Math.max(speed, shortestAngleDiff);
@@ -122,10 +149,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 		float speed = getAngularSpeed();
 
 		if (speed != 0) {
-			int dayTime = (int) (world.getDayTime() % 24000);
+			ClockHands mode = ClockHands.values()[operationMode.getValue()];
-			int minutes = (dayTime % 1000) * 60 / 1000;
+			float minuteTarget = mode == ClockHands.MINUTE_FIRST ? getHourTarget(false) : getMinuteTarget();
-			int offset = getBlockState().get(ClockworkBearingBlock.FACING).getAxisDirection().getOffset();
-			float minuteTarget = (float) (offset * -360 / 60f * (minutes));
 			float shortestAngleDiff = AngleHelper.getShortestAngleDiff(minuteAngle, minuteTarget);
 			if (shortestAngleDiff < 0) {
 				speed = Math.max(speed, shortestAngleDiff);
@@ -137,6 +162,26 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 		return speed + clientMinuteAngleDiff / 3f;
 	}
 
+	protected float getHourTarget(boolean cycle24) {
+		int dayTime = (int) (world.getDayTime() % 24000);
+		int hours = (dayTime / 1000 + 6) % 24;
+		int offset = getBlockState().get(ClockworkBearingBlock.FACING)
+			.getAxisDirection()
+			.getOffset();
+		float hourTarget = (float) (offset * -360 / (cycle24 ? 24f : 12f) * (hours % (cycle24 ? 24 : 12)));
+		return hourTarget;
+	}
+
+	protected float getMinuteTarget() {
+		int dayTime = (int) (world.getDayTime() % 24000);
+		int minutes = (dayTime % 1000) * 60 / 1000;
+		int offset = getBlockState().get(ClockworkBearingBlock.FACING)
+			.getAxisDirection()
+			.getOffset();
+		float minuteTarget = (float) (offset * -360 / 60f * (minutes));
+		return minuteTarget;
+	}
+
 	public float getAngularSpeed() {
 		float speed = -Math.abs(getSpeed() * 3 / 10f);
 		if (world.isRemote)
@@ -145,7 +190,8 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 	}
 
 	public void assemble() {
-		if (!(world.getBlockState(pos).getBlock() instanceof ClockworkBearingBlock))
+		if (!(world.getBlockState(pos)
+			.getBlock() instanceof ClockworkBearingBlock))
 			return;
 
 		Direction direction = getBlockState().get(BlockStateProperties.FACING);
@@ -161,15 +207,19 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 			return;
 		BlockPos anchor = pos.offset(direction);
 
-		contraption.getLeft().removeBlocksFromWorld(world, BlockPos.ZERO);
+		contraption.getLeft()
-		hourHand = ContraptionEntity.createStationary(world, contraption.getLeft()).controlledBy(this);
+			.removeBlocksFromWorld(world, BlockPos.ZERO);
+		hourHand = ContraptionEntity.createStationary(world, contraption.getLeft())
+			.controlledBy(this);
 		hourHand.setPosition(anchor.getX(), anchor.getY(), anchor.getZ());
 		world.addEntity(hourHand);
 
 		if (contraption.getRight() != null) {
 			anchor = pos.offset(direction, contraption.getRight().offset + 1);
-			contraption.getRight().removeBlocksFromWorld(world, BlockPos.ZERO);
+			contraption.getRight()
-			minuteHand = ContraptionEntity.createStationary(world, contraption.getRight()).controlledBy(this);
+				.removeBlocksFromWorld(world, BlockPos.ZERO);
+			minuteHand = ContraptionEntity.createStationary(world, contraption.getRight())
+				.controlledBy(this);
 			minuteHand.setPosition(anchor.getX(), anchor.getY(), anchor.getZ());
 			world.addEntity(minuteHand);
 		}
@@ -235,15 +285,15 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 	protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) {
 		float hourAngleBefore = hourAngle;
 		float minuteAngleBefore = minuteAngle;
-		
+
 		running = compound.getBoolean("Running");
 		hourAngle = compound.getFloat("HourAngle");
 		minuteAngle = compound.getFloat("MinuteAngle");
 		super.fromTag(state, compound, clientPacket);
-		
+
 		if (!clientPacket)
 			return;
-		
+
 		if (running) {
 			clientHourAngleDiff = AngleHelper.getShortestAngleDiff(hourAngleBefore, hourAngle);
 			clientMinuteAngleDiff = AngleHelper.getShortestAngleDiff(minuteAngleBefore, minuteAngle);
@@ -287,8 +337,7 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 	}
 
 	@Override
-	public void collided() {
+	public void collided() {}
-	}
 
 	@Override
 	public boolean isAttachedTo(ContraptionEntity contraption) {
@@ -305,4 +354,32 @@ public class ClockworkBearingTileEntity extends KineticTileEntity implements IBe
 		return running;
 	}
 
+	static enum ClockHands implements INamedIconOptions {
+
+		HOUR_FIRST(AllIcons.I_HOUR_HAND_FIRST),
+		MINUTE_FIRST(AllIcons.I_MINUTE_HAND_FIRST),
+		HOUR_FIRST_24(AllIcons.I_HOUR_HAND_FIRST_24),
+
+		;
+
+		private String translationKey;
+		private AllIcons icon;
+
+		private ClockHands(AllIcons icon) {
+			this.icon = icon;
+			translationKey = "contraptions.clockwork." + Lang.asId(name());
+		}
+
+		@Override
+		public AllIcons getIcon() {
+			return icon;
+		}
+
+		@Override
+		public String getTranslationKey() {
+			return translationKey;
+		}
+
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingTileEntity.java

@@ -1,9 +1,24 @@
 package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
 
+import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot;
 import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption;
+import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform;
+
+import net.minecraft.util.Direction.Axis;
 
 public interface IBearingTileEntity extends IControlContraption {
 
 	float getInterpolatedAngle(float partialTicks);
 
+	boolean isWoodenTop();
+
+	default ValueBoxTransform getMovementModeSlot() {
+		return new DirectionalExtenderScrollOptionSlot((state, d) -> {
+			Axis axis = d.getAxis();
+			Axis bearingAxis = state.get(BearingBlock.FACING)
+				.getAxis();
+			return bearingAxis != axis;
+		});
+	}
+
 }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java

@@ -2,9 +2,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement.be
 
 import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.foundation.block.ITE;
-import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.tileentity.TileEntity;
@@ -27,44 +25,28 @@ public class MechanicalBearingBlock extends BearingBlock implements ITE<Mechanic
 	}
 
 	@Override
-	public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos,
+	public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
-			PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
+		BlockRayTraceResult hit) {
 		if (!player.isAllowEdit())
 			return ActionResultType.FAIL;
 		if (player.isSneaking())
 			return ActionResultType.FAIL;
-		if (player.getHeldItem(handIn).isEmpty()) {
+		if (player.getHeldItem(handIn)
-			if (!worldIn.isRemote) {
+			.isEmpty()) {
-				withTileEntityDo(worldIn, pos, te -> {
+			if (worldIn.isRemote)
-					if (te.running) {
+				return ActionResultType.SUCCESS;
-						te.disassemble();
+			withTileEntityDo(worldIn, pos, te -> {
-						return;
+				if (te.running) {
-					}
+					te.disassemble();
-					te.assembleNextTick = true;
+					return;
-				});
+				}
-			}
+				te.assembleNextTick = true;
+			});
 			return ActionResultType.SUCCESS;
 		}
 		return ActionResultType.PASS;
 	}
 
-	@Override
-	public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) {
-		if (worldIn instanceof WrappedWorld)
-			return;
-		withTileEntityDo(worldIn, pos, MechanicalBearingTileEntity::neighbourChanged);
-	}
-
-	@Override
-	public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
-			boolean isMoving) {
-		if (worldIn instanceof WrappedWorld)
-			return;
-		if (worldIn.isRemote)
-			return;
-		withTileEntityDo(worldIn, pos, MechanicalBearingTileEntity::neighbourChanged);
-	}
-
 	@Override
 	public Class<MechanicalBearingTileEntity> getTileEntityClass() {
 		return MechanicalBearingTileEntity.class;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java

@@ -6,9 +6,7 @@ import java.util.List;
 
 import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
-import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.BlockHelper;
@@ -27,63 +25,32 @@ import net.minecraft.util.math.vector.Vector3d;
 
 public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity implements IBearingTileEntity {
 
-	protected boolean isWindmill;
+	protected ScrollOptionBehaviour<RotationMode> movementMode;
 	protected ContraptionEntity movedContraption;
 	protected float angle;
 	protected boolean running;
 	protected boolean assembleNextTick;
 	protected float clientAngleDiff;
-	protected ScrollOptionBehaviour<RotationMode> movementMode;
-	protected float lastGeneratedSpeed;
 
 	public MechanicalBearingTileEntity(TileEntityType<? extends MechanicalBearingTileEntity> type) {
 		super(type);
-		isWindmill = false;
 		setLazyTickRate(3);
 	}
 
+	@Override
+	public boolean isWoodenTop() {
+		return false;
+	}
+
 	@Override
 	public void addBehaviours(List<TileEntityBehaviour> behaviours) {
 		super.addBehaviours(behaviours);
-		movementMode = new ScrollOptionBehaviour<>(RotationMode.class, Lang.translate("contraptions.movement_mode"),
+		movementMode = new ScrollOptionBehaviour(RotationMode.class, Lang.translate("contraptions.movement_mode"),
 			this, getMovementModeSlot());
 		movementMode.requiresWrench();
 		behaviours.add(movementMode);
 	}
 
-	@Override
-	public float calculateAddedStressCapacity() {
-		return isWindmill ? super.calculateAddedStressCapacity() : 0;
-	}
-
-	@Override
-	public float calculateStressApplied() {
-		return isWindmill ? 0 : super.calculateStressApplied();
-	}
-
-	public void neighbourChanged() {
-		if (!hasWorld())
-			return;
-
-		boolean shouldWindmill = world.isBlockPowered(pos);
-		if (shouldWindmill == isWindmill)
-			return;
-
-		isWindmill = shouldWindmill;
-		if (isWindmill && !running)
-			assembleNextTick = true;
-		if (isWindmill && running)
-			updateGeneratedRotation();
-
-		if (!isWindmill && running) {
-			updateGeneratedRotation();
-			if (getSpeed() == 0)
-				assembleNextTick = true;
-		}
-
-		sendData();
-	}
-
 	@Override
 	public void remove() {
 		if (!world.isRemote)
@@ -91,22 +58,10 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 		super.remove();
 	}
 
-	@Override
-	public float getGeneratedSpeed() {
-		if (!running || !isWindmill)
-			return 0;
-		if (movedContraption == null)
-			return lastGeneratedSpeed;
-		int sails = ((BearingContraption) movedContraption.getContraption()).getSailBlocks() / 8;
-		return MathHelper.clamp(sails, 1, 16);
-	}
-
 	@Override
 	public void write(CompoundNBT compound, boolean clientPacket) {
 		compound.putBoolean("Running", running);
-		compound.putBoolean("Windmill", isWindmill);
 		compound.putFloat("Angle", angle);
-		compound.putFloat("LastGenerated", lastGeneratedSpeed);
 		super.write(compound, clientPacket);
 	}
 
@@ -114,11 +69,9 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 	protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) {
 		float angleBefore = angle;
 		running = compound.getBoolean("Running");
-		isWindmill = compound.getBoolean("Windmill");
 		angle = compound.getFloat("Angle");
-		lastGeneratedSpeed = compound.getFloat("LastGenerated");
 		super.fromTag(state, compound, clientPacket);
-		
+
 		if (!clientPacket)
 			return;
 		if (running) {
@@ -142,7 +95,7 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 	}
 
 	public float getAngularSpeed() {
-		float speed = getSpeed() * 3 / 10f;
+		float speed = (isWindmill() ? getGeneratedSpeed() : getSpeed()) * 3 / 10f;
 		if (world.isRemote) {
 			speed *= ServerSpeedProvider.get();
 			speed += clientAngleDiff / 3f;
@@ -150,9 +103,13 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 		return speed;
 	}
 
+	protected boolean isWindmill() {
+		return false;
+	}
+
 	public void assemble() {
 		if (!(world.getBlockState(pos)
-			.getBlock() instanceof MechanicalBearingBlock))
+			.getBlock() instanceof BearingBlock))
 			return;
 
 		Direction direction = getBlockState().get(FACING);
@@ -161,7 +118,7 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 		BearingContraption contraption = BearingContraption.assembleBearingAt(world, pos, direction);
 		if (contraption == null)
 			return;
-		if (isWindmill && contraption.getSailBlocks() == 0)
+		if (isWindmill() && contraption.getSailBlocks() == 0)
 			return;
 		if (contraption.blocks.isEmpty())
 			return;
@@ -180,21 +137,17 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 		updateGeneratedRotation();
 	}
 
-	@Override
-	public void updateGeneratedRotation() {
-		super.updateGeneratedRotation();
-		lastGeneratedSpeed = getGeneratedSpeed();
-	}
-
 	public void disassemble() {
 		if (!running && movedContraption == null)
 			return;
+		angle = 0;
+		if (isWindmill())
+			applyRotation();
 		if (movedContraption != null)
 			movedContraption.disassemble();
 
 		movedContraption = null;
 		running = false;
-		angle = 0;
 		updateGeneratedRotation();
 		assembleNextTick = false;
 		sendData();
@@ -221,7 +174,7 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 				}
 				return;
 			} else {
-				if (speed == 0 && !isWindmill)
+				if (speed == 0 && !isWindmill())
 					return;
 				assemble();
 			}
@@ -291,15 +244,6 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 		return !isRemoved();
 	}
 
-	protected ValueBoxTransform getMovementModeSlot() {
-		return new DirectionalExtenderScrollOptionSlot((state, d) -> {
-			Axis axis = d.getAxis();
-			Axis bearingAxis = state.get(MechanicalBearingBlock.FACING)
-				.getAxis();
-			return bearingAxis != axis;
-		});
-	}
-
 	@Override
 	public void collided() {}
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java

@@ -0,0 +1,198 @@
+package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllShapes;
+import com.simibubi.create.foundation.block.ProperDirectionalBlock;
+import com.simibubi.create.foundation.utility.DyeHelper;
+import com.simibubi.create.foundation.utility.Iterate;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.BlockItemUseContext;
+import net.minecraft.item.DyeColor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.shapes.ISelectionContext;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
+
+public class SailBlock extends ProperDirectionalBlock {
+
+	public static SailBlock frame(Properties properties) {
+		return new SailBlock(properties, true);
+	}
+
+	public static SailBlock withCanvas(Properties properties) {
+		return new SailBlock(properties, false);
+	}
+
+	private boolean frame;
+
+	protected SailBlock(Properties p_i48415_1_, boolean frame) {
+		super(p_i48415_1_);
+		this.frame = frame;
+	}
+
+	@Override
+	public BlockState getStateForPlacement(BlockItemUseContext context) {
+		BlockState state = super.getStateForPlacement(context);
+		return state.with(FACING, state.get(FACING)
+			.getOpposite());
+	}
+
+	@Override
+	public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand,
+		BlockRayTraceResult ray) {
+		ItemStack heldItem = player.getHeldItem(hand);
+
+		if (AllBlocks.SAIL.isIn(heldItem) || AllBlocks.SAIL_FRAME.isIn(heldItem)) {
+			Direction offset =
+				SailBlockPlacementHelper.getPlacementOffset(world, state.get(FACING), pos, ray.getHitVec());
+			if (offset == null)
+				return ActionResultType.SUCCESS;
+			BlockState blockState = ((BlockItem) heldItem.getItem()).getBlock()
+				.getDefaultState()
+				.with(FACING, state.get(FACING));
+			BlockPos offsetPos = pos.offset(offset);
+			if (!world.isRemote && world.getBlockState(offsetPos)
+				.getMaterial()
+				.isReplaceable())
+				world.setBlockState(offsetPos, blockState);
+			return ActionResultType.SUCCESS;
+		}
+
+		if (frame)
+			return ActionResultType.PASS;
+
+		for (DyeColor color : DyeColor.values()) {
+			if (!heldItem.getItem()
+				.isIn(DyeHelper.getTagOfDye(color)))
+				continue;
+			if (!world.isRemote)
+				applyDye(state, world, pos, color);
+			return ActionResultType.SUCCESS;
+		}
+
+		return ActionResultType.PASS;
+	}
+
+	protected void applyDye(BlockState state, World world, BlockPos pos, DyeColor color) {
+		BlockState newState = AllBlocks.DYED_SAILS[color.ordinal()].getDefaultState()
+			.with(FACING, state.get(FACING));
+
+		// Dye the block itself
+		if (state != newState) {
+			world.setBlockState(pos, newState);
+			return;
+		}
+
+		// Dye all adjacent
+		for (Direction d : Iterate.directions) {
+			if (d.getAxis() == state.get(FACING)
+				.getAxis())
+				continue;
+			BlockPos offset = pos.offset(d);
+			BlockState adjacentState = world.getBlockState(offset);
+			Block block = adjacentState.getBlock();
+			if (!(block instanceof SailBlock) || ((SailBlock) block).frame)
+				continue;
+			if (state == adjacentState)
+				continue;
+			world.setBlockState(offset, newState);
+			return;
+		}
+
+		// Dye all the things
+		List<BlockPos> frontier = new ArrayList<>();
+		frontier.add(pos);
+		Set<BlockPos> visited = new HashSet<>();
+		int timeout = 100;
+		while (!frontier.isEmpty()) {
+			if (timeout-- < 0)
+				break;
+
+			BlockPos currentPos = frontier.remove(0);
+			visited.add(currentPos);
+
+			for (Direction d : Iterate.directions) {
+				if (d.getAxis() == state.get(FACING)
+					.getAxis())
+					continue;
+				BlockPos offset = currentPos.offset(d);
+				if (visited.contains(offset))
+					continue;
+				BlockState adjacentState = world.getBlockState(offset);
+				Block block = adjacentState.getBlock();
+				if (!(block instanceof SailBlock) || ((SailBlock) block).frame)
+					continue;
+				if (state != adjacentState)
+					world.setBlockState(offset, newState);
+				frontier.add(offset);
+				visited.add(offset);
+			}
+		}
+	}
+
+	@Override
+	public VoxelShape getShape(BlockState state, IBlockReader p_220053_2_, BlockPos p_220053_3_,
+		ISelectionContext p_220053_4_) {
+		return (frame ? AllShapes.SAIL_FRAME : AllShapes.SAIL).get(state.get(FACING));
+	}
+
+	@Override
+	public VoxelShape getCollisionShape(BlockState state, IBlockReader p_220071_2_, BlockPos p_220071_3_,
+		ISelectionContext p_220071_4_) {
+		if (frame)
+			return AllShapes.SAIL_FRAME_COLLISION.get(state.get(FACING));
+		return getShape(state, p_220071_2_, p_220071_3_, p_220071_4_);
+	}
+	
+	@Override
+	public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos,
+		PlayerEntity player) {
+		ItemStack pickBlock = super.getPickBlock(state, target, world, pos, player);
+		if (pickBlock.isEmpty())
+			return AllBlocks.SAIL.get().getPickBlock(state, target, world, pos, player);
+		return pickBlock;
+	}
+
+	public void onFallenUpon(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_) {
+		if (frame)
+			super.onFallenUpon(p_180658_1_, p_180658_2_, p_180658_3_, p_180658_4_);
+		super.onFallenUpon(p_180658_1_, p_180658_2_, p_180658_3_, 0);
+	}
+
+	public void onLanded(IBlockReader p_176216_1_, Entity p_176216_2_) {
+		if (frame || p_176216_2_.bypassesLandingEffects()) {
+			super.onLanded(p_176216_1_, p_176216_2_);
+		} else {
+			this.bounce(p_176216_2_);
+		}
+	}
+
+	private void bounce(Entity p_226860_1_) {
+		Vector3d vec3d = p_226860_1_.getMotion();
+		if (vec3d.y < 0.0D) {
+			double d0 = p_226860_1_ instanceof LivingEntity ? 1.0D : 0.8D;
+			p_226860_1_.setMotion(vec3d.x, -vec3d.y * (double) 0.26F * d0, vec3d.z);
+		}
+
+	}
+
+}