From 869b40a24d4c0e89b05ae70173c1b7ffd397f9b1 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 31 Oct 2018 13:38:52 -0400 Subject: add basic_materials mod update homedecor, pipeworks, gloopblocks, signs_lib, stainedglass also updated technic, roads, glooptest, framedglass (they're my forks actually, just until some pending PRs are merged) make default locked chests use basic_materials padlock --- basic_materials/LICENSE | 488 ++++++ basic_materials/depends.txt | 1 + basic_materials/electrical-electronic.lua | 78 + basic_materials/init.lua | 14 + basic_materials/metals.lua | 281 ++++ basic_materials/misc.lua | 115 ++ basic_materials/models/basic_materials_chains.obj | 881 +++++++++++ basic_materials/plastics.lua | 52 + .../textures/basic_materials_brass_block.png | Bin 0 -> 272 bytes .../textures/basic_materials_brass_ingot.png | Bin 0 -> 223 bytes .../textures/basic_materials_cement_block.png | Bin 0 -> 344 bytes .../textures/basic_materials_chain_brass.png | Bin 0 -> 344 bytes .../textures/basic_materials_chain_brass_inv.png | Bin 0 -> 1886 bytes .../textures/basic_materials_chain_steel.png | Bin 0 -> 386 bytes .../textures/basic_materials_chain_steel_inv.png | Bin 0 -> 1730 bytes .../textures/basic_materials_chainlink_brass.png | Bin 0 -> 178 bytes .../textures/basic_materials_chainlink_steel.png | Bin 0 -> 175 bytes .../textures/basic_materials_copper_strip.png | Bin 0 -> 326 bytes .../textures/basic_materials_copper_wire.png | Bin 0 -> 306 bytes .../textures/basic_materials_empty_spool.png | Bin 0 -> 214 bytes .../textures/basic_materials_energy_crystal.png | Bin 0 -> 817 bytes .../textures/basic_materials_gear_steel.png | Bin 0 -> 5845 bytes .../textures/basic_materials_gold_wire.png | Bin 0 -> 286 bytes .../textures/basic_materials_heating_element.png | Bin 0 -> 369 bytes basic_materials/textures/basic_materials_ic.png | Bin 0 -> 293 bytes basic_materials/textures/basic_materials_motor.png | Bin 0 -> 247 bytes .../textures/basic_materials_oil_extract.png | Bin 0 -> 1966 bytes .../textures/basic_materials_padlock.png | Bin 0 -> 215 bytes .../textures/basic_materials_paraffin.png | Bin 0 -> 345 bytes .../textures/basic_materials_plastic_sheet.png | Bin 0 -> 293 bytes .../textures/basic_materials_plastic_strip.png | Bin 0 -> 160 bytes .../textures/basic_materials_silicon.png | Bin 0 -> 769 bytes .../textures/basic_materials_silver_wire.png | Bin 0 -> 251 bytes .../textures/basic_materials_steel_bar.png | Bin 0 -> 311 bytes .../textures/basic_materials_steel_strip.png | Bin 0 -> 326 bytes .../textures/basic_materials_steel_wire.png | Bin 0 -> 284 bytes .../textures/basic_materials_terracotta_base.png | Bin 0 -> 775 bytes .../textures/basic_materials_wet_cement.png | Bin 0 -> 366 bytes building_blocks/alias.lua | 4 + building_blocks/depends.txt | 1 + building_blocks/node_stairs.lua | 44 +- building_blocks/recipes.lua | 18 +- chains/depends.txt | 2 - chains/init.lua | 179 --- chains/models/chains.obj | 881 ----------- chains/models/chains_chandelier.obj | 1621 -------------------- chains/models/top_chains.obj | 943 ------------ chains/textures/chain_brass_inv.png | Bin 1886 -> 0 bytes chains/textures/chain_wrought_iron_inv.png | Bin 1730 -> 0 bytes chains/textures/chains_brass.png | Bin 344 -> 0 bytes chains/textures/chains_candle.png | Bin 390 -> 0 bytes chains/textures/chains_candle_flame.png | Bin 1490 -> 0 bytes chains/textures/chains_wrought_iron.png | Bin 386 -> 0 bytes chains/textures/top_chain_brass_inv.png | Bin 2593 -> 0 bytes chains/textures/top_chain_wrought_iron_inv.png | Bin 2366 -> 0 bytes computer/miscitems.lua | 6 +- computer/recipes.lua | 68 +- concrete/depends.txt | 1 + concrete/init.lua | 26 +- concrete/textures/technic_rebar.png | Bin 813 -> 0 bytes dreambuilder_mp_extras/depends.txt | 2 + dreambuilder_mp_extras/init.lua | 53 + extranodes/depends.txt | 1 + extranodes/init.lua | 4 +- framedglass/depends.txt | 3 +- framedglass/init.lua | 207 +-- .../textures/framedglass_glass_face_inv_static.png | Bin 0 -> 474 bytes gloopblocks/crafts.lua | 43 - gloopblocks/depends.txt | 2 +- gloopblocks/init.lua | 95 +- gloopblocks/textures/gloopblocks_cement.png | Bin 344 -> 0 bytes gloopblocks/textures/gloopblocks_wet_cement.png | Bin 366 -> 0 bytes glooptest/depends.txt | 3 +- glooptest/parts_module/init.lua | 16 +- homedecor/bedroom.lua | 22 +- homedecor/crafts.lua | 609 ++------ homedecor/depends.txt | 1 + homedecor/doors_and_gates.lua | 8 +- homedecor/electronics.lua | 14 - homedecor/furniture_recipes.lua | 5 +- homedecor/handlers/inventory.lua | 2 +- homedecor/lighting.lua | 138 ++ homedecor/models/homedecor_chains_top.obj | 943 ++++++++++++ homedecor/models/homedecor_chandelier.obj | 1621 ++++++++++++++++++++ homedecor/sounds/homedecor_telephone_ringing.ogg | Bin 33622 -> 0 bytes homedecor/textures/homedecor_brass_ingot.png | Bin 309 -> 0 bytes homedecor/textures/homedecor_candle_flat.png | Bin 0 -> 390 bytes homedecor/textures/homedecor_chainlink_brass.png | Bin 178 -> 0 bytes homedecor/textures/homedecor_chainlink_steel.png | Bin 175 -> 0 bytes homedecor/textures/homedecor_copper_strip.png | Bin 326 -> 0 bytes homedecor/textures/homedecor_copper_wire.png | Bin 295 -> 0 bytes homedecor/textures/homedecor_empty_spool.png | Bin 214 -> 0 bytes homedecor/textures/homedecor_heating_element.png | Bin 369 -> 0 bytes homedecor/textures/homedecor_ic.png | Bin 293 -> 0 bytes homedecor/textures/homedecor_motor.png | Bin 247 -> 0 bytes homedecor/textures/homedecor_oil_extract.png | Bin 1966 -> 0 bytes homedecor/textures/homedecor_paraffin.png | Bin 345 -> 0 bytes homedecor/textures/homedecor_plastic_sheeting.png | Bin 293 -> 0 bytes homedecor/textures/homedecor_plastic_strips.png | Bin 123 -> 0 bytes homedecor/textures/homedecor_power_crystal.png | Bin 817 -> 0 bytes homedecor/textures/homedecor_silicon.png | Bin 769 -> 0 bytes homedecor/textures/homedecor_steel_strip.png | Bin 326 -> 0 bytes homedecor/textures/homedecor_steel_wire.png | Bin 301 -> 0 bytes homedecor/textures/homedecor_terracotta_base.png | Bin 775 -> 0 bytes homedecor/textures/top_chain_brass_inv.png | Bin 0 -> 2593 bytes homedecor/textures/top_chain_wrought_iron_inv.png | Bin 0 -> 2366 bytes labels/init.lua | 2 +- lrfurn/coffeetable.lua | 9 + pipeworks/autocrafter.lua | 2 +- pipeworks/crafts.lua | 85 - pipeworks/depends.txt | 1 + pipeworks/filter-injector.lua | 18 +- pipeworks/routing_tubes.lua | 18 +- pipeworks/signal_tubes.lua | 8 +- pipeworks/sorting_tubes.lua | 4 +- pipeworks/teleport_tube.lua | 4 +- pipeworks/textures/pipeworks_gear.png | Bin 5845 -> 0 bytes pipeworks/trashcan.lua | 2 +- pipeworks/vacuum_tubes.lua | 8 +- signs_lib/depends.txt | 1 + signs_lib/init.lua | 2 +- stained_glass/init.lua | 2 + technic/crafts.lua | 46 +- technic/depends.txt | 1 + technic/items.lua | 16 - technic/machines/LV/compressor.lua | 2 +- technic/machines/LV/geothermal.lua | 2 +- technic/machines/LV/solar_panel.lua | 6 +- technic/machines/other/frames.lua | 8 +- technic/machines/register/alloy_recipes.lua | 2 +- technic/machines/register/grinder_recipes.lua | 2 +- technic/machines/supply_converter.lua | 2 +- technic/radiation.lua | 2 +- technic/textures/technic_fine_copper_wire.png | Bin 501 -> 0 bytes technic/textures/technic_fine_gold_wire.png | Bin 474 -> 0 bytes technic/textures/technic_fine_silver_wire.png | Bin 546 -> 0 bytes technic/tools/chainsaw.lua | 2 +- technic/tools/mining_lasers.lua | 4 +- technic/tools/prospector.lua | 2 +- technic_chests/copper_chest.lua | 2 +- technic_chests/depends.txt | 1 + technic_chests/gold_chest.lua | 2 +- technic_chests/iron_chest.lua | 2 +- technic_chests/mithril_chest.lua | 2 +- technic_chests/silver_chest.lua | 2 +- technic_worldgen/crafts.lua | 6 - technic_worldgen/depends.txt | 6 + technic_worldgen/nodes.lua | 8 - technic_worldgen/textures/technic_brass_block.png | Bin 649 -> 0 bytes technic_worldgen/textures/technic_brass_ingot.png | Bin 377 -> 0 bytes 150 files changed, 5135 insertions(+), 4655 deletions(-) create mode 100644 basic_materials/LICENSE create mode 100644 basic_materials/depends.txt create mode 100644 basic_materials/electrical-electronic.lua create mode 100644 basic_materials/init.lua create mode 100644 basic_materials/metals.lua create mode 100644 basic_materials/misc.lua create mode 100644 basic_materials/models/basic_materials_chains.obj create mode 100644 basic_materials/plastics.lua create mode 100644 basic_materials/textures/basic_materials_brass_block.png create mode 100644 basic_materials/textures/basic_materials_brass_ingot.png create mode 100644 basic_materials/textures/basic_materials_cement_block.png create mode 100644 basic_materials/textures/basic_materials_chain_brass.png create mode 100644 basic_materials/textures/basic_materials_chain_brass_inv.png create mode 100644 basic_materials/textures/basic_materials_chain_steel.png create mode 100644 basic_materials/textures/basic_materials_chain_steel_inv.png create mode 100644 basic_materials/textures/basic_materials_chainlink_brass.png create mode 100644 basic_materials/textures/basic_materials_chainlink_steel.png create mode 100644 basic_materials/textures/basic_materials_copper_strip.png create mode 100644 basic_materials/textures/basic_materials_copper_wire.png create mode 100644 basic_materials/textures/basic_materials_empty_spool.png create mode 100644 basic_materials/textures/basic_materials_energy_crystal.png create mode 100644 basic_materials/textures/basic_materials_gear_steel.png create mode 100644 basic_materials/textures/basic_materials_gold_wire.png create mode 100644 basic_materials/textures/basic_materials_heating_element.png create mode 100644 basic_materials/textures/basic_materials_ic.png create mode 100644 basic_materials/textures/basic_materials_motor.png create mode 100644 basic_materials/textures/basic_materials_oil_extract.png create mode 100644 basic_materials/textures/basic_materials_padlock.png create mode 100644 basic_materials/textures/basic_materials_paraffin.png create mode 100644 basic_materials/textures/basic_materials_plastic_sheet.png create mode 100644 basic_materials/textures/basic_materials_plastic_strip.png create mode 100644 basic_materials/textures/basic_materials_silicon.png create mode 100644 basic_materials/textures/basic_materials_silver_wire.png create mode 100644 basic_materials/textures/basic_materials_steel_bar.png create mode 100644 basic_materials/textures/basic_materials_steel_strip.png create mode 100644 basic_materials/textures/basic_materials_steel_wire.png create mode 100644 basic_materials/textures/basic_materials_terracotta_base.png create mode 100644 basic_materials/textures/basic_materials_wet_cement.png delete mode 100644 chains/depends.txt delete mode 100644 chains/init.lua delete mode 100644 chains/models/chains.obj delete mode 100644 chains/models/chains_chandelier.obj delete mode 100644 chains/models/top_chains.obj delete mode 100644 chains/textures/chain_brass_inv.png delete mode 100644 chains/textures/chain_wrought_iron_inv.png delete mode 100644 chains/textures/chains_brass.png delete mode 100644 chains/textures/chains_candle.png delete mode 100644 chains/textures/chains_candle_flame.png delete mode 100644 chains/textures/chains_wrought_iron.png delete mode 100644 chains/textures/top_chain_brass_inv.png delete mode 100644 chains/textures/top_chain_wrought_iron_inv.png delete mode 100644 concrete/textures/technic_rebar.png create mode 100644 framedglass/textures/framedglass_glass_face_inv_static.png delete mode 100644 gloopblocks/textures/gloopblocks_cement.png delete mode 100644 gloopblocks/textures/gloopblocks_wet_cement.png create mode 100644 homedecor/models/homedecor_chains_top.obj create mode 100644 homedecor/models/homedecor_chandelier.obj delete mode 100644 homedecor/sounds/homedecor_telephone_ringing.ogg delete mode 100644 homedecor/textures/homedecor_brass_ingot.png create mode 100644 homedecor/textures/homedecor_candle_flat.png delete mode 100644 homedecor/textures/homedecor_chainlink_brass.png delete mode 100644 homedecor/textures/homedecor_chainlink_steel.png delete mode 100644 homedecor/textures/homedecor_copper_strip.png delete mode 100644 homedecor/textures/homedecor_copper_wire.png delete mode 100644 homedecor/textures/homedecor_empty_spool.png delete mode 100644 homedecor/textures/homedecor_heating_element.png delete mode 100644 homedecor/textures/homedecor_ic.png delete mode 100644 homedecor/textures/homedecor_motor.png delete mode 100644 homedecor/textures/homedecor_oil_extract.png delete mode 100644 homedecor/textures/homedecor_paraffin.png delete mode 100644 homedecor/textures/homedecor_plastic_sheeting.png delete mode 100644 homedecor/textures/homedecor_plastic_strips.png delete mode 100644 homedecor/textures/homedecor_power_crystal.png delete mode 100644 homedecor/textures/homedecor_silicon.png delete mode 100644 homedecor/textures/homedecor_steel_strip.png delete mode 100644 homedecor/textures/homedecor_steel_wire.png delete mode 100644 homedecor/textures/homedecor_terracotta_base.png create mode 100644 homedecor/textures/top_chain_brass_inv.png create mode 100644 homedecor/textures/top_chain_wrought_iron_inv.png delete mode 100644 pipeworks/textures/pipeworks_gear.png delete mode 100644 technic/textures/technic_fine_copper_wire.png delete mode 100644 technic/textures/technic_fine_gold_wire.png delete mode 100644 technic/textures/technic_fine_silver_wire.png delete mode 100644 technic_worldgen/textures/technic_brass_block.png delete mode 100644 technic_worldgen/textures/technic_brass_ingot.png diff --git a/basic_materials/LICENSE b/basic_materials/LICENSE new file mode 100644 index 0000000..8755372 --- /dev/null +++ b/basic_materials/LICENSE @@ -0,0 +1,488 @@ +License for code: CC0 +License for media and all else: CC-by-SA + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Creative Commons Legal Code + +Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + c. "Creative Commons Compatible License" means a license that is listed + at https://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the relicensing + of adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same + License Elements as this License. + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + f. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + g. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + h. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + j. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(c), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(c), as requested. + b. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + c. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Ssection 3(b), in the case of an + Adaptation, a credit identifying the use of the Work in the Adaptation + (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit + required by this Section 4(c) may be implemented in any reasonable + manner; provided, however, that in the case of a Adaptation or + Collection, at a minimum such credit will appear, if a credit for all + contributing authors of the Adaptation or Collection appears, then as + part of these credits and in a manner at least as prominent as the + credits for the other contributing authors. For the avoidance of + doubt, You may only use the credit required by this Section for the + purpose of attribution in the manner set out above and, by exercising + Your rights under this License, You may not implicitly or explicitly + assert or imply any connection with, sponsorship or endorsement by the + Original Author, Licensor and/or Attribution Parties, as appropriate, + of You or Your use of the Work, without the separate, express prior + written permission of the Original Author, Licensor and/or Attribution + Parties. + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of the License. + + Creative Commons may be contacted at https://creativecommons.org/. diff --git a/basic_materials/depends.txt b/basic_materials/depends.txt new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/basic_materials/depends.txt @@ -0,0 +1 @@ +default diff --git a/basic_materials/electrical-electronic.lua b/basic_materials/electrical-electronic.lua new file mode 100644 index 0000000..96eb142 --- /dev/null +++ b/basic_materials/electrical-electronic.lua @@ -0,0 +1,78 @@ +-- items + +minetest.register_craftitem("basic_materials:silicon", { + description = "Silicon lump", + inventory_image = "basic_materials_silicon.png", +}) + +minetest.register_craftitem("basic_materials:ic", { + description = "Simple Integrated Circuit", + inventory_image = "basic_materials_ic.png", +}) + +minetest.register_craftitem("basic_materials:motor", { + description = "Simple Motor", + inventory_image = "basic_materials_motor.png", +}) + +minetest.register_craftitem("basic_materials:heating_element", { + description = "Heating element", + inventory_image = "basic_materials_heating_element.png", +}) + +minetest.register_craftitem("basic_materials:energy_crystal_simple", { + description = "Simple energy crystal", + inventory_image = "basic_materials_energy_crystal.png", +}) + +-- crafts + +minetest.register_craft( { + output = "mesecons_materials:silicon 4", + recipe = { + { "default:sand", "default:sand" }, + { "default:sand", "default:steel_ingot" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:ic 4", + recipe = { + { "mesecons_materials:silicon", "mesecons_materials:silicon" }, + { "mesecons_materials:silicon", "default:copper_ingot" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:motor 2", + recipe = { + { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, + { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" } + }, +}) + +minetest.register_craft( { + output = "basic_materials:heating_element 2", + recipe = { + { "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" } + }, +}) + +minetest.register_craft({ + --type = "shapeless", + output = "basic_materials:energy_crystal_simple 2", + recipe = { + { "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" }, + { "default:diamond", "default:gold_ingot", "default:diamond" } + }, +}) + +-- aliases + +minetest.register_alias("homedecor:ic", "basic_materials:ic") +minetest.register_alias("homedecor:motor", "basic_materials:motor") +minetest.register_alias("homedecor:heating_element", "basic_materials:heating_element") +minetest.register_alias("homedecor:power_crystal", "basic_materials:energy_crystal_simple") + +minetest.register_alias_force("mesecons_materials:silicon", "basic_materials:silicon") diff --git a/basic_materials/init.lua b/basic_materials/init.lua new file mode 100644 index 0000000..32873a1 --- /dev/null +++ b/basic_materials/init.lua @@ -0,0 +1,14 @@ +-- Basic materials mod +-- by Vanessa Dannenberg + +-- This mod supplies all those little random craft items that everyone always +-- seems to need, such as metal bars (ala rebar), plastic, wire, and so on. + +local modpath = minetest.get_modpath("basic_materials") + +basic_materials = {} + +dofile(modpath.."/metals.lua") +dofile(modpath.."/plastics.lua") +dofile(modpath.."/electrical-electronic.lua") +dofile(modpath.."/misc.lua") diff --git a/basic_materials/metals.lua b/basic_materials/metals.lua new file mode 100644 index 0000000..7cece00 --- /dev/null +++ b/basic_materials/metals.lua @@ -0,0 +1,281 @@ +-- items + +minetest.register_craftitem("basic_materials:steel_wire", { + description = "Spool of steel wire", + inventory_image = "basic_materials_steel_wire.png" +}) + +minetest.register_craftitem("basic_materials:copper_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_copper_wire.png" +}) + +minetest.register_craftitem("basic_materials:silver_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_silver_wire.png" +}) + +minetest.register_craftitem("basic_materials:gold_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_gold_wire.png" +}) + +minetest.register_craftitem("basic_materials:steel_strip", { + description = "Steel Strip", + inventory_image = "basic_materials_steel_strip.png" +}) + +minetest.register_craftitem("basic_materials:copper_strip", { + description = "Copper Strip", + inventory_image = "basic_materials_copper_strip.png" +}) + +minetest.register_craftitem("basic_materials:steel_bar", { + description = "Steel Bar", + inventory_image = "basic_materials_steel_bar.png", +}) + +minetest.register_craftitem("basic_materials:chainlink_brass", { + description = "Chainlinks (brass)", + inventory_image = "basic_materials_chainlink_brass.png" +}) + +minetest.register_craftitem("basic_materials:chainlink_steel", { + description = "Chainlinks (steel)", + inventory_image = "basic_materials_chainlink_steel.png" +}) + +minetest.register_craftitem("basic_materials:brass_ingot", { + description = "Brass Ingot", + inventory_image = "basic_materials_brass_ingot.png", +}) + +minetest.register_craftitem("basic_materials:brass_block", { + description = "Brass Block", + inventory_image = "basic_materials_brass_block.png", +}) + +minetest.register_craftitem("basic_materials:gear_steel", { + description = "Steel gear", + inventory_image = "basic_materials_gear_steel.png" +}) + +minetest.register_craftitem("basic_materials:padlock", { + description = "Padlock", + inventory_image = "basic_materials_padlock.png" +}) + +-- nodes + +local chains_sbox = { + type = "fixed", + fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 } +} + +local topchains_sbox = { + type = "fixed", + fixed = { + { -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 }, + { -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 } + } +} + +minetest.register_node("basic_materials:chain_steel", { + description = "Chain (steel, hanging)", + drawtype = "mesh", + mesh = "basic_materials_chains.obj", + tiles = {"basic_materials_chain_steel.png"}, + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + inventory_image = "basic_materials_chain_steel_inv.png", + groups = {cracky=3}, + selection_box = chains_sbox, +}) + +minetest.register_node("basic_materials:chain_brass", { + description = "Chain (brass, hanging)", + drawtype = "mesh", + mesh = "basic_materials_chains.obj", + tiles = {"basic_materials_chain_brass.png"}, + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + inventory_image = "basic_materials_chain_brass_inv.png", + groups = {cracky=3}, + selection_box = chains_sbox, +}) + +-- crafts + +minetest.register_craft( { + output = "basic_materials:copper_wire 2", + type = "shapeless", + recipe = { + "default:copper_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:silver_wire 2", + type = "shapeless", + recipe = { + "moreores:silver_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:gold_wire 2", + type = "shapeless", + recipe = { + "default:gold_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_wire 2", + type = "shapeless", + recipe = { + "default:steel_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_strip 12", + recipe = { + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:copper_strip 12", + recipe = { + { "", "default:copper_ingot", "" }, + { "default:copper_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_bar 6", + recipe = { + { "", "", "default:steel_ingot" }, + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:padlock 2", + recipe = { + { "basic_materials:steel_bar" }, + { "default:steel_ingot" }, + { "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "basic_materials:chainlink_steel 12", + recipe = { + {"", "default:steel_ingot", "default:steel_ingot"}, + { "default:steel_ingot", "", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "" }, + }, +}) + +minetest.register_craft({ + output = "basic_materials:chainlink_brass 12", + recipe = { + {"", "basic_materials:brass_ingot", "basic_materials:brass_ingot"}, + { "basic_materials:brass_ingot", "", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "" }, + }, +}) + +minetest.register_craft({ + output = 'basic_materials:chain_steel 2', + recipe = { + {"basic_materials:chainlink_steel"}, + {"basic_materials:chainlink_steel"}, + {"basic_materials:chainlink_steel"} + } +}) + +minetest.register_craft({ + output = 'basic_materials:chain_brass 2', + recipe = { + {"basic_materials:chainlink_brass"}, + {"basic_materials:chainlink_brass"}, + {"basic_materials:chainlink_brass"} + } +}) + +minetest.register_craft( { + output = "basic_materials:gear_steel 6", + recipe = { + { "", "default:steel_ingot", "" }, + { "default:steel_ingot","basic_materials:chainlink_steel", "default:steel_ingot" }, + { "", "default:steel_ingot", "" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:brass_ingot 3", + recipe = { + "default:steel_ingot", + "default:copper_ingot", + "default:gold_ingot", + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:brass_ingot 9", + recipe = { "basic_materials:brass_block" }, +}) + +minetest.register_craft( { + output = "basic_materials:brass_block", + recipe = { + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + }, +}) + +-- aliases + +minetest.register_alias("homedecor:copper_wire", "basic_materials:copper_wire") +minetest.register_alias("technic:fine_copper_wire", "basic_materials:copper_wire") +minetest.register_alias("technic:fine_silver_wire", "basic_materials:silver_wire") +minetest.register_alias("technic:fine_gold_wire", "basic_materialsgold_wire") + +minetest.register_alias("homedecor:steel_wire", "basic_materials:steel_wire") + +minetest.register_alias("homedecor:brass_ingot", "basic_materials:brass_ingot") +minetest.register_alias("technic:brass_ingot", "basic_materials:brass_ingot") +minetest.register_alias("technic:brass_block", "basic_materials:brass_block") + +minetest.register_alias("homedecor:copper_strip", "basic_materials:copper_strip") +minetest.register_alias("homedecor:steel_strip", "basic_materials:steel_strip") + +minetest.register_alias_force("glooptest:chainlink", "basic_materials:chainlink_steel") +minetest.register_alias_force("homedecor:chainlink_steel", "basic_materials:chainlink_steel") +minetest.register_alias("homedecor:chainlink_brass", "basic_materials:chainlink_brass") +minetest.register_alias("chains:chain", "basic_materials:chain_steel") +minetest.register_alias("chains:chain_brass", "basic_materials:chain_brass") + +minetest.register_alias("pipeworks:gear", "basic_materials:gear_steel") + +minetest.register_alias("technic:rebar", "basic_materials:steel_bar") diff --git a/basic_materials/misc.lua b/basic_materials/misc.lua new file mode 100644 index 0000000..bb9c76b --- /dev/null +++ b/basic_materials/misc.lua @@ -0,0 +1,115 @@ +--items + +minetest.register_craftitem("basic_materials:oil_extract", { + description = "Oil extract", + inventory_image = "basic_materials_oil_extract.png", +}) + +minetest.register_craftitem("basic_materials:paraffin", { + description = "Unprocessed paraffin", + inventory_image = "basic_materials_paraffin.png", +}) + +minetest.register_craftitem("basic_materials:terracotta_base", { + description = "Uncooked Terracotta Base", + inventory_image = "basic_materials_terracotta_base.png", +}) + +minetest.register_craftitem("basic_materials:wet_cement", { + description = "Wet Cement", + inventory_image = "basic_materials_wet_cement.png", +}) + +-- nodes + +minetest.register_node("basic_materials:cement_block", { + description = "Cement", + tiles = {"basic_materials_cement_block.png"}, + is_ground_content = true, + groups = {cracky=2}, + sounds = default.node_sound_stone_defaults(), +}) + +-- crafts + +minetest.register_craft({ + type = "shapeless", + output = "basic_materials:oil_extract 3", + recipe = { + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves" + } +}) + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:paraffin", + recipe = "basic_materials:oil_extract", +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:oil_extract", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:paraffin", + burntime = 30, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:terracotta_base 8", + recipe = { + "default:dirt", + "default:clay_lump", + "bucket:bucket_water" + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "basic_materials:wet_cement 2", + recipe = { + "bucket:bucket_water", + "default:clay_lump", + "default:gravel", + }, + replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},}, +}) + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:cement_block", + recipe = "basic_materials:wet_cement", + cooktime = 8 +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:terracotta_base 8", + recipe = { + "default:dirt", + "default:clay_lump", + "bucket:bucket_water" + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, +}) + +-- aliases + +minetest.register_alias("homedecor:oil_extract", "basic_materials:oil_extract") +minetest.register_alias("homedecor:paraffin", "basic_materials:paraffin") +minetest.register_alias("homedecor:plastic_base", "basic_materials:paraffin") +minetest.register_alias("homedecor:terracotta_base", "basic_materials:terracotta_base") +minetest.register_alias("homedecor:power_crystal", "basic_materials:energy_crystal") + +minetest.register_alias("gloopblocks:wet_cement", "basic_materials:wet_cement") +minetest.register_alias("gloopblocks:cement", "basic_materials:cement_block") diff --git a/basic_materials/models/basic_materials_chains.obj b/basic_materials/models/basic_materials_chains.obj new file mode 100644 index 0000000..78724c9 --- /dev/null +++ b/basic_materials/models/basic_materials_chains.obj @@ -0,0 +1,881 @@ +# Blender v2.73 (sub 0) OBJ File: 'chains.blend' +# www.blender.org +o Torus.016_Torus +v 0.000000 -0.429978 0.000002 +v 0.000000 -0.401109 0.055211 +v -0.014044 -0.391975 0.048870 +v -0.014044 -0.423304 0.000002 +v -0.009826 -0.379748 0.040970 +v -0.009826 -0.406012 0.000002 +v 0.009826 -0.379748 0.040970 +v 0.009826 -0.406012 0.000002 +v 0.014044 -0.391975 0.048870 +v 0.014044 -0.423304 0.000002 +v 0.000000 -0.316336 0.080195 +v -0.014044 -0.316336 0.069112 +v -0.009826 -0.316336 0.057941 +v 0.009826 -0.316336 0.057941 +v 0.014044 -0.316336 0.069112 +v 0.000000 -0.231564 0.055211 +v -0.014044 -0.240700 0.048870 +v -0.009826 -0.252925 0.040970 +v 0.009826 -0.252925 0.040970 +v 0.014044 -0.240700 0.048870 +v 0.000000 -0.202695 0.000002 +v -0.014044 -0.209368 0.000002 +v -0.009826 -0.226661 0.000002 +v 0.009826 -0.226661 0.000002 +v 0.014044 -0.209368 0.000002 +v 0.000000 -0.231564 -0.055206 +v -0.014044 -0.240700 -0.048868 +v -0.009826 -0.252925 -0.040967 +v 0.009826 -0.252925 -0.040967 +v 0.014044 -0.240700 -0.048865 +v 0.000000 -0.316336 -0.080190 +v -0.014044 -0.316336 -0.069108 +v -0.009826 -0.316336 -0.057936 +v 0.009826 -0.316336 -0.057936 +v 0.014044 -0.316336 -0.069108 +v 0.000000 -0.400361 -0.055206 +v -0.014044 -0.391975 -0.048868 +v -0.009826 -0.379748 -0.040967 +v 0.009826 -0.379748 -0.040967 +v 0.014044 -0.391975 -0.048868 +v 0.000000 -0.262249 0.000002 +v -0.061672 -0.233381 0.000002 +v -0.054590 -0.224245 -0.012569 +v 0.000000 -0.255577 -0.012569 +v -0.045765 -0.212018 -0.008794 +v 0.000000 -0.238285 -0.008794 +v -0.045765 -0.212018 0.008798 +v 0.000000 -0.238285 0.008798 +v -0.054590 -0.224245 0.012574 +v 0.000000 -0.255577 0.012574 +v -0.089582 -0.148609 0.000002 +v -0.077200 -0.148609 -0.012569 +v -0.064722 -0.148609 -0.008794 +v -0.064722 -0.148609 0.008799 +v -0.077200 -0.148609 0.012574 +v -0.061672 -0.063837 0.000002 +v -0.054590 -0.072971 -0.012569 +v -0.045765 -0.085198 -0.008794 +v -0.045765 -0.085198 0.008799 +v -0.054590 -0.072971 0.012574 +v 0.000000 -0.034967 0.000002 +v 0.000000 -0.041641 -0.012569 +v 0.000000 -0.058933 -0.008794 +v 0.000000 -0.058933 0.008799 +v 0.000000 -0.041641 0.012574 +v 0.061672 -0.063837 0.000002 +v 0.054590 -0.072971 -0.012569 +v 0.045765 -0.085198 -0.008794 +v 0.045765 -0.085198 0.008799 +v 0.054590 -0.072971 0.012574 +v 0.089582 -0.148609 0.000002 +v 0.077200 -0.148609 -0.012569 +v 0.064722 -0.148609 -0.008794 +v 0.064722 -0.148609 0.008799 +v 0.077200 -0.148609 0.012574 +v 0.061672 -0.232631 0.000002 +v 0.054590 -0.224245 -0.012569 +v 0.045765 -0.212018 -0.008794 +v 0.045765 -0.212018 0.008798 +v 0.054590 -0.224245 0.012574 +v 0.000000 0.073316 0.000002 +v 0.061672 0.102183 0.000002 +v 0.054590 0.111319 0.012574 +v 0.000000 0.079988 0.012574 +v 0.045765 0.123546 0.008799 +v 0.000000 0.097280 0.008799 +v 0.045765 0.123546 -0.008794 +v 0.000000 0.097280 -0.008794 +v 0.054590 0.111319 -0.012569 +v 0.000000 0.079988 -0.012569 +v 0.089582 0.186956 0.000002 +v 0.077200 0.186956 0.012574 +v 0.064722 0.186956 0.008799 +v 0.064722 0.186956 -0.008794 +v 0.077200 0.186956 -0.012569 +v 0.061672 0.271728 0.000002 +v 0.054590 0.262594 0.012574 +v 0.045765 0.250367 0.008799 +v 0.045765 0.250367 -0.008794 +v 0.054590 0.262594 -0.012569 +v 0.000000 0.300597 0.000002 +v 0.000000 0.293923 0.012574 +v 0.000000 0.276631 0.008799 +v 0.000000 0.276631 -0.008794 +v 0.000000 0.293923 -0.012569 +v -0.061672 0.271728 0.000002 +v -0.054590 0.262594 0.012574 +v -0.045765 0.250367 0.008799 +v -0.045765 0.250367 -0.008794 +v -0.054590 0.262594 -0.012569 +v -0.089582 0.186956 0.000002 +v -0.077200 0.186956 0.012574 +v -0.064722 0.186956 0.008799 +v -0.064722 0.186956 -0.008794 +v -0.077200 0.186956 -0.012569 +v -0.061672 0.102931 0.000002 +v -0.054590 0.111319 0.012574 +v -0.045765 0.123546 0.008799 +v -0.045765 0.123546 -0.008794 +v -0.054590 0.111319 -0.012569 +v 0.000000 -0.095037 0.000002 +v 0.000000 -0.066168 -0.055206 +v 0.014044 -0.057034 -0.048868 +v 0.014044 -0.088363 0.000002 +v 0.009826 -0.044807 -0.040967 +v 0.009826 -0.071071 0.000002 +v -0.009826 -0.044807 -0.040967 +v -0.009826 -0.071071 0.000002 +v -0.014044 -0.057034 -0.048868 +v -0.014044 -0.088363 0.000002 +v 0.000000 0.018605 -0.080190 +v 0.014044 0.018605 -0.069108 +v 0.009826 0.018605 -0.057936 +v -0.009826 0.018605 -0.057936 +v -0.014044 0.018605 -0.069108 +v 0.000000 0.103377 -0.055206 +v 0.014044 0.094243 -0.048868 +v 0.009826 0.082016 -0.040967 +v -0.009826 0.082016 -0.040967 +v -0.014044 0.094243 -0.048868 +v 0.000000 0.132246 0.000002 +v 0.014044 0.125572 0.000002 +v 0.009826 0.108280 0.000002 +v -0.009826 0.108280 0.000002 +v -0.014044 0.125572 0.000002 +v 0.000000 0.103377 0.055211 +v 0.014044 0.094243 0.048870 +v 0.009826 0.082016 0.040970 +v -0.009826 0.082016 0.040970 +v -0.014044 0.094243 0.048870 +v 0.000000 0.018605 0.080195 +v 0.014044 0.018605 0.069112 +v 0.009826 0.018605 0.057941 +v -0.009826 0.018605 0.057941 +v -0.014044 0.018605 0.069112 +v 0.000000 -0.065420 0.055211 +v 0.014044 -0.057032 0.048870 +v 0.009826 -0.044807 0.040970 +v -0.009826 -0.044807 0.040970 +v -0.014044 -0.057032 0.048870 +v 0.000000 -0.598329 0.000002 +v 0.061672 -0.569460 0.000002 +v 0.054590 -0.560326 0.012574 +v 0.000000 -0.591655 0.012574 +v 0.045765 -0.548099 0.008798 +v 0.000000 -0.574363 0.008798 +v 0.045765 -0.548099 -0.008794 +v 0.000000 -0.574363 -0.008794 +v 0.054590 -0.560326 -0.012569 +v 0.000000 -0.591655 -0.012569 +v 0.089582 -0.484687 0.000002 +v 0.077200 -0.484687 0.012574 +v 0.064722 -0.484687 0.008798 +v 0.064722 -0.484687 -0.008794 +v 0.077200 -0.484687 -0.012569 +v 0.061672 -0.399915 0.000002 +v 0.054590 -0.409051 0.012574 +v 0.045765 -0.421278 0.008798 +v 0.045765 -0.421278 -0.008794 +v 0.054590 -0.409051 -0.012569 +v 0.000000 -0.371048 0.000002 +v 0.000000 -0.377719 0.012574 +v 0.000000 -0.395012 0.008798 +v 0.000000 -0.395012 -0.008794 +v 0.000000 -0.377719 -0.012569 +v -0.061672 -0.399915 0.000002 +v -0.054590 -0.409051 0.012574 +v -0.045765 -0.421278 0.008798 +v -0.045765 -0.421278 -0.008794 +v -0.054590 -0.409051 -0.012569 +v -0.089582 -0.484687 0.000002 +v -0.077200 -0.484687 0.012574 +v -0.064722 -0.484687 0.008798 +v -0.064722 -0.484687 -0.008794 +v -0.077200 -0.484687 -0.012569 +v -0.061672 -0.568712 0.000002 +v -0.054590 -0.560326 0.012574 +v -0.045765 -0.548099 0.008798 +v -0.045765 -0.548099 -0.008794 +v -0.054590 -0.560326 -0.012569 +v 0.000000 0.241043 0.000002 +v 0.000000 0.269910 0.055211 +v -0.014044 0.279047 0.048870 +v -0.014044 0.247717 0.000002 +v -0.009826 0.291274 0.040970 +v -0.009826 0.265007 0.000002 +v 0.009826 0.291274 0.040970 +v 0.009826 0.265007 0.000002 +v 0.014044 0.279047 0.048870 +v 0.014044 0.247717 0.000002 +v 0.000000 0.354683 0.080195 +v -0.014044 0.354683 0.069112 +v -0.009826 0.354683 0.057941 +v 0.009826 0.354683 0.057941 +v 0.014044 0.354683 0.069112 +v 0.000000 0.439455 0.055211 +v -0.014044 0.430321 0.048870 +v -0.009826 0.418094 0.040970 +v 0.009826 0.418094 0.040970 +v 0.014044 0.430321 0.048870 +v 0.000000 0.468325 0.000002 +v -0.014044 0.461651 0.000002 +v -0.009826 0.444361 0.000002 +v 0.009826 0.444361 0.000002 +v 0.014044 0.461651 0.000002 +v 0.000000 0.439455 -0.055206 +v -0.014044 0.430321 -0.048868 +v -0.009826 0.418094 -0.040967 +v 0.009826 0.418094 -0.040967 +v 0.014044 0.430321 -0.048868 +v 0.000000 0.354683 -0.080190 +v -0.014044 0.354683 -0.069108 +v -0.009826 0.354683 -0.057936 +v 0.009826 0.354683 -0.057936 +v 0.014044 0.354683 -0.069108 +v 0.000000 0.270661 -0.055206 +v -0.014044 0.279047 -0.048868 +v -0.009826 0.291274 -0.040967 +v 0.009826 0.291274 -0.040967 +v 0.014044 0.279047 -0.048868 +vt 0.187500 0.125000 +vt 0.250000 0.125000 +vt 0.250000 0.187500 +vt 0.187500 0.187500 +vt 0.250000 0.250000 +vt 0.187500 0.250000 +vt 0.250000 0.312500 +vt 0.187500 0.312500 +vt 0.250000 0.375000 +vt 0.187500 0.375000 +vt 0.187500 0.062500 +vt 0.250000 0.062500 +vt 0.312500 0.125000 +vt 0.312500 0.187500 +vt 0.312500 0.250000 +vt 0.312500 0.312500 +vt 0.312500 0.375000 +vt 0.312500 0.062500 +vt 0.375000 0.125000 +vt 0.375000 0.187500 +vt 0.375000 0.250000 +vt 0.375000 0.312500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.437500 0.125000 +vt 0.437500 0.187500 +vt 0.437500 0.250000 +vt 0.437500 0.312500 +vt 0.437500 0.375000 +vt 0.437500 0.062500 +vt 0.500000 0.125000 +vt 0.500000 0.187500 +vt 0.500000 0.250000 +vt 0.500000 0.312500 +vt 0.500000 0.375000 +vt 0.500000 0.062500 +vt -0.000000 0.125000 +vt 0.062500 0.125000 +vt 0.062500 0.187500 +vt -0.000000 0.187500 +vt 0.062500 0.250000 +vt -0.000000 0.250000 +vt 0.062500 0.312500 +vt -0.000000 0.312500 +vt 0.062500 0.375000 +vt -0.000000 0.375000 +vt -0.000000 0.062500 +vt 0.062500 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.187500 +vt 0.125000 0.250000 +vt 0.125000 0.312500 +vt 0.125000 0.375000 +vt 0.125000 0.062500 +vt 0.750000 0.625000 +vt 0.812500 0.625000 +vt 0.812500 0.687500 +vt 0.750000 0.687500 +vt 0.750000 0.375000 +vt 0.812500 0.375000 +vt 0.812500 0.437500 +vt 0.750000 0.437500 +vt 0.812500 0.500000 +vt 0.750000 0.500000 +vt 0.812500 0.562500 +vt 0.750000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.687500 +vt 0.875000 0.375000 +vt 0.875000 0.437500 +vt 0.875000 0.500000 +vt 0.875000 0.562500 +vt 0.937500 0.625000 +vt 0.937500 0.687500 +vt 0.937500 0.375000 +vt 0.937500 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.562500 +vt 1.000000 0.625000 +vt 1.000000 0.687500 +vt 1.000000 0.375000 +vt 1.000000 0.437500 +vt 1.000000 0.500000 +vt 1.000000 0.562500 +vt 0.500000 0.625000 +vt 0.562500 0.625000 +vt 0.562500 0.687500 +vt 0.500000 0.687500 +vt 0.562500 0.375000 +vt 0.562500 0.437500 +vt 0.500000 0.437500 +vt 0.562500 0.500000 +vt 0.500000 0.500000 +vt 0.562500 0.562500 +vt 0.500000 0.562500 +vt 0.625000 0.625000 +vt 0.625000 0.687500 +vt 0.625000 0.375000 +vt 0.625000 0.437500 +vt 0.625000 0.500000 +vt 0.625000 0.562500 +vt 0.687500 0.625000 +vt 0.687500 0.687500 +vt 0.687500 0.375000 +vt 0.687500 0.437500 +vt 0.687500 0.500000 +vt 0.687500 0.562500 +vt 0.250000 0.625000 +vt 0.312500 0.625000 +vt 0.312500 0.687500 +vt 0.250000 0.687500 +vt 0.312500 0.437500 +vt 0.250000 0.437500 +vt 0.312500 0.500000 +vt 0.250000 0.500000 +vt 0.312500 0.562500 +vt 0.250000 0.562500 +vt 0.375000 0.625000 +vt 0.375000 0.687500 +vt 0.375000 0.437500 +vt 0.375000 0.500000 +vt 0.375000 0.562500 +vt 0.437500 0.625000 +vt 0.437500 0.687500 +vt 0.437500 0.437500 +vt 0.437500 0.500000 +vt 0.437500 0.562500 +vt -0.000000 0.625000 +vt 0.062500 0.625000 +vt 0.062500 0.687500 +vt -0.000000 0.687500 +vt 0.062500 0.437500 +vt -0.000000 0.437500 +vt 0.062500 0.500000 +vt -0.000000 0.500000 +vt 0.062500 0.562500 +vt -0.000000 0.562500 +vt 0.125000 0.625000 +vt 0.125000 0.687500 +vt 0.125000 0.437500 +vt 0.125000 0.500000 +vt 0.125000 0.562500 +vt 0.187500 0.625000 +vt 0.187500 0.687500 +vt 0.187500 0.437500 +vt 0.187500 0.500000 +vt 0.187500 0.562500 +vt 0.687500 0.750000 +vt 0.750000 0.750000 +vt 0.750000 0.812500 +vt 0.687500 0.812500 +vt 0.750000 0.875000 +vt 0.687500 0.875000 +vt 0.750000 0.937500 +vt 0.687500 0.937500 +vt 0.750000 1.000000 +vt 0.687500 1.000000 +vt 0.812500 0.750000 +vt 0.812500 0.812500 +vt 0.812500 0.875000 +vt 0.812500 0.937500 +vt 0.812500 1.000000 +vt 0.875000 0.750000 +vt 0.875000 0.812500 +vt 0.875000 0.875000 +vt 0.875000 0.937500 +vt 0.875000 1.000000 +vt 0.937500 0.750000 +vt 0.937500 0.812500 +vt 0.937500 0.875000 +vt 0.937500 0.937500 +vt 0.937500 1.000000 +vt 1.000000 0.750000 +vt 1.000000 0.812500 +vt 1.000000 0.875000 +vt 1.000000 0.937500 +vt 1.000000 1.000000 +vt 0.500000 0.750000 +vt 0.562500 0.750000 +vt 0.562500 0.812500 +vt 0.500000 0.812500 +vt 0.562500 0.875000 +vt 0.500000 0.875000 +vt 0.562500 0.937500 +vt 0.500000 0.937500 +vt 0.562500 1.000000 +vt 0.500000 1.000000 +vt 0.625000 0.750000 +vt 0.625000 0.812500 +vt 0.625000 0.875000 +vt 0.625000 0.937500 +vt 0.625000 1.000000 +vt 0.750000 0.312500 +vt 0.812500 0.312500 +vt 0.750000 0.062500 +vt 0.812500 0.062500 +vt 0.812500 0.125000 +vt 0.750000 0.125000 +vt 0.812500 0.187500 +vt 0.750000 0.187500 +vt 0.812500 0.250000 +vt 0.750000 0.250000 +vt 0.875000 0.312500 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt 0.875000 0.187500 +vt 0.875000 0.250000 +vt 0.937500 0.312500 +vt 0.937500 0.062500 +vt 0.937500 0.125000 +vt 0.937500 0.187500 +vt 0.937500 0.250000 +vt 1.000000 0.312500 +vt 1.000000 0.062500 +vt 1.000000 0.125000 +vt 1.000000 0.187500 +vt 1.000000 0.250000 +vt 0.562500 0.312500 +vt 0.562500 0.062500 +vt 0.562500 0.125000 +vt 0.562500 0.187500 +vt 0.562500 0.250000 +vt 0.625000 0.312500 +vt 0.625000 0.062500 +vt 0.625000 0.125000 +vt 0.625000 0.187500 +vt 0.625000 0.250000 +vt 0.687500 0.312500 +vt 0.687500 0.062500 +vt 0.687500 0.125000 +vt 0.687500 0.187500 +vt 0.687500 0.250000 +vt 0.250000 0.937500 +vt 0.312500 0.937500 +vt 0.312500 1.000000 +vt 0.250000 1.000000 +vt 0.312500 0.750000 +vt 0.250000 0.750000 +vt 0.312500 0.812500 +vt 0.250000 0.812500 +vt 0.312500 0.875000 +vt 0.250000 0.875000 +vt 0.375000 0.937500 +vt 0.375000 1.000000 +vt 0.375000 0.750000 +vt 0.375000 0.812500 +vt 0.375000 0.875000 +vt 0.437500 0.937500 +vt 0.437500 1.000000 +vt 0.437500 0.750000 +vt 0.437500 0.812500 +vt 0.437500 0.875000 +vt 0.000000 0.937500 +vt 0.062500 0.937500 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.062500 0.750000 +vt 0.000000 0.750000 +vt 0.062500 0.812500 +vt 0.000000 0.812500 +vt 0.062500 0.875000 +vt 0.000000 0.875000 +vt 0.125000 0.937500 +vt 0.125000 1.000000 +vt 0.125000 0.750000 +vt 0.125000 0.812500 +vt 0.125000 0.875000 +vt 0.187500 0.937500 +vt 0.187500 1.000000 +vt 0.187500 0.750000 +vt 0.187500 0.812500 +vt 0.187500 0.875000 +vn 0.000000 -1.000000 -0.004800 +vn 0.000000 -0.657400 0.753500 +vn -0.898300 -0.248500 0.362300 +vn -0.863600 -0.504100 -0.003400 +vn -0.661500 0.421500 -0.620200 +vn -0.746000 0.665900 0.000000 +vn 0.661500 0.421500 -0.620200 +vn 0.746000 0.665900 0.000000 +vn 0.898300 -0.248500 0.362300 +vn 0.863600 -0.504100 -0.003400 +vn 0.000000 0.000000 1.000000 +vn -0.925200 0.000000 0.379500 +vn -0.617100 0.000000 -0.786900 +vn 0.617100 0.000000 -0.786900 +vn 0.925200 0.000000 0.379500 +vn 0.000000 0.657400 0.753500 +vn -0.898300 0.248400 0.362300 +vn -0.661500 -0.421500 -0.620200 +vn 0.661500 -0.421500 -0.620200 +vn 0.898300 0.248400 0.362300 +vn 0.000000 1.000000 0.000000 +vn -0.866100 0.499800 0.000000 +vn -0.746000 -0.665900 0.000000 +vn 0.746000 -0.665900 0.000000 +vn 0.866100 0.499800 0.000000 +vn 0.000000 0.657400 -0.753500 +vn -0.898300 0.248400 -0.362400 +vn -0.661600 -0.421500 0.620200 +vn 0.661500 -0.421500 0.620200 +vn 0.898300 0.248400 -0.362300 +vn 0.000000 -0.000900 -1.000000 +vn -0.924600 -0.000600 -0.380700 +vn -0.617100 0.000000 0.786900 +vn 0.617100 0.000000 0.786900 +vn 0.924700 -0.000600 -0.380700 +vn 0.000000 -0.650300 -0.759600 +vn -0.895600 -0.254600 -0.364800 +vn -0.661600 0.421500 0.620200 +vn 0.661600 0.421500 0.620200 +vn 0.895600 -0.254600 -0.364800 +vn 0.004900 -1.000000 0.000000 +vn -0.729700 -0.683800 0.000000 +vn -0.324500 -0.256300 -0.910500 +vn 0.003300 -0.475500 -0.879700 +vn 0.578700 0.436200 -0.689100 +vn 0.000000 0.666600 -0.745400 +vn 0.578700 0.436200 0.689100 +vn 0.000000 0.666600 0.745400 +vn -0.324500 -0.256300 0.910500 +vn 0.003300 -0.475500 0.879700 +vn -1.000000 0.000000 0.000000 +vn -0.359600 0.000000 -0.933100 +vn 0.756400 0.000000 -0.654100 +vn 0.756400 0.000000 0.654100 +vn -0.359600 0.000000 0.933100 +vn -0.729700 0.683700 0.000000 +vn -0.324500 0.256300 -0.910500 +vn 0.578700 -0.436200 -0.689100 +vn 0.578700 -0.436200 0.689100 +vn -0.324500 0.256300 0.910500 +vn 0.000000 0.470900 -0.882200 +vn 0.000000 -0.666600 -0.745400 +vn 0.000000 -0.666600 0.745400 +vn 0.000000 0.470900 0.882200 +vn 0.729700 0.683700 0.000000 +vn 0.324500 0.256300 -0.910500 +vn -0.578700 -0.436200 -0.689100 +vn -0.578700 -0.436200 0.689100 +vn 0.324500 0.256300 0.910500 +vn 1.000000 -0.001100 0.000000 +vn 0.361000 -0.000700 -0.932600 +vn -0.756400 0.000000 -0.654100 +vn -0.756400 0.000000 0.654100 +vn 0.361000 -0.000700 0.932600 +vn 0.736100 -0.676800 0.000000 +vn 0.327100 -0.263100 -0.907600 +vn -0.578700 0.436200 -0.689100 +vn -0.578700 0.436200 0.689100 +vn 0.327100 -0.263100 0.907600 +vn -0.004900 -1.000000 0.000000 +vn 0.729700 -0.683800 0.000000 +vn 0.324500 -0.256300 0.910500 +vn -0.003300 -0.475400 0.879700 +vn 0.324500 -0.256300 -0.910500 +vn -0.003300 -0.475400 -0.879700 +vn 1.000000 0.000000 0.000000 +vn 0.359600 0.000000 0.933100 +vn 0.359600 0.000000 -0.933100 +vn -1.000000 -0.001100 0.000000 +vn -0.361000 -0.000700 0.932600 +vn -0.361000 -0.000700 -0.932600 +vn -0.736100 -0.676800 0.000000 +vn -0.327100 -0.263100 0.907600 +vn -0.327100 -0.263100 -0.907600 +vn 0.000000 -1.000000 0.004800 +vn 0.000000 -0.657400 -0.753500 +vn 0.898300 -0.248500 -0.362400 +vn 0.863600 -0.504100 0.003400 +vn -0.898300 -0.248500 -0.362400 +vn -0.863600 -0.504100 0.003400 +vn 0.000000 0.000000 -1.000000 +vn 0.925200 0.000000 -0.379500 +vn -0.925200 0.000000 -0.379500 +vn 0.898300 0.248500 -0.362400 +vn 0.661600 -0.421500 0.620200 +vn -0.898300 0.248500 -0.362400 +vn 0.898300 0.248500 0.362300 +vn -0.898300 0.248500 0.362300 +vn 0.000000 -0.000900 1.000000 +vn 0.924700 -0.000600 0.380700 +vn -0.924700 -0.000600 0.380700 +vn 0.000000 -0.650300 0.759600 +vn 0.895600 -0.254600 0.364700 +vn -0.895600 -0.254600 0.364700 +vn 0.729700 -0.683700 0.000000 +vn 0.729700 0.683800 0.000000 +vn -0.729700 0.683800 0.000000 +vn -0.898300 -0.248400 0.362300 +vn -0.863600 -0.504100 -0.003500 +vn 0.898300 -0.248400 0.362300 +vn 0.863600 -0.504100 -0.003500 +vn -0.661500 -0.421500 0.620200 +vn 0.924600 -0.000600 -0.380700 +vn -0.661500 0.421500 0.620200 +vn 0.661500 0.421500 0.620200 +s 1 +f 1/1/1 2/2/2 3/3/3 4/4/4 +f 4/4/4 3/3/3 5/5/5 6/6/6 +f 6/6/6 5/5/5 7/7/7 8/8/8 +f 8/8/8 7/7/7 9/9/9 10/10/10 +f 1/1/1 10/11/10 9/12/9 2/2/2 +f 2/2/2 11/13/11 12/14/12 3/3/3 +f 3/3/3 12/14/12 13/15/13 5/5/5 +f 5/5/5 13/15/13 14/16/14 7/7/7 +f 7/7/7 14/16/14 15/17/15 9/9/9 +f 9/12/9 15/18/15 11/13/11 2/2/2 +f 11/13/11 16/19/16 17/20/17 12/14/12 +f 12/14/12 17/20/17 18/21/18 13/15/13 +f 13/15/13 18/21/18 19/22/19 14/16/14 +f 14/16/14 19/22/19 20/23/20 15/17/15 +f 15/18/15 20/24/20 16/19/16 11/13/11 +f 16/19/16 21/25/21 22/26/22 17/20/17 +f 17/20/17 22/26/22 23/27/23 18/21/18 +f 18/21/18 23/27/23 24/28/24 19/22/19 +f 19/22/19 24/28/24 25/29/25 20/23/20 +f 20/24/20 25/30/25 21/25/21 16/19/16 +f 21/25/21 26/31/26 27/32/27 22/26/22 +f 22/26/22 27/32/27 28/33/28 23/27/23 +f 23/27/23 28/33/28 29/34/29 24/28/24 +f 24/28/24 29/34/29 30/35/30 25/29/25 +f 25/30/25 30/36/30 26/31/26 21/25/21 +f 26/37/26 31/38/31 32/39/32 27/40/27 +f 27/40/27 32/39/32 33/41/33 28/42/28 +f 28/42/28 33/41/33 34/43/34 29/44/29 +f 29/44/29 34/43/34 35/45/35 30/46/30 +f 30/47/30 35/48/35 31/38/31 26/37/26 +f 31/38/31 36/49/36 37/50/37 32/39/32 +f 32/39/32 37/50/37 38/51/38 33/41/33 +f 33/41/33 38/51/38 39/52/39 34/43/34 +f 34/43/34 39/52/39 40/53/40 35/45/35 +f 35/48/35 40/54/40 36/49/36 31/38/31 +f 36/49/36 1/1/1 4/4/4 37/50/37 +f 37/50/37 4/4/4 6/6/6 38/51/38 +f 38/51/38 6/6/6 8/8/8 39/52/39 +f 39/52/39 8/8/8 10/10/10 40/53/40 +f 1/1/1 36/49/36 40/54/40 10/11/10 +f 41/55/41 42/56/42 43/57/43 44/58/44 +f 44/59/44 43/60/43 45/61/45 46/62/46 +f 46/62/46 45/61/45 47/63/47 48/64/48 +f 48/64/48 47/63/47 49/65/49 50/66/50 +f 41/55/41 50/66/50 49/65/49 42/56/42 +f 42/56/42 51/67/51 52/68/52 43/57/43 +f 43/60/43 52/69/52 53/70/53 45/61/45 +f 45/61/45 53/70/53 54/71/54 47/63/47 +f 47/63/47 54/71/54 55/72/55 49/65/49 +f 49/65/49 55/72/55 51/67/51 42/56/42 +f 51/67/51 56/73/56 57/74/57 52/68/52 +f 52/69/52 57/75/57 58/76/58 53/70/53 +f 53/70/53 58/76/58 59/77/59 54/71/54 +f 54/71/54 59/77/59 60/78/60 55/72/55 +f 55/72/55 60/78/60 56/73/56 51/67/51 +f 56/73/56 61/79/21 62/80/61 57/74/57 +f 57/75/57 62/81/61 63/82/62 58/76/58 +f 58/76/58 63/82/62 64/83/63 59/77/59 +f 59/77/59 64/83/63 65/84/64 60/78/60 +f 60/78/60 65/84/64 61/79/21 56/73/56 +f 61/85/21 66/86/65 67/87/66 62/88/61 +f 62/35/61 67/89/66 68/90/67 63/91/62 +f 63/91/62 68/90/67 69/92/68 64/93/63 +f 64/93/63 69/92/68 70/94/69 65/95/64 +f 65/95/64 70/94/69 66/86/65 61/85/21 +f 66/86/65 71/96/70 72/97/71 67/87/66 +f 67/89/66 72/98/71 73/99/72 68/90/67 +f 68/90/67 73/99/72 74/100/73 69/92/68 +f 69/92/68 74/100/73 75/101/74 70/94/69 +f 70/94/69 75/101/74 71/96/70 66/86/65 +f 71/96/70 76/102/75 77/103/76 72/97/71 +f 72/98/71 77/104/76 78/105/77 73/99/72 +f 73/99/72 78/105/77 79/106/78 74/100/73 +f 74/100/73 79/106/78 80/107/79 75/101/74 +f 75/101/74 80/107/79 76/102/75 71/96/70 +f 76/102/75 41/55/41 44/58/44 77/103/76 +f 77/104/76 44/59/44 46/62/46 78/105/77 +f 78/105/77 46/62/46 48/64/48 79/106/78 +f 79/106/78 48/64/48 50/66/50 80/107/79 +f 41/55/41 76/102/75 80/107/79 50/66/50 +f 81/108/80 82/109/81 83/110/82 84/111/83 +f 84/9/83 83/17/82 85/112/78 86/113/48 +f 86/113/48 85/112/78 87/114/77 88/115/46 +f 88/115/46 87/114/77 89/116/84 90/117/85 +f 81/108/80 90/117/85 89/116/84 82/109/81 +f 82/109/81 91/118/86 92/119/87 83/110/82 +f 83/17/82 92/23/87 93/120/73 85/112/78 +f 85/112/78 93/120/73 94/121/72 87/114/77 +f 87/114/77 94/121/72 95/122/88 89/116/84 +f 89/116/84 95/122/88 91/118/86 82/109/81 +f 91/118/86 96/123/65 97/124/69 92/119/87 +f 92/23/87 97/29/69 98/125/68 93/120/73 +f 93/120/73 98/125/68 99/126/67 94/121/72 +f 94/121/72 99/126/67 100/127/66 95/122/88 +f 95/122/88 100/127/66 96/123/65 91/118/86 +f 96/123/65 101/85/21 102/88/64 97/124/69 +f 97/29/69 102/35/64 103/91/63 98/125/68 +f 98/125/68 103/91/63 104/93/62 99/126/67 +f 99/126/67 104/93/62 105/95/61 100/127/66 +f 100/127/66 105/95/61 101/85/21 96/123/65 +f 101/128/21 106/129/56 107/130/60 102/131/64 +f 102/46/64 107/45/60 108/132/59 103/133/63 +f 103/133/63 108/132/59 109/134/58 104/135/62 +f 104/135/62 109/134/58 110/136/57 105/137/61 +f 105/137/61 110/136/57 106/129/56 101/128/21 +f 106/129/56 111/138/89 112/139/90 107/130/60 +f 107/45/60 112/53/90 113/140/54 108/132/59 +f 108/132/59 113/140/54 114/141/53 109/134/58 +f 109/134/58 114/141/53 115/142/91 110/136/57 +f 110/136/57 115/142/91 111/138/89 106/129/56 +f 111/138/89 116/143/92 117/144/93 112/139/90 +f 112/53/90 117/10/93 118/145/47 113/140/54 +f 113/140/54 118/145/47 119/146/45 114/141/53 +f 114/141/53 119/146/45 120/147/94 115/142/91 +f 115/142/91 120/147/94 116/143/92 111/138/89 +f 116/143/92 81/108/80 84/111/83 117/144/93 +f 117/10/93 84/9/83 86/113/48 118/145/47 +f 118/145/47 86/113/48 88/115/46 119/146/45 +f 119/146/45 88/115/46 90/117/85 120/147/94 +f 81/108/80 116/143/92 120/147/94 90/117/85 +f 121/148/95 122/149/96 123/150/97 124/151/98 +f 124/151/98 123/150/97 125/152/39 126/153/8 +f 126/153/8 125/152/39 127/154/38 128/155/6 +f 128/155/6 127/154/38 129/156/99 130/157/100 +f 121/148/95 130/103/100 129/58/99 122/149/96 +f 122/149/96 131/158/101 132/159/102 123/150/97 +f 123/150/97 132/159/102 133/160/34 125/152/39 +f 125/152/39 133/160/34 134/161/33 127/154/38 +f 127/154/38 134/161/33 135/162/103 129/156/99 +f 129/58/99 135/57/103 131/158/101 122/149/96 +f 131/158/101 136/163/26 137/164/104 132/159/102 +f 132/159/102 137/164/104 138/165/105 133/160/34 +f 133/160/34 138/165/105 139/166/28 134/161/33 +f 134/161/33 139/166/28 140/167/106 135/162/103 +f 135/57/103 140/68/106 136/163/26 131/158/101 +f 136/163/26 141/168/21 142/169/25 137/164/104 +f 137/164/104 142/169/25 143/170/24 138/165/105 +f 138/165/105 143/170/24 144/171/23 139/166/28 +f 139/166/28 144/171/23 145/172/22 140/167/106 +f 140/68/106 145/74/22 141/168/21 136/163/26 +f 141/168/21 146/173/16 147/174/107 142/169/25 +f 142/169/25 147/174/107 148/175/19 143/170/24 +f 143/170/24 148/175/19 149/176/18 144/171/23 +f 144/171/23 149/176/18 150/177/108 145/172/22 +f 145/74/22 150/80/108 146/173/16 141/168/21 +f 146/178/16 151/179/109 152/180/110 147/181/107 +f 147/181/107 152/180/110 153/182/14 148/183/19 +f 148/183/19 153/182/14 154/184/13 149/185/18 +f 149/185/18 154/184/13 155/186/111 150/187/108 +f 150/88/108 155/87/111 151/179/109 146/178/16 +f 151/179/109 156/188/112 157/189/113 152/180/110 +f 152/180/110 157/189/113 158/190/7 153/182/14 +f 153/182/14 158/190/7 159/191/5 154/184/13 +f 154/184/13 159/191/5 160/192/114 155/186/111 +f 155/87/111 160/97/114 156/188/112 151/179/109 +f 156/188/112 121/148/95 124/151/98 157/189/113 +f 157/189/113 124/151/98 126/153/8 158/190/7 +f 158/190/7 126/153/8 128/155/6 159/191/5 +f 159/191/5 128/155/6 130/157/100 160/192/114 +f 121/148/95 156/188/112 160/97/114 130/103/100 +f 161/193/80 162/194/115 163/60/82 164/59/83 +f 164/195/83 163/196/82 165/197/78 166/198/48 +f 166/198/48 165/197/78 167/199/77 168/200/46 +f 168/200/46 167/199/77 169/201/84 170/202/85 +f 161/193/80 170/202/85 169/201/84 162/194/115 +f 162/194/115 171/203/86 172/69/87 163/60/82 +f 163/196/82 172/204/87 173/205/73 165/197/78 +f 165/197/78 173/205/73 174/206/72 167/199/77 +f 167/199/77 174/206/72 175/207/88 169/201/84 +f 169/201/84 175/207/88 171/203/86 162/194/115 +f 171/203/86 176/208/116 177/75/69 172/69/87 +f 172/204/87 177/209/69 178/210/68 173/205/73 +f 173/205/73 178/210/68 179/211/67 174/206/72 +f 174/206/72 179/211/67 180/212/66 175/207/88 +f 175/207/88 180/212/66 176/208/116 171/203/86 +f 176/208/116 181/213/21 182/81/64 177/75/69 +f 177/209/69 182/214/64 183/215/63 178/210/68 +f 178/210/68 183/215/63 184/216/62 179/211/67 +f 179/211/67 184/216/62 185/217/61 180/212/66 +f 180/212/66 185/217/61 181/213/21 176/208/116 +f 181/34/21 186/218/117 187/89/60 182/35/64 +f 182/36/64 187/219/60 188/220/59 183/31/63 +f 183/31/63 188/220/59 189/221/58 184/32/62 +f 184/32/62 189/221/58 190/222/57 185/33/61 +f 185/33/61 190/222/57 186/218/117 181/34/21 +f 186/218/117 191/223/89 192/98/90 187/89/60 +f 187/219/60 192/224/90 193/225/54 188/220/59 +f 188/220/59 193/225/54 194/226/53 189/221/58 +f 189/221/58 194/226/53 195/227/91 190/222/57 +f 190/222/57 195/227/91 191/223/89 186/218/117 +f 191/223/89 196/228/92 197/104/93 192/98/90 +f 192/224/90 197/229/93 198/230/47 193/225/54 +f 193/225/54 198/230/47 199/231/45 194/226/53 +f 194/226/53 199/231/45 200/232/94 195/227/91 +f 195/227/91 200/232/94 196/228/92 191/223/89 +f 196/228/92 161/193/80 164/59/83 197/104/93 +f 197/229/93 164/195/83 166/198/48 198/230/47 +f 198/230/47 166/198/48 168/200/46 199/231/45 +f 199/231/45 168/200/46 170/202/85 200/232/94 +f 161/193/80 196/228/92 200/232/94 170/202/85 +f 201/233/1 202/234/2 203/235/118 204/236/119 +f 204/111/119 203/110/118 205/237/5 206/238/6 +f 206/238/6 205/237/5 207/239/7 208/240/8 +f 208/240/8 207/239/7 209/241/120 210/242/121 +f 201/233/1 210/242/121 209/241/120 202/234/2 +f 202/234/2 211/243/11 212/244/12 203/235/118 +f 203/110/118 212/119/12 213/245/13 205/237/5 +f 205/237/5 213/245/13 214/246/14 207/239/7 +f 207/239/7 214/246/14 215/247/15 209/241/120 +f 209/241/120 215/247/15 211/243/11 202/234/2 +f 211/243/11 216/248/16 217/249/108 212/244/12 +f 212/119/12 217/124/108 218/250/18 213/245/13 +f 213/245/13 218/250/18 219/251/19 214/246/14 +f 214/246/14 219/251/19 220/252/107 215/247/15 +f 215/247/15 220/252/107 216/248/16 211/243/11 +f 216/248/16 221/185/21 222/187/22 217/249/108 +f 217/124/108 222/88/22 223/178/23 218/250/18 +f 218/250/18 223/178/23 224/181/24 219/251/19 +f 219/251/19 224/181/24 225/183/25 220/252/107 +f 220/252/107 225/183/25 221/185/21 216/248/16 +f 221/253/21 226/254/26 227/255/106 222/256/22 +f 222/131/22 227/130/106 228/257/122 223/258/23 +f 223/258/23 228/257/122 229/259/29 224/260/24 +f 224/260/24 229/259/29 230/261/104 225/262/25 +f 225/262/25 230/261/104 226/254/26 221/253/21 +f 226/254/26 231/263/31 232/264/32 227/255/106 +f 227/130/106 232/139/32 233/265/33 228/257/122 +f 228/257/122 233/265/33 234/266/34 229/259/29 +f 229/259/29 234/266/34 235/267/123 230/261/104 +f 230/261/104 235/267/123 231/263/31 226/254/26 +f 231/263/31 236/268/36 237/269/37 232/264/32 +f 232/139/32 237/144/37 238/270/124 233/265/33 +f 233/265/33 238/270/124 239/271/125 234/266/34 +f 234/266/34 239/271/125 240/272/40 235/267/123 +f 235/267/123 240/272/40 236/268/36 231/263/31 +f 236/268/36 201/233/1 204/236/119 237/269/37 +f 237/144/37 204/111/119 206/238/6 238/270/124 +f 238/270/124 206/238/6 208/240/8 239/271/125 +f 239/271/125 208/240/8 210/242/121 240/272/40 +f 201/233/1 236/268/36 240/272/40 210/242/121 diff --git a/basic_materials/plastics.lua b/basic_materials/plastics.lua new file mode 100644 index 0000000..953023e --- /dev/null +++ b/basic_materials/plastics.lua @@ -0,0 +1,52 @@ +-- items + +minetest.register_craftitem("basic_materials:plastic_sheet", { + description = "Plastic sheet", + inventory_image = "basic_materials_plastic_sheet.png", +}) + +minetest.register_craftitem("basic_materials:plastic_strip", { + description = "Plastic strips", + inventory_image = "basic_materials_plastic_strip.png", +}) + +minetest.register_craftitem("basic_materials:empty_spool", { + description = "Empty wire spool", + inventory_image = "basic_materials_empty_spool.png" +}) + +-- crafts + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:plastic_sheet", + recipe = "basic_materials:paraffin", +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:plastic_sheet", + burntime = 30, +}) + +minetest.register_craft( { + output = "basic_materials:plastic_strip 9", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } + }, +}) + +minetest.register_craft( { + output = "basic_materials:empty_spool 3", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "", "basic_materials:plastic_sheet", "" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } + }, +}) + +-- aliases + +minetest.register_alias("homedecor:plastic_sheeting", "basic_materials:plastic_sheet") +minetest.register_alias("homedecor:plastic_strips", "basic_materials:plastic_strip") +minetest.register_alias("homedecor:empty_spool", "basic_materials:empty_spool") diff --git a/basic_materials/textures/basic_materials_brass_block.png b/basic_materials/textures/basic_materials_brass_block.png new file mode 100644 index 0000000..c937800 Binary files /dev/null and b/basic_materials/textures/basic_materials_brass_block.png differ diff --git a/basic_materials/textures/basic_materials_brass_ingot.png b/basic_materials/textures/basic_materials_brass_ingot.png new file mode 100644 index 0000000..0bd030a Binary files /dev/null and b/basic_materials/textures/basic_materials_brass_ingot.png differ diff --git a/basic_materials/textures/basic_materials_cement_block.png b/basic_materials/textures/basic_materials_cement_block.png new file mode 100644 index 0000000..c4c6a11 Binary files /dev/null and b/basic_materials/textures/basic_materials_cement_block.png differ diff --git a/basic_materials/textures/basic_materials_chain_brass.png b/basic_materials/textures/basic_materials_chain_brass.png new file mode 100644 index 0000000..e2fb20d Binary files /dev/null and b/basic_materials/textures/basic_materials_chain_brass.png differ diff --git a/basic_materials/textures/basic_materials_chain_brass_inv.png b/basic_materials/textures/basic_materials_chain_brass_inv.png new file mode 100644 index 0000000..8c2d554 Binary files /dev/null and b/basic_materials/textures/basic_materials_chain_brass_inv.png differ diff --git a/basic_materials/textures/basic_materials_chain_steel.png b/basic_materials/textures/basic_materials_chain_steel.png new file mode 100644 index 0000000..29af8db Binary files /dev/null and b/basic_materials/textures/basic_materials_chain_steel.png differ diff --git a/basic_materials/textures/basic_materials_chain_steel_inv.png b/basic_materials/textures/basic_materials_chain_steel_inv.png new file mode 100644 index 0000000..c552f7b Binary files /dev/null and b/basic_materials/textures/basic_materials_chain_steel_inv.png differ diff --git a/basic_materials/textures/basic_materials_chainlink_brass.png b/basic_materials/textures/basic_materials_chainlink_brass.png new file mode 100644 index 0000000..9a1ad87 Binary files /dev/null and b/basic_materials/textures/basic_materials_chainlink_brass.png differ diff --git a/basic_materials/textures/basic_materials_chainlink_steel.png b/basic_materials/textures/basic_materials_chainlink_steel.png new file mode 100644 index 0000000..d7132c3 Binary files /dev/null and b/basic_materials/textures/basic_materials_chainlink_steel.png differ diff --git a/basic_materials/textures/basic_materials_copper_strip.png b/basic_materials/textures/basic_materials_copper_strip.png new file mode 100644 index 0000000..22e572a Binary files /dev/null and b/basic_materials/textures/basic_materials_copper_strip.png differ diff --git a/basic_materials/textures/basic_materials_copper_wire.png b/basic_materials/textures/basic_materials_copper_wire.png new file mode 100644 index 0000000..9df9f36 Binary files /dev/null and b/basic_materials/textures/basic_materials_copper_wire.png differ diff --git a/basic_materials/textures/basic_materials_empty_spool.png b/basic_materials/textures/basic_materials_empty_spool.png new file mode 100644 index 0000000..017a94f Binary files /dev/null and b/basic_materials/textures/basic_materials_empty_spool.png differ diff --git a/basic_materials/textures/basic_materials_energy_crystal.png b/basic_materials/textures/basic_materials_energy_crystal.png new file mode 100644 index 0000000..f1c28e8 Binary files /dev/null and b/basic_materials/textures/basic_materials_energy_crystal.png differ diff --git a/basic_materials/textures/basic_materials_gear_steel.png b/basic_materials/textures/basic_materials_gear_steel.png new file mode 100644 index 0000000..584f9a5 Binary files /dev/null and b/basic_materials/textures/basic_materials_gear_steel.png differ diff --git a/basic_materials/textures/basic_materials_gold_wire.png b/basic_materials/textures/basic_materials_gold_wire.png new file mode 100644 index 0000000..781de7b Binary files /dev/null and b/basic_materials/textures/basic_materials_gold_wire.png differ diff --git a/basic_materials/textures/basic_materials_heating_element.png b/basic_materials/textures/basic_materials_heating_element.png new file mode 100644 index 0000000..42e00b7 Binary files /dev/null and b/basic_materials/textures/basic_materials_heating_element.png differ diff --git a/basic_materials/textures/basic_materials_ic.png b/basic_materials/textures/basic_materials_ic.png new file mode 100644 index 0000000..4c88894 Binary files /dev/null and b/basic_materials/textures/basic_materials_ic.png differ diff --git a/basic_materials/textures/basic_materials_motor.png b/basic_materials/textures/basic_materials_motor.png new file mode 100644 index 0000000..f19ec0a Binary files /dev/null and b/basic_materials/textures/basic_materials_motor.png differ diff --git a/basic_materials/textures/basic_materials_oil_extract.png b/basic_materials/textures/basic_materials_oil_extract.png new file mode 100644 index 0000000..e34623d Binary files /dev/null and b/basic_materials/textures/basic_materials_oil_extract.png differ diff --git a/basic_materials/textures/basic_materials_padlock.png b/basic_materials/textures/basic_materials_padlock.png new file mode 100644 index 0000000..b05b7ef Binary files /dev/null and b/basic_materials/textures/basic_materials_padlock.png differ diff --git a/basic_materials/textures/basic_materials_paraffin.png b/basic_materials/textures/basic_materials_paraffin.png new file mode 100644 index 0000000..77d2bbd Binary files /dev/null and b/basic_materials/textures/basic_materials_paraffin.png differ diff --git a/basic_materials/textures/basic_materials_plastic_sheet.png b/basic_materials/textures/basic_materials_plastic_sheet.png new file mode 100644 index 0000000..034dcc2 Binary files /dev/null and b/basic_materials/textures/basic_materials_plastic_sheet.png differ diff --git a/basic_materials/textures/basic_materials_plastic_strip.png b/basic_materials/textures/basic_materials_plastic_strip.png new file mode 100644 index 0000000..1318dfc Binary files /dev/null and b/basic_materials/textures/basic_materials_plastic_strip.png differ diff --git a/basic_materials/textures/basic_materials_silicon.png b/basic_materials/textures/basic_materials_silicon.png new file mode 100644 index 0000000..847b366 Binary files /dev/null and b/basic_materials/textures/basic_materials_silicon.png differ diff --git a/basic_materials/textures/basic_materials_silver_wire.png b/basic_materials/textures/basic_materials_silver_wire.png new file mode 100644 index 0000000..a38a45e Binary files /dev/null and b/basic_materials/textures/basic_materials_silver_wire.png differ diff --git a/basic_materials/textures/basic_materials_steel_bar.png b/basic_materials/textures/basic_materials_steel_bar.png new file mode 100644 index 0000000..0673b6e Binary files /dev/null and b/basic_materials/textures/basic_materials_steel_bar.png differ diff --git a/basic_materials/textures/basic_materials_steel_strip.png b/basic_materials/textures/basic_materials_steel_strip.png new file mode 100644 index 0000000..6384dc8 Binary files /dev/null and b/basic_materials/textures/basic_materials_steel_strip.png differ diff --git a/basic_materials/textures/basic_materials_steel_wire.png b/basic_materials/textures/basic_materials_steel_wire.png new file mode 100644 index 0000000..0c96c8f Binary files /dev/null and b/basic_materials/textures/basic_materials_steel_wire.png differ diff --git a/basic_materials/textures/basic_materials_terracotta_base.png b/basic_materials/textures/basic_materials_terracotta_base.png new file mode 100644 index 0000000..9f04aad Binary files /dev/null and b/basic_materials/textures/basic_materials_terracotta_base.png differ diff --git a/basic_materials/textures/basic_materials_wet_cement.png b/basic_materials/textures/basic_materials_wet_cement.png new file mode 100644 index 0000000..6a7fbf1 Binary files /dev/null and b/basic_materials/textures/basic_materials_wet_cement.png differ diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 3ce0cd4..8d6520b 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -19,6 +19,10 @@ if minetest.get_modpath("moreblocks") then minetest.unregister_item("moreblocks:tar") minetest.register_alias("moreblocks:tar", "building_blocks:Tar") stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar") + + if minetest.get_modpath("gloopblocks") then + minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1") + end end minetest.register_alias("adobe", "building_blocks:Adobe") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index f5cd549..641d412 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,4 +1,5 @@ default homedecor_i18n moreblocks? +gloopblocks? stairs? diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 9781293..b0fecb4 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -131,26 +131,30 @@ minetest.register_node("building_blocks:brobble_spread", { is_ground_content = true, groups = {crumbly=3}, }) -minetest.register_node("building_blocks:gravel_spread", { - drawtype = "raillike", - description = S("Gravel Spread"), - tiles = {"default_gravel.png"}, - inventory_image = "building_blocks_gravel_spread_inv.png", - paramtype = "light", - walkable = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - sunlight_propagates = true, - is_ground_content = true, - groups = {crumbly=2}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_gravel_footstep", gain=0.5}, - dug = {name="default_gravel_footstep", gain=1.0}, - }), -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_node("building_blocks:gravel_spread", { + drawtype = "raillike", + description = S("Gravel Spread"), + tiles = {"default_gravel.png"}, + inventory_image = "building_blocks_gravel_spread_inv.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + -- but how to specify the dimensions for curved and sideways rails? + fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, + }, + sunlight_propagates = true, + is_ground_content = true, + groups = {crumbly=2}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_gravel_footstep", gain=0.5}, + dug = {name="default_gravel_footstep", gain=1.0}, + }), + }) +end + minetest.register_node("building_blocks:Tarmac_spread", { drawtype = "raillike", description = S("Tarmac Spread"), diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index e8f810f..42ac0a8 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -60,12 +60,16 @@ minetest.register_craft({ {"default:glass", "default:glass"}, } }) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) + +if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then + minetest.register_craft({ + output = 'building_blocks:gravel_spread 4', + recipe = { + {"default:gravel", "default:gravel", "default:gravel"}, + } + }) +end + minetest.register_craft({ output = 'building_blocks:hardwood 2', recipe = { @@ -167,4 +171,4 @@ minetest.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, -}) \ No newline at end of file +}) diff --git a/chains/depends.txt b/chains/depends.txt deleted file mode 100644 index 7b3e79f..0000000 --- a/chains/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -homedecor diff --git a/chains/init.lua b/chains/init.lua deleted file mode 100644 index e7d2255..0000000 --- a/chains/init.lua +++ /dev/null @@ -1,179 +0,0 @@ - -local S = homedecor_i18n.gettext - -local chains_sbox = { - type = "fixed", - fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 } -} - -local topchains_sbox = { - type = "fixed", - fixed = { - { -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 }, - { -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 } - } -} - -minetest.register_node("chains:chain", { - description = S("Hanging chain (wrought iron)"), - drawtype = "mesh", - mesh = "chains.obj", - tiles = {"chains_wrought_iron.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "chain_wrought_iron_inv.png", - groups = {cracky=3}, - selection_box = chains_sbox, -}) - -minetest.register_node("chains:chain_brass", { - description = S("Hanging chain (brass)"), - drawtype = "mesh", - mesh = "chains.obj", - tiles = {"chains_brass.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "chain_brass_inv.png", - groups = {cracky=3}, - selection_box = chains_sbox, -}) - -minetest.register_node("chains:chain_top", { - description = S("Hanging chain (ceiling mount, wrought iron)"), - drawtype = "mesh", - mesh = "top_chains.obj", - tiles = {"chains_wrought_iron.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "top_chain_wrought_iron_inv.png", - groups = {cracky=3}, - selection_box = topchains_sbox, -}) - -minetest.register_node("chains:chain_top_brass", { - description = S("Hanging chain (ceiling mount, brass)"), - drawtype = "mesh", - mesh = "top_chains.obj", - tiles = {"chains_brass.png"}, - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - inventory_image = "top_chain_brass_inv.png", - groups = {cracky=3}, - selection_box = topchains_sbox, -}) - -minetest.register_node("chains:chandelier", { - description = S("Chandelier (wrought iron)"), - paramtype = "light", - light_source = 12, - walkable = false, - climbable = true, - sunlight_propagates = true, - tiles = { - "chains_wrought_iron.png", - "chains_candle.png", - { - name="chains_candle_flame.png", - animation={ - type="vertical_frames", - aspect_w=16, - aspect_h=16, - length=3.0 - } - } - }, - drawtype = "mesh", - mesh = "chains_chandelier.obj", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("chains:chandelier_brass", { - description = S("Chandelier (brass)"), - paramtype = "light", - light_source = 12, - walkable = false, - climbable = true, - sunlight_propagates = true, - tiles = { - "chains_brass.png", - "chains_candle.png", - { - name="chains_candle_flame.png", - animation={ - type="vertical_frames", - aspect_w=16, - aspect_h=16, - length=3.0 - } - } - }, - drawtype = "mesh", - mesh = "chains_chandelier.obj", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - --- crafts - -minetest.register_craft({ - output = 'chains:chain 2', - recipe = { - {'glooptest:chainlink'}, - {'glooptest:chainlink'}, - {'glooptest:chainlink'}, - } -}) - -minetest.register_craft({ - output = 'chains:chain_top', - recipe = { - {'default:steel_ingot'}, - {'glooptest:chainlink'}, - }, -}) - -minetest.register_craft({ - output = 'chains:chandelier', - recipe = { - {'', 'glooptest:chainlink', ''}, - {'default:torch', 'glooptest:chainlink', 'default:torch'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - } -}) - --- brass versions - -minetest.register_craft({ - output = 'chains:chain_brass 2', - recipe = { - {'homedecor:chainlink_brass'}, - {'homedecor:chainlink_brass'}, - {'homedecor:chainlink_brass'}, - } -}) - -minetest.register_craft({ - output = 'chains:chain_top_brass', - recipe = { - {'technic:brass_ingot'}, - {'homedecor:chainlink_brass'}, - }, -}) - -minetest.register_craft({ - output = 'chains:chandelier_brass', - recipe = { - {'', 'homedecor:chainlink_brass', ''}, - {'default:torch', 'homedecor:chainlink_brass', 'default:torch'}, - {'technic:brass_ingot', 'technic:brass_ingot', 'technic:brass_ingot'}, - } -}) diff --git a/chains/models/chains.obj b/chains/models/chains.obj deleted file mode 100644 index 78724c9..0000000 --- a/chains/models/chains.obj +++ /dev/null @@ -1,881 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'chains.blend' -# www.blender.org -o Torus.016_Torus -v 0.000000 -0.429978 0.000002 -v 0.000000 -0.401109 0.055211 -v -0.014044 -0.391975 0.048870 -v -0.014044 -0.423304 0.000002 -v -0.009826 -0.379748 0.040970 -v -0.009826 -0.406012 0.000002 -v 0.009826 -0.379748 0.040970 -v 0.009826 -0.406012 0.000002 -v 0.014044 -0.391975 0.048870 -v 0.014044 -0.423304 0.000002 -v 0.000000 -0.316336 0.080195 -v -0.014044 -0.316336 0.069112 -v -0.009826 -0.316336 0.057941 -v 0.009826 -0.316336 0.057941 -v 0.014044 -0.316336 0.069112 -v 0.000000 -0.231564 0.055211 -v -0.014044 -0.240700 0.048870 -v -0.009826 -0.252925 0.040970 -v 0.009826 -0.252925 0.040970 -v 0.014044 -0.240700 0.048870 -v 0.000000 -0.202695 0.000002 -v -0.014044 -0.209368 0.000002 -v -0.009826 -0.226661 0.000002 -v 0.009826 -0.226661 0.000002 -v 0.014044 -0.209368 0.000002 -v 0.000000 -0.231564 -0.055206 -v -0.014044 -0.240700 -0.048868 -v -0.009826 -0.252925 -0.040967 -v 0.009826 -0.252925 -0.040967 -v 0.014044 -0.240700 -0.048865 -v 0.000000 -0.316336 -0.080190 -v -0.014044 -0.316336 -0.069108 -v -0.009826 -0.316336 -0.057936 -v 0.009826 -0.316336 -0.057936 -v 0.014044 -0.316336 -0.069108 -v 0.000000 -0.400361 -0.055206 -v -0.014044 -0.391975 -0.048868 -v -0.009826 -0.379748 -0.040967 -v 0.009826 -0.379748 -0.040967 -v 0.014044 -0.391975 -0.048868 -v 0.000000 -0.262249 0.000002 -v -0.061672 -0.233381 0.000002 -v -0.054590 -0.224245 -0.012569 -v 0.000000 -0.255577 -0.012569 -v -0.045765 -0.212018 -0.008794 -v 0.000000 -0.238285 -0.008794 -v -0.045765 -0.212018 0.008798 -v 0.000000 -0.238285 0.008798 -v -0.054590 -0.224245 0.012574 -v 0.000000 -0.255577 0.012574 -v -0.089582 -0.148609 0.000002 -v -0.077200 -0.148609 -0.012569 -v -0.064722 -0.148609 -0.008794 -v -0.064722 -0.148609 0.008799 -v -0.077200 -0.148609 0.012574 -v -0.061672 -0.063837 0.000002 -v -0.054590 -0.072971 -0.012569 -v -0.045765 -0.085198 -0.008794 -v -0.045765 -0.085198 0.008799 -v -0.054590 -0.072971 0.012574 -v 0.000000 -0.034967 0.000002 -v 0.000000 -0.041641 -0.012569 -v 0.000000 -0.058933 -0.008794 -v 0.000000 -0.058933 0.008799 -v 0.000000 -0.041641 0.012574 -v 0.061672 -0.063837 0.000002 -v 0.054590 -0.072971 -0.012569 -v 0.045765 -0.085198 -0.008794 -v 0.045765 -0.085198 0.008799 -v 0.054590 -0.072971 0.012574 -v 0.089582 -0.148609 0.000002 -v 0.077200 -0.148609 -0.012569 -v 0.064722 -0.148609 -0.008794 -v 0.064722 -0.148609 0.008799 -v 0.077200 -0.148609 0.012574 -v 0.061672 -0.232631 0.000002 -v 0.054590 -0.224245 -0.012569 -v 0.045765 -0.212018 -0.008794 -v 0.045765 -0.212018 0.008798 -v 0.054590 -0.224245 0.012574 -v 0.000000 0.073316 0.000002 -v 0.061672 0.102183 0.000002 -v 0.054590 0.111319 0.012574 -v 0.000000 0.079988 0.012574 -v 0.045765 0.123546 0.008799 -v 0.000000 0.097280 0.008799 -v 0.045765 0.123546 -0.008794 -v 0.000000 0.097280 -0.008794 -v 0.054590 0.111319 -0.012569 -v 0.000000 0.079988 -0.012569 -v 0.089582 0.186956 0.000002 -v 0.077200 0.186956 0.012574 -v 0.064722 0.186956 0.008799 -v 0.064722 0.186956 -0.008794 -v 0.077200 0.186956 -0.012569 -v 0.061672 0.271728 0.000002 -v 0.054590 0.262594 0.012574 -v 0.045765 0.250367 0.008799 -v 0.045765 0.250367 -0.008794 -v 0.054590 0.262594 -0.012569 -v 0.000000 0.300597 0.000002 -v 0.000000 0.293923 0.012574 -v 0.000000 0.276631 0.008799 -v 0.000000 0.276631 -0.008794 -v 0.000000 0.293923 -0.012569 -v -0.061672 0.271728 0.000002 -v -0.054590 0.262594 0.012574 -v -0.045765 0.250367 0.008799 -v -0.045765 0.250367 -0.008794 -v -0.054590 0.262594 -0.012569 -v -0.089582 0.186956 0.000002 -v -0.077200 0.186956 0.012574 -v -0.064722 0.186956 0.008799 -v -0.064722 0.186956 -0.008794 -v -0.077200 0.186956 -0.012569 -v -0.061672 0.102931 0.000002 -v -0.054590 0.111319 0.012574 -v -0.045765 0.123546 0.008799 -v -0.045765 0.123546 -0.008794 -v -0.054590 0.111319 -0.012569 -v 0.000000 -0.095037 0.000002 -v 0.000000 -0.066168 -0.055206 -v 0.014044 -0.057034 -0.048868 -v 0.014044 -0.088363 0.000002 -v 0.009826 -0.044807 -0.040967 -v 0.009826 -0.071071 0.000002 -v -0.009826 -0.044807 -0.040967 -v -0.009826 -0.071071 0.000002 -v -0.014044 -0.057034 -0.048868 -v -0.014044 -0.088363 0.000002 -v 0.000000 0.018605 -0.080190 -v 0.014044 0.018605 -0.069108 -v 0.009826 0.018605 -0.057936 -v -0.009826 0.018605 -0.057936 -v -0.014044 0.018605 -0.069108 -v 0.000000 0.103377 -0.055206 -v 0.014044 0.094243 -0.048868 -v 0.009826 0.082016 -0.040967 -v -0.009826 0.082016 -0.040967 -v -0.014044 0.094243 -0.048868 -v 0.000000 0.132246 0.000002 -v 0.014044 0.125572 0.000002 -v 0.009826 0.108280 0.000002 -v -0.009826 0.108280 0.000002 -v -0.014044 0.125572 0.000002 -v 0.000000 0.103377 0.055211 -v 0.014044 0.094243 0.048870 -v 0.009826 0.082016 0.040970 -v -0.009826 0.082016 0.040970 -v -0.014044 0.094243 0.048870 -v 0.000000 0.018605 0.080195 -v 0.014044 0.018605 0.069112 -v 0.009826 0.018605 0.057941 -v -0.009826 0.018605 0.057941 -v -0.014044 0.018605 0.069112 -v 0.000000 -0.065420 0.055211 -v 0.014044 -0.057032 0.048870 -v 0.009826 -0.044807 0.040970 -v -0.009826 -0.044807 0.040970 -v -0.014044 -0.057032 0.048870 -v 0.000000 -0.598329 0.000002 -v 0.061672 -0.569460 0.000002 -v 0.054590 -0.560326 0.012574 -v 0.000000 -0.591655 0.012574 -v 0.045765 -0.548099 0.008798 -v 0.000000 -0.574363 0.008798 -v 0.045765 -0.548099 -0.008794 -v 0.000000 -0.574363 -0.008794 -v 0.054590 -0.560326 -0.012569 -v 0.000000 -0.591655 -0.012569 -v 0.089582 -0.484687 0.000002 -v 0.077200 -0.484687 0.012574 -v 0.064722 -0.484687 0.008798 -v 0.064722 -0.484687 -0.008794 -v 0.077200 -0.484687 -0.012569 -v 0.061672 -0.399915 0.000002 -v 0.054590 -0.409051 0.012574 -v 0.045765 -0.421278 0.008798 -v 0.045765 -0.421278 -0.008794 -v 0.054590 -0.409051 -0.012569 -v 0.000000 -0.371048 0.000002 -v 0.000000 -0.377719 0.012574 -v 0.000000 -0.395012 0.008798 -v 0.000000 -0.395012 -0.008794 -v 0.000000 -0.377719 -0.012569 -v -0.061672 -0.399915 0.000002 -v -0.054590 -0.409051 0.012574 -v -0.045765 -0.421278 0.008798 -v -0.045765 -0.421278 -0.008794 -v -0.054590 -0.409051 -0.012569 -v -0.089582 -0.484687 0.000002 -v -0.077200 -0.484687 0.012574 -v -0.064722 -0.484687 0.008798 -v -0.064722 -0.484687 -0.008794 -v -0.077200 -0.484687 -0.012569 -v -0.061672 -0.568712 0.000002 -v -0.054590 -0.560326 0.012574 -v -0.045765 -0.548099 0.008798 -v -0.045765 -0.548099 -0.008794 -v -0.054590 -0.560326 -0.012569 -v 0.000000 0.241043 0.000002 -v 0.000000 0.269910 0.055211 -v -0.014044 0.279047 0.048870 -v -0.014044 0.247717 0.000002 -v -0.009826 0.291274 0.040970 -v -0.009826 0.265007 0.000002 -v 0.009826 0.291274 0.040970 -v 0.009826 0.265007 0.000002 -v 0.014044 0.279047 0.048870 -v 0.014044 0.247717 0.000002 -v 0.000000 0.354683 0.080195 -v -0.014044 0.354683 0.069112 -v -0.009826 0.354683 0.057941 -v 0.009826 0.354683 0.057941 -v 0.014044 0.354683 0.069112 -v 0.000000 0.439455 0.055211 -v -0.014044 0.430321 0.048870 -v -0.009826 0.418094 0.040970 -v 0.009826 0.418094 0.040970 -v 0.014044 0.430321 0.048870 -v 0.000000 0.468325 0.000002 -v -0.014044 0.461651 0.000002 -v -0.009826 0.444361 0.000002 -v 0.009826 0.444361 0.000002 -v 0.014044 0.461651 0.000002 -v 0.000000 0.439455 -0.055206 -v -0.014044 0.430321 -0.048868 -v -0.009826 0.418094 -0.040967 -v 0.009826 0.418094 -0.040967 -v 0.014044 0.430321 -0.048868 -v 0.000000 0.354683 -0.080190 -v -0.014044 0.354683 -0.069108 -v -0.009826 0.354683 -0.057936 -v 0.009826 0.354683 -0.057936 -v 0.014044 0.354683 -0.069108 -v 0.000000 0.270661 -0.055206 -v -0.014044 0.279047 -0.048868 -v -0.009826 0.291274 -0.040967 -v 0.009826 0.291274 -0.040967 -v 0.014044 0.279047 -0.048868 -vt 0.187500 0.125000 -vt 0.250000 0.125000 -vt 0.250000 0.187500 -vt 0.187500 0.187500 -vt 0.250000 0.250000 -vt 0.187500 0.250000 -vt 0.250000 0.312500 -vt 0.187500 0.312500 -vt 0.250000 0.375000 -vt 0.187500 0.375000 -vt 0.187500 0.062500 -vt 0.250000 0.062500 -vt 0.312500 0.125000 -vt 0.312500 0.187500 -vt 0.312500 0.250000 -vt 0.312500 0.312500 -vt 0.312500 0.375000 -vt 0.312500 0.062500 -vt 0.375000 0.125000 -vt 0.375000 0.187500 -vt 0.375000 0.250000 -vt 0.375000 0.312500 -vt 0.375000 0.375000 -vt 0.375000 0.062500 -vt 0.437500 0.125000 -vt 0.437500 0.187500 -vt 0.437500 0.250000 -vt 0.437500 0.312500 -vt 0.437500 0.375000 -vt 0.437500 0.062500 -vt 0.500000 0.125000 -vt 0.500000 0.187500 -vt 0.500000 0.250000 -vt 0.500000 0.312500 -vt 0.500000 0.375000 -vt 0.500000 0.062500 -vt -0.000000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.187500 -vt -0.000000 0.187500 -vt 0.062500 0.250000 -vt -0.000000 0.250000 -vt 0.062500 0.312500 -vt -0.000000 0.312500 -vt 0.062500 0.375000 -vt -0.000000 0.375000 -vt -0.000000 0.062500 -vt 0.062500 0.062500 -vt 0.125000 0.125000 -vt 0.125000 0.187500 -vt 0.125000 0.250000 -vt 0.125000 0.312500 -vt 0.125000 0.375000 -vt 0.125000 0.062500 -vt 0.750000 0.625000 -vt 0.812500 0.625000 -vt 0.812500 0.687500 -vt 0.750000 0.687500 -vt 0.750000 0.375000 -vt 0.812500 0.375000 -vt 0.812500 0.437500 -vt 0.750000 0.437500 -vt 0.812500 0.500000 -vt 0.750000 0.500000 -vt 0.812500 0.562500 -vt 0.750000 0.562500 -vt 0.875000 0.625000 -vt 0.875000 0.687500 -vt 0.875000 0.375000 -vt 0.875000 0.437500 -vt 0.875000 0.500000 -vt 0.875000 0.562500 -vt 0.937500 0.625000 -vt 0.937500 0.687500 -vt 0.937500 0.375000 -vt 0.937500 0.437500 -vt 0.937500 0.500000 -vt 0.937500 0.562500 -vt 1.000000 0.625000 -vt 1.000000 0.687500 -vt 1.000000 0.375000 -vt 1.000000 0.437500 -vt 1.000000 0.500000 -vt 1.000000 0.562500 -vt 0.500000 0.625000 -vt 0.562500 0.625000 -vt 0.562500 0.687500 -vt 0.500000 0.687500 -vt 0.562500 0.375000 -vt 0.562500 0.437500 -vt 0.500000 0.437500 -vt 0.562500 0.500000 -vt 0.500000 0.500000 -vt 0.562500 0.562500 -vt 0.500000 0.562500 -vt 0.625000 0.625000 -vt 0.625000 0.687500 -vt 0.625000 0.375000 -vt 0.625000 0.437500 -vt 0.625000 0.500000 -vt 0.625000 0.562500 -vt 0.687500 0.625000 -vt 0.687500 0.687500 -vt 0.687500 0.375000 -vt 0.687500 0.437500 -vt 0.687500 0.500000 -vt 0.687500 0.562500 -vt 0.250000 0.625000 -vt 0.312500 0.625000 -vt 0.312500 0.687500 -vt 0.250000 0.687500 -vt 0.312500 0.437500 -vt 0.250000 0.437500 -vt 0.312500 0.500000 -vt 0.250000 0.500000 -vt 0.312500 0.562500 -vt 0.250000 0.562500 -vt 0.375000 0.625000 -vt 0.375000 0.687500 -vt 0.375000 0.437500 -vt 0.375000 0.500000 -vt 0.375000 0.562500 -vt 0.437500 0.625000 -vt 0.437500 0.687500 -vt 0.437500 0.437500 -vt 0.437500 0.500000 -vt 0.437500 0.562500 -vt -0.000000 0.625000 -vt 0.062500 0.625000 -vt 0.062500 0.687500 -vt -0.000000 0.687500 -vt 0.062500 0.437500 -vt -0.000000 0.437500 -vt 0.062500 0.500000 -vt -0.000000 0.500000 -vt 0.062500 0.562500 -vt -0.000000 0.562500 -vt 0.125000 0.625000 -vt 0.125000 0.687500 -vt 0.125000 0.437500 -vt 0.125000 0.500000 -vt 0.125000 0.562500 -vt 0.187500 0.625000 -vt 0.187500 0.687500 -vt 0.187500 0.437500 -vt 0.187500 0.500000 -vt 0.187500 0.562500 -vt 0.687500 0.750000 -vt 0.750000 0.750000 -vt 0.750000 0.812500 -vt 0.687500 0.812500 -vt 0.750000 0.875000 -vt 0.687500 0.875000 -vt 0.750000 0.937500 -vt 0.687500 0.937500 -vt 0.750000 1.000000 -vt 0.687500 1.000000 -vt 0.812500 0.750000 -vt 0.812500 0.812500 -vt 0.812500 0.875000 -vt 0.812500 0.937500 -vt 0.812500 1.000000 -vt 0.875000 0.750000 -vt 0.875000 0.812500 -vt 0.875000 0.875000 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.937500 0.750000 -vt 0.937500 0.812500 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.937500 1.000000 -vt 1.000000 0.750000 -vt 1.000000 0.812500 -vt 1.000000 0.875000 -vt 1.000000 0.937500 -vt 1.000000 1.000000 -vt 0.500000 0.750000 -vt 0.562500 0.750000 -vt 0.562500 0.812500 -vt 0.500000 0.812500 -vt 0.562500 0.875000 -vt 0.500000 0.875000 -vt 0.562500 0.937500 -vt 0.500000 0.937500 -vt 0.562500 1.000000 -vt 0.500000 1.000000 -vt 0.625000 0.750000 -vt 0.625000 0.812500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.625000 1.000000 -vt 0.750000 0.312500 -vt 0.812500 0.312500 -vt 0.750000 0.062500 -vt 0.812500 0.062500 -vt 0.812500 0.125000 -vt 0.750000 0.125000 -vt 0.812500 0.187500 -vt 0.750000 0.187500 -vt 0.812500 0.250000 -vt 0.750000 0.250000 -vt 0.875000 0.312500 -vt 0.875000 0.062500 -vt 0.875000 0.125000 -vt 0.875000 0.187500 -vt 0.875000 0.250000 -vt 0.937500 0.312500 -vt 0.937500 0.062500 -vt 0.937500 0.125000 -vt 0.937500 0.187500 -vt 0.937500 0.250000 -vt 1.000000 0.312500 -vt 1.000000 0.062500 -vt 1.000000 0.125000 -vt 1.000000 0.187500 -vt 1.000000 0.250000 -vt 0.562500 0.312500 -vt 0.562500 0.062500 -vt 0.562500 0.125000 -vt 0.562500 0.187500 -vt 0.562500 0.250000 -vt 0.625000 0.312500 -vt 0.625000 0.062500 -vt 0.625000 0.125000 -vt 0.625000 0.187500 -vt 0.625000 0.250000 -vt 0.687500 0.312500 -vt 0.687500 0.062500 -vt 0.687500 0.125000 -vt 0.687500 0.187500 -vt 0.687500 0.250000 -vt 0.250000 0.937500 -vt 0.312500 0.937500 -vt 0.312500 1.000000 -vt 0.250000 1.000000 -vt 0.312500 0.750000 -vt 0.250000 0.750000 -vt 0.312500 0.812500 -vt 0.250000 0.812500 -vt 0.312500 0.875000 -vt 0.250000 0.875000 -vt 0.375000 0.937500 -vt 0.375000 1.000000 -vt 0.375000 0.750000 -vt 0.375000 0.812500 -vt 0.375000 0.875000 -vt 0.437500 0.937500 -vt 0.437500 1.000000 -vt 0.437500 0.750000 -vt 0.437500 0.812500 -vt 0.437500 0.875000 -vt 0.000000 0.937500 -vt 0.062500 0.937500 -vt 0.062500 1.000000 -vt 0.000000 1.000000 -vt 0.062500 0.750000 -vt 0.000000 0.750000 -vt 0.062500 0.812500 -vt 0.000000 0.812500 -vt 0.062500 0.875000 -vt 0.000000 0.875000 -vt 0.125000 0.937500 -vt 0.125000 1.000000 -vt 0.125000 0.750000 -vt 0.125000 0.812500 -vt 0.125000 0.875000 -vt 0.187500 0.937500 -vt 0.187500 1.000000 -vt 0.187500 0.750000 -vt 0.187500 0.812500 -vt 0.187500 0.875000 -vn 0.000000 -1.000000 -0.004800 -vn 0.000000 -0.657400 0.753500 -vn -0.898300 -0.248500 0.362300 -vn -0.863600 -0.504100 -0.003400 -vn -0.661500 0.421500 -0.620200 -vn -0.746000 0.665900 0.000000 -vn 0.661500 0.421500 -0.620200 -vn 0.746000 0.665900 0.000000 -vn 0.898300 -0.248500 0.362300 -vn 0.863600 -0.504100 -0.003400 -vn 0.000000 0.000000 1.000000 -vn -0.925200 0.000000 0.379500 -vn -0.617100 0.000000 -0.786900 -vn 0.617100 0.000000 -0.786900 -vn 0.925200 0.000000 0.379500 -vn 0.000000 0.657400 0.753500 -vn -0.898300 0.248400 0.362300 -vn -0.661500 -0.421500 -0.620200 -vn 0.661500 -0.421500 -0.620200 -vn 0.898300 0.248400 0.362300 -vn 0.000000 1.000000 0.000000 -vn -0.866100 0.499800 0.000000 -vn -0.746000 -0.665900 0.000000 -vn 0.746000 -0.665900 0.000000 -vn 0.866100 0.499800 0.000000 -vn 0.000000 0.657400 -0.753500 -vn -0.898300 0.248400 -0.362400 -vn -0.661600 -0.421500 0.620200 -vn 0.661500 -0.421500 0.620200 -vn 0.898300 0.248400 -0.362300 -vn 0.000000 -0.000900 -1.000000 -vn -0.924600 -0.000600 -0.380700 -vn -0.617100 0.000000 0.786900 -vn 0.617100 0.000000 0.786900 -vn 0.924700 -0.000600 -0.380700 -vn 0.000000 -0.650300 -0.759600 -vn -0.895600 -0.254600 -0.364800 -vn -0.661600 0.421500 0.620200 -vn 0.661600 0.421500 0.620200 -vn 0.895600 -0.254600 -0.364800 -vn 0.004900 -1.000000 0.000000 -vn -0.729700 -0.683800 0.000000 -vn -0.324500 -0.256300 -0.910500 -vn 0.003300 -0.475500 -0.879700 -vn 0.578700 0.436200 -0.689100 -vn 0.000000 0.666600 -0.745400 -vn 0.578700 0.436200 0.689100 -vn 0.000000 0.666600 0.745400 -vn -0.324500 -0.256300 0.910500 -vn 0.003300 -0.475500 0.879700 -vn -1.000000 0.000000 0.000000 -vn -0.359600 0.000000 -0.933100 -vn 0.756400 0.000000 -0.654100 -vn 0.756400 0.000000 0.654100 -vn -0.359600 0.000000 0.933100 -vn -0.729700 0.683700 0.000000 -vn -0.324500 0.256300 -0.910500 -vn 0.578700 -0.436200 -0.689100 -vn 0.578700 -0.436200 0.689100 -vn -0.324500 0.256300 0.910500 -vn 0.000000 0.470900 -0.882200 -vn 0.000000 -0.666600 -0.745400 -vn 0.000000 -0.666600 0.745400 -vn 0.000000 0.470900 0.882200 -vn 0.729700 0.683700 0.000000 -vn 0.324500 0.256300 -0.910500 -vn -0.578700 -0.436200 -0.689100 -vn -0.578700 -0.436200 0.689100 -vn 0.324500 0.256300 0.910500 -vn 1.000000 -0.001100 0.000000 -vn 0.361000 -0.000700 -0.932600 -vn -0.756400 0.000000 -0.654100 -vn -0.756400 0.000000 0.654100 -vn 0.361000 -0.000700 0.932600 -vn 0.736100 -0.676800 0.000000 -vn 0.327100 -0.263100 -0.907600 -vn -0.578700 0.436200 -0.689100 -vn -0.578700 0.436200 0.689100 -vn 0.327100 -0.263100 0.907600 -vn -0.004900 -1.000000 0.000000 -vn 0.729700 -0.683800 0.000000 -vn 0.324500 -0.256300 0.910500 -vn -0.003300 -0.475400 0.879700 -vn 0.324500 -0.256300 -0.910500 -vn -0.003300 -0.475400 -0.879700 -vn 1.000000 0.000000 0.000000 -vn 0.359600 0.000000 0.933100 -vn 0.359600 0.000000 -0.933100 -vn -1.000000 -0.001100 0.000000 -vn -0.361000 -0.000700 0.932600 -vn -0.361000 -0.000700 -0.932600 -vn -0.736100 -0.676800 0.000000 -vn -0.327100 -0.263100 0.907600 -vn -0.327100 -0.263100 -0.907600 -vn 0.000000 -1.000000 0.004800 -vn 0.000000 -0.657400 -0.753500 -vn 0.898300 -0.248500 -0.362400 -vn 0.863600 -0.504100 0.003400 -vn -0.898300 -0.248500 -0.362400 -vn -0.863600 -0.504100 0.003400 -vn 0.000000 0.000000 -1.000000 -vn 0.925200 0.000000 -0.379500 -vn -0.925200 0.000000 -0.379500 -vn 0.898300 0.248500 -0.362400 -vn 0.661600 -0.421500 0.620200 -vn -0.898300 0.248500 -0.362400 -vn 0.898300 0.248500 0.362300 -vn -0.898300 0.248500 0.362300 -vn 0.000000 -0.000900 1.000000 -vn 0.924700 -0.000600 0.380700 -vn -0.924700 -0.000600 0.380700 -vn 0.000000 -0.650300 0.759600 -vn 0.895600 -0.254600 0.364700 -vn -0.895600 -0.254600 0.364700 -vn 0.729700 -0.683700 0.000000 -vn 0.729700 0.683800 0.000000 -vn -0.729700 0.683800 0.000000 -vn -0.898300 -0.248400 0.362300 -vn -0.863600 -0.504100 -0.003500 -vn 0.898300 -0.248400 0.362300 -vn 0.863600 -0.504100 -0.003500 -vn -0.661500 -0.421500 0.620200 -vn 0.924600 -0.000600 -0.380700 -vn -0.661500 0.421500 0.620200 -vn 0.661500 0.421500 0.620200 -s 1 -f 1/1/1 2/2/2 3/3/3 4/4/4 -f 4/4/4 3/3/3 5/5/5 6/6/6 -f 6/6/6 5/5/5 7/7/7 8/8/8 -f 8/8/8 7/7/7 9/9/9 10/10/10 -f 1/1/1 10/11/10 9/12/9 2/2/2 -f 2/2/2 11/13/11 12/14/12 3/3/3 -f 3/3/3 12/14/12 13/15/13 5/5/5 -f 5/5/5 13/15/13 14/16/14 7/7/7 -f 7/7/7 14/16/14 15/17/15 9/9/9 -f 9/12/9 15/18/15 11/13/11 2/2/2 -f 11/13/11 16/19/16 17/20/17 12/14/12 -f 12/14/12 17/20/17 18/21/18 13/15/13 -f 13/15/13 18/21/18 19/22/19 14/16/14 -f 14/16/14 19/22/19 20/23/20 15/17/15 -f 15/18/15 20/24/20 16/19/16 11/13/11 -f 16/19/16 21/25/21 22/26/22 17/20/17 -f 17/20/17 22/26/22 23/27/23 18/21/18 -f 18/21/18 23/27/23 24/28/24 19/22/19 -f 19/22/19 24/28/24 25/29/25 20/23/20 -f 20/24/20 25/30/25 21/25/21 16/19/16 -f 21/25/21 26/31/26 27/32/27 22/26/22 -f 22/26/22 27/32/27 28/33/28 23/27/23 -f 23/27/23 28/33/28 29/34/29 24/28/24 -f 24/28/24 29/34/29 30/35/30 25/29/25 -f 25/30/25 30/36/30 26/31/26 21/25/21 -f 26/37/26 31/38/31 32/39/32 27/40/27 -f 27/40/27 32/39/32 33/41/33 28/42/28 -f 28/42/28 33/41/33 34/43/34 29/44/29 -f 29/44/29 34/43/34 35/45/35 30/46/30 -f 30/47/30 35/48/35 31/38/31 26/37/26 -f 31/38/31 36/49/36 37/50/37 32/39/32 -f 32/39/32 37/50/37 38/51/38 33/41/33 -f 33/41/33 38/51/38 39/52/39 34/43/34 -f 34/43/34 39/52/39 40/53/40 35/45/35 -f 35/48/35 40/54/40 36/49/36 31/38/31 -f 36/49/36 1/1/1 4/4/4 37/50/37 -f 37/50/37 4/4/4 6/6/6 38/51/38 -f 38/51/38 6/6/6 8/8/8 39/52/39 -f 39/52/39 8/8/8 10/10/10 40/53/40 -f 1/1/1 36/49/36 40/54/40 10/11/10 -f 41/55/41 42/56/42 43/57/43 44/58/44 -f 44/59/44 43/60/43 45/61/45 46/62/46 -f 46/62/46 45/61/45 47/63/47 48/64/48 -f 48/64/48 47/63/47 49/65/49 50/66/50 -f 41/55/41 50/66/50 49/65/49 42/56/42 -f 42/56/42 51/67/51 52/68/52 43/57/43 -f 43/60/43 52/69/52 53/70/53 45/61/45 -f 45/61/45 53/70/53 54/71/54 47/63/47 -f 47/63/47 54/71/54 55/72/55 49/65/49 -f 49/65/49 55/72/55 51/67/51 42/56/42 -f 51/67/51 56/73/56 57/74/57 52/68/52 -f 52/69/52 57/75/57 58/76/58 53/70/53 -f 53/70/53 58/76/58 59/77/59 54/71/54 -f 54/71/54 59/77/59 60/78/60 55/72/55 -f 55/72/55 60/78/60 56/73/56 51/67/51 -f 56/73/56 61/79/21 62/80/61 57/74/57 -f 57/75/57 62/81/61 63/82/62 58/76/58 -f 58/76/58 63/82/62 64/83/63 59/77/59 -f 59/77/59 64/83/63 65/84/64 60/78/60 -f 60/78/60 65/84/64 61/79/21 56/73/56 -f 61/85/21 66/86/65 67/87/66 62/88/61 -f 62/35/61 67/89/66 68/90/67 63/91/62 -f 63/91/62 68/90/67 69/92/68 64/93/63 -f 64/93/63 69/92/68 70/94/69 65/95/64 -f 65/95/64 70/94/69 66/86/65 61/85/21 -f 66/86/65 71/96/70 72/97/71 67/87/66 -f 67/89/66 72/98/71 73/99/72 68/90/67 -f 68/90/67 73/99/72 74/100/73 69/92/68 -f 69/92/68 74/100/73 75/101/74 70/94/69 -f 70/94/69 75/101/74 71/96/70 66/86/65 -f 71/96/70 76/102/75 77/103/76 72/97/71 -f 72/98/71 77/104/76 78/105/77 73/99/72 -f 73/99/72 78/105/77 79/106/78 74/100/73 -f 74/100/73 79/106/78 80/107/79 75/101/74 -f 75/101/74 80/107/79 76/102/75 71/96/70 -f 76/102/75 41/55/41 44/58/44 77/103/76 -f 77/104/76 44/59/44 46/62/46 78/105/77 -f 78/105/77 46/62/46 48/64/48 79/106/78 -f 79/106/78 48/64/48 50/66/50 80/107/79 -f 41/55/41 76/102/75 80/107/79 50/66/50 -f 81/108/80 82/109/81 83/110/82 84/111/83 -f 84/9/83 83/17/82 85/112/78 86/113/48 -f 86/113/48 85/112/78 87/114/77 88/115/46 -f 88/115/46 87/114/77 89/116/84 90/117/85 -f 81/108/80 90/117/85 89/116/84 82/109/81 -f 82/109/81 91/118/86 92/119/87 83/110/82 -f 83/17/82 92/23/87 93/120/73 85/112/78 -f 85/112/78 93/120/73 94/121/72 87/114/77 -f 87/114/77 94/121/72 95/122/88 89/116/84 -f 89/116/84 95/122/88 91/118/86 82/109/81 -f 91/118/86 96/123/65 97/124/69 92/119/87 -f 92/23/87 97/29/69 98/125/68 93/120/73 -f 93/120/73 98/125/68 99/126/67 94/121/72 -f 94/121/72 99/126/67 100/127/66 95/122/88 -f 95/122/88 100/127/66 96/123/65 91/118/86 -f 96/123/65 101/85/21 102/88/64 97/124/69 -f 97/29/69 102/35/64 103/91/63 98/125/68 -f 98/125/68 103/91/63 104/93/62 99/126/67 -f 99/126/67 104/93/62 105/95/61 100/127/66 -f 100/127/66 105/95/61 101/85/21 96/123/65 -f 101/128/21 106/129/56 107/130/60 102/131/64 -f 102/46/64 107/45/60 108/132/59 103/133/63 -f 103/133/63 108/132/59 109/134/58 104/135/62 -f 104/135/62 109/134/58 110/136/57 105/137/61 -f 105/137/61 110/136/57 106/129/56 101/128/21 -f 106/129/56 111/138/89 112/139/90 107/130/60 -f 107/45/60 112/53/90 113/140/54 108/132/59 -f 108/132/59 113/140/54 114/141/53 109/134/58 -f 109/134/58 114/141/53 115/142/91 110/136/57 -f 110/136/57 115/142/91 111/138/89 106/129/56 -f 111/138/89 116/143/92 117/144/93 112/139/90 -f 112/53/90 117/10/93 118/145/47 113/140/54 -f 113/140/54 118/145/47 119/146/45 114/141/53 -f 114/141/53 119/146/45 120/147/94 115/142/91 -f 115/142/91 120/147/94 116/143/92 111/138/89 -f 116/143/92 81/108/80 84/111/83 117/144/93 -f 117/10/93 84/9/83 86/113/48 118/145/47 -f 118/145/47 86/113/48 88/115/46 119/146/45 -f 119/146/45 88/115/46 90/117/85 120/147/94 -f 81/108/80 116/143/92 120/147/94 90/117/85 -f 121/148/95 122/149/96 123/150/97 124/151/98 -f 124/151/98 123/150/97 125/152/39 126/153/8 -f 126/153/8 125/152/39 127/154/38 128/155/6 -f 128/155/6 127/154/38 129/156/99 130/157/100 -f 121/148/95 130/103/100 129/58/99 122/149/96 -f 122/149/96 131/158/101 132/159/102 123/150/97 -f 123/150/97 132/159/102 133/160/34 125/152/39 -f 125/152/39 133/160/34 134/161/33 127/154/38 -f 127/154/38 134/161/33 135/162/103 129/156/99 -f 129/58/99 135/57/103 131/158/101 122/149/96 -f 131/158/101 136/163/26 137/164/104 132/159/102 -f 132/159/102 137/164/104 138/165/105 133/160/34 -f 133/160/34 138/165/105 139/166/28 134/161/33 -f 134/161/33 139/166/28 140/167/106 135/162/103 -f 135/57/103 140/68/106 136/163/26 131/158/101 -f 136/163/26 141/168/21 142/169/25 137/164/104 -f 137/164/104 142/169/25 143/170/24 138/165/105 -f 138/165/105 143/170/24 144/171/23 139/166/28 -f 139/166/28 144/171/23 145/172/22 140/167/106 -f 140/68/106 145/74/22 141/168/21 136/163/26 -f 141/168/21 146/173/16 147/174/107 142/169/25 -f 142/169/25 147/174/107 148/175/19 143/170/24 -f 143/170/24 148/175/19 149/176/18 144/171/23 -f 144/171/23 149/176/18 150/177/108 145/172/22 -f 145/74/22 150/80/108 146/173/16 141/168/21 -f 146/178/16 151/179/109 152/180/110 147/181/107 -f 147/181/107 152/180/110 153/182/14 148/183/19 -f 148/183/19 153/182/14 154/184/13 149/185/18 -f 149/185/18 154/184/13 155/186/111 150/187/108 -f 150/88/108 155/87/111 151/179/109 146/178/16 -f 151/179/109 156/188/112 157/189/113 152/180/110 -f 152/180/110 157/189/113 158/190/7 153/182/14 -f 153/182/14 158/190/7 159/191/5 154/184/13 -f 154/184/13 159/191/5 160/192/114 155/186/111 -f 155/87/111 160/97/114 156/188/112 151/179/109 -f 156/188/112 121/148/95 124/151/98 157/189/113 -f 157/189/113 124/151/98 126/153/8 158/190/7 -f 158/190/7 126/153/8 128/155/6 159/191/5 -f 159/191/5 128/155/6 130/157/100 160/192/114 -f 121/148/95 156/188/112 160/97/114 130/103/100 -f 161/193/80 162/194/115 163/60/82 164/59/83 -f 164/195/83 163/196/82 165/197/78 166/198/48 -f 166/198/48 165/197/78 167/199/77 168/200/46 -f 168/200/46 167/199/77 169/201/84 170/202/85 -f 161/193/80 170/202/85 169/201/84 162/194/115 -f 162/194/115 171/203/86 172/69/87 163/60/82 -f 163/196/82 172/204/87 173/205/73 165/197/78 -f 165/197/78 173/205/73 174/206/72 167/199/77 -f 167/199/77 174/206/72 175/207/88 169/201/84 -f 169/201/84 175/207/88 171/203/86 162/194/115 -f 171/203/86 176/208/116 177/75/69 172/69/87 -f 172/204/87 177/209/69 178/210/68 173/205/73 -f 173/205/73 178/210/68 179/211/67 174/206/72 -f 174/206/72 179/211/67 180/212/66 175/207/88 -f 175/207/88 180/212/66 176/208/116 171/203/86 -f 176/208/116 181/213/21 182/81/64 177/75/69 -f 177/209/69 182/214/64 183/215/63 178/210/68 -f 178/210/68 183/215/63 184/216/62 179/211/67 -f 179/211/67 184/216/62 185/217/61 180/212/66 -f 180/212/66 185/217/61 181/213/21 176/208/116 -f 181/34/21 186/218/117 187/89/60 182/35/64 -f 182/36/64 187/219/60 188/220/59 183/31/63 -f 183/31/63 188/220/59 189/221/58 184/32/62 -f 184/32/62 189/221/58 190/222/57 185/33/61 -f 185/33/61 190/222/57 186/218/117 181/34/21 -f 186/218/117 191/223/89 192/98/90 187/89/60 -f 187/219/60 192/224/90 193/225/54 188/220/59 -f 188/220/59 193/225/54 194/226/53 189/221/58 -f 189/221/58 194/226/53 195/227/91 190/222/57 -f 190/222/57 195/227/91 191/223/89 186/218/117 -f 191/223/89 196/228/92 197/104/93 192/98/90 -f 192/224/90 197/229/93 198/230/47 193/225/54 -f 193/225/54 198/230/47 199/231/45 194/226/53 -f 194/226/53 199/231/45 200/232/94 195/227/91 -f 195/227/91 200/232/94 196/228/92 191/223/89 -f 196/228/92 161/193/80 164/59/83 197/104/93 -f 197/229/93 164/195/83 166/198/48 198/230/47 -f 198/230/47 166/198/48 168/200/46 199/231/45 -f 199/231/45 168/200/46 170/202/85 200/232/94 -f 161/193/80 196/228/92 200/232/94 170/202/85 -f 201/233/1 202/234/2 203/235/118 204/236/119 -f 204/111/119 203/110/118 205/237/5 206/238/6 -f 206/238/6 205/237/5 207/239/7 208/240/8 -f 208/240/8 207/239/7 209/241/120 210/242/121 -f 201/233/1 210/242/121 209/241/120 202/234/2 -f 202/234/2 211/243/11 212/244/12 203/235/118 -f 203/110/118 212/119/12 213/245/13 205/237/5 -f 205/237/5 213/245/13 214/246/14 207/239/7 -f 207/239/7 214/246/14 215/247/15 209/241/120 -f 209/241/120 215/247/15 211/243/11 202/234/2 -f 211/243/11 216/248/16 217/249/108 212/244/12 -f 212/119/12 217/124/108 218/250/18 213/245/13 -f 213/245/13 218/250/18 219/251/19 214/246/14 -f 214/246/14 219/251/19 220/252/107 215/247/15 -f 215/247/15 220/252/107 216/248/16 211/243/11 -f 216/248/16 221/185/21 222/187/22 217/249/108 -f 217/124/108 222/88/22 223/178/23 218/250/18 -f 218/250/18 223/178/23 224/181/24 219/251/19 -f 219/251/19 224/181/24 225/183/25 220/252/107 -f 220/252/107 225/183/25 221/185/21 216/248/16 -f 221/253/21 226/254/26 227/255/106 222/256/22 -f 222/131/22 227/130/106 228/257/122 223/258/23 -f 223/258/23 228/257/122 229/259/29 224/260/24 -f 224/260/24 229/259/29 230/261/104 225/262/25 -f 225/262/25 230/261/104 226/254/26 221/253/21 -f 226/254/26 231/263/31 232/264/32 227/255/106 -f 227/130/106 232/139/32 233/265/33 228/257/122 -f 228/257/122 233/265/33 234/266/34 229/259/29 -f 229/259/29 234/266/34 235/267/123 230/261/104 -f 230/261/104 235/267/123 231/263/31 226/254/26 -f 231/263/31 236/268/36 237/269/37 232/264/32 -f 232/139/32 237/144/37 238/270/124 233/265/33 -f 233/265/33 238/270/124 239/271/125 234/266/34 -f 234/266/34 239/271/125 240/272/40 235/267/123 -f 235/267/123 240/272/40 236/268/36 231/263/31 -f 236/268/36 201/233/1 204/236/119 237/269/37 -f 237/144/37 204/111/119 206/238/6 238/270/124 -f 238/270/124 206/238/6 208/240/8 239/271/125 -f 239/271/125 208/240/8 210/242/121 240/272/40 -f 201/233/1 236/268/36 240/272/40 210/242/121 diff --git a/chains/models/chains_chandelier.obj b/chains/models/chains_chandelier.obj deleted file mode 100644 index 83c609d..0000000 --- a/chains/models/chains_chandelier.obj +++ /dev/null @@ -1,1621 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'chandelier.blend' -# www.blender.org -o Cylinder_Cylinder_candle -v -0.295811 0.120775 -0.377471 -v -0.295811 -0.066725 -0.377471 -v -0.295811 0.120775 -0.329636 -v -0.295811 -0.066725 -0.329636 -v -0.329636 0.120775 -0.295811 -v -0.329636 -0.066725 -0.295811 -v -0.377471 0.120775 -0.295811 -v -0.377471 -0.066725 -0.295811 -v -0.411296 0.120775 -0.329636 -v -0.411296 -0.066725 -0.329636 -v -0.411296 0.120775 -0.377471 -v -0.411296 -0.066725 -0.377471 -v -0.377471 0.120775 -0.411296 -v -0.377470 -0.066725 -0.411296 -v -0.329636 0.120775 -0.411296 -v -0.329636 -0.066725 -0.411296 -v -0.300709 0.120777 -0.300709 -v -0.300709 0.314857 -0.300709 -v -0.406398 0.314857 -0.406398 -v -0.406398 0.120777 -0.406398 -v -0.406398 0.120777 -0.300709 -v -0.406398 0.314857 -0.300709 -v -0.300709 0.314857 -0.406398 -v -0.300709 0.120777 -0.406398 -v -0.300709 0.120777 -0.300709 -v -0.406398 0.120777 -0.406398 -v -0.406398 0.314857 -0.406398 -v -0.300709 0.314857 -0.300709 -v -0.406398 0.120777 -0.300709 -v -0.300709 0.120777 -0.406398 -v -0.300709 0.314857 -0.406398 -v -0.406398 0.314857 -0.300709 -v 0.383845 -0.242188 0.383845 -v 0.368699 -0.205088 0.368699 -v 0.338408 -0.205088 0.338408 -v 0.323262 -0.242188 0.323262 -v 0.338408 -0.279287 0.338408 -v 0.368699 -0.279287 0.368699 -v 0.501517 -0.242188 0.207735 -v 0.481728 -0.205088 0.199539 -v 0.442151 -0.205088 0.183145 -v 0.422362 -0.242188 0.174948 -v 0.442151 -0.279287 0.183145 -v 0.481728 -0.279287 0.199539 -v 0.542838 -0.242188 0.000000 -v 0.521419 -0.205088 0.000000 -v 0.478581 -0.205088 0.000000 -v 0.457162 -0.242188 0.000000 -v 0.478581 -0.279287 0.000000 -v 0.521419 -0.279287 0.000000 -v 0.501517 -0.242188 -0.207735 -v 0.481729 -0.205088 -0.199538 -v 0.442151 -0.205088 -0.183145 -v 0.422362 -0.242188 -0.174948 -v 0.442151 -0.279287 -0.183145 -v 0.481729 -0.279287 -0.199538 -v 0.383845 -0.242188 -0.383845 -v 0.368699 -0.205088 -0.368699 -v 0.338408 -0.205088 -0.338408 -v 0.323262 -0.242188 -0.323262 -v 0.338408 -0.279287 -0.338408 -v 0.368699 -0.279287 -0.368699 -v 0.207735 -0.242188 -0.501517 -v 0.199538 -0.205088 -0.481728 -v 0.183145 -0.205088 -0.442151 -v 0.174948 -0.242188 -0.422362 -v 0.183145 -0.279287 -0.442151 -v 0.199538 -0.279287 -0.481728 -v -0.000000 -0.242188 -0.542838 -v -0.000000 -0.205088 -0.521419 -v -0.000000 -0.205088 -0.478581 -v -0.000000 -0.242188 -0.457162 -v -0.000000 -0.279287 -0.478581 -v -0.000000 -0.279287 -0.521419 -v -0.207735 -0.242188 -0.501517 -v -0.199538 -0.205088 -0.481728 -v -0.183145 -0.205088 -0.442151 -v -0.174948 -0.242188 -0.422362 -v -0.183145 -0.279287 -0.442151 -v -0.199538 -0.279287 -0.481728 -v -0.383845 -0.242188 -0.383845 -v -0.368699 -0.205088 -0.368699 -v -0.338408 -0.205088 -0.338408 -v -0.323262 -0.242188 -0.323262 -v -0.338408 -0.279287 -0.338408 -v -0.368699 -0.279287 -0.368699 -v -0.501517 -0.242188 -0.207735 -v -0.481728 -0.205088 -0.199539 -v -0.442151 -0.205088 -0.183145 -v -0.422362 -0.242188 -0.174948 -v -0.442151 -0.279287 -0.183145 -v -0.481728 -0.279287 -0.199539 -v -0.542838 -0.242188 -0.000000 -v -0.521419 -0.205088 -0.000000 -v -0.478581 -0.205088 -0.000000 -v -0.457162 -0.242188 -0.000000 -v -0.478581 -0.279287 -0.000000 -v -0.521419 -0.279287 -0.000000 -v -0.501517 -0.242188 0.207735 -v -0.481729 -0.205088 0.199538 -v -0.442151 -0.205088 0.183145 -v -0.422362 -0.242188 0.174948 -v -0.442151 -0.279287 0.183145 -v -0.481729 -0.279287 0.199538 -v -0.383845 -0.242188 0.383845 -v -0.368699 -0.205088 0.368699 -v -0.338408 -0.205088 0.338408 -v -0.323262 -0.242188 0.323262 -v -0.338408 -0.279287 0.338408 -v -0.368699 -0.279287 0.368699 -v -0.207735 -0.242188 0.501517 -v -0.199538 -0.205088 0.481729 -v -0.183145 -0.205088 0.442151 -v -0.174948 -0.242188 0.422362 -v -0.183145 -0.279287 0.442151 -v -0.199538 -0.279287 0.481729 -v -0.000000 -0.242188 0.542838 -v -0.000000 -0.205088 0.521419 -v -0.000000 -0.205088 0.478581 -v -0.000000 -0.242188 0.457162 -v -0.000000 -0.279287 0.478581 -v -0.000000 -0.279287 0.521419 -v 0.207735 -0.242188 0.501517 -v 0.199538 -0.205088 0.481729 -v 0.183145 -0.205088 0.442151 -v 0.174948 -0.242188 0.422362 -v 0.183145 -0.279287 0.442151 -v 0.199538 -0.279287 0.481729 -v 0.000000 0.354683 0.080195 -v -0.014044 0.354683 0.069112 -v -0.009826 0.354683 0.057941 -v 0.009826 0.354683 0.057941 -v 0.014044 0.354683 0.069112 -v 0.000000 0.439455 0.055211 -v -0.014044 0.430321 0.048870 -v -0.009826 0.418094 0.040970 -v 0.009826 0.418094 0.040970 -v 0.014044 0.430321 0.048870 -v 0.000000 0.468325 0.000002 -v -0.014044 0.461651 0.000002 -v -0.009826 0.444361 0.000002 -v 0.009826 0.444361 0.000002 -v 0.014044 0.461651 0.000002 -v 0.000000 0.439455 -0.055206 -v -0.014044 0.430321 -0.048868 -v -0.009826 0.418094 -0.040967 -v 0.009826 0.418094 -0.040967 -v 0.014044 0.430321 -0.048868 -v 0.000000 0.354683 -0.080190 -v -0.014044 0.354683 -0.069108 -v -0.009826 0.354683 -0.057936 -v 0.009826 0.354683 -0.057936 -v 0.014044 0.354683 -0.069108 -v 0.021213 -0.492188 -0.021213 -v 0.057910 0.355469 -0.057910 -v 0.030000 -0.492188 -0.000000 -v 0.081897 0.355469 -0.000000 -v 0.021213 -0.492188 0.021213 -v 0.057910 0.355469 0.057910 -v -0.000000 -0.492188 0.030000 -v -0.000000 0.355469 0.081897 -v -0.021213 -0.492188 0.021213 -v -0.057910 0.355469 0.057910 -v -0.030000 -0.492188 -0.000000 -v -0.081897 0.355469 -0.000000 -v -0.021213 -0.492188 -0.021213 -v -0.057910 0.355469 -0.057910 -v 0.000000 -0.492188 -0.030000 -v 0.000000 0.355469 -0.081897 -v 0.021213 0.248535 -0.021213 -v 0.000000 0.248535 -0.030000 -v -0.021213 0.248535 -0.021213 -v -0.030000 0.248535 -0.000000 -v -0.021213 0.248535 0.021213 -v -0.000000 0.248535 0.030000 -v 0.021213 0.248535 0.021213 -v 0.030000 0.248535 -0.000000 -v 0.063770 0.337158 -0.063770 -v 0.000000 0.337158 -0.090184 -v -0.063770 0.337158 -0.063770 -v -0.090184 0.337158 -0.000000 -v -0.063770 0.337158 0.063770 -v -0.000000 0.337158 0.090184 -v 0.063770 0.337158 0.063770 -v 0.090184 0.337158 -0.000000 -v -0.142765 -0.489924 -0.142764 -v -0.158080 -0.477606 -0.127449 -v -0.158080 -0.452969 -0.127449 -v -0.142765 -0.440650 -0.142764 -v -0.127449 -0.452969 -0.158080 -v -0.127449 -0.477606 -0.158080 -v -0.372981 -0.265266 -0.372980 -v -0.380054 -0.265266 -0.348286 -v -0.362433 -0.265266 -0.330665 -v -0.337738 -0.265266 -0.337738 -v -0.330665 -0.265266 -0.362432 -v -0.348286 -0.265266 -0.380054 -v -0.348363 -0.353916 -0.348362 -v -0.355819 -0.349148 -0.325231 -v -0.340144 -0.339611 -0.309556 -v -0.317013 -0.334843 -0.317012 -v -0.309556 -0.339611 -0.340143 -v -0.325232 -0.349148 -0.355818 -v -0.291164 -0.429409 -0.291164 -v -0.300968 -0.420598 -0.270366 -v -0.289974 -0.402977 -0.259372 -v -0.269176 -0.394166 -0.269176 -v -0.259372 -0.402977 -0.289974 -v -0.270366 -0.420598 -0.300968 -v -0.220433 -0.474407 -0.220433 -v -0.233205 -0.462895 -0.202396 -v -0.227941 -0.439872 -0.197132 -v -0.209904 -0.428360 -0.209904 -v -0.197132 -0.439872 -0.227941 -v -0.202396 -0.462895 -0.233205 -v -0.010263 -0.490208 -0.010263 -v -0.025524 -0.477748 0.004998 -v -0.025524 -0.452827 0.004998 -v -0.010263 -0.440367 -0.010263 -v 0.004997 -0.452827 -0.025524 -v 0.004997 -0.477748 -0.025524 -v 0.000000 -0.500000 -0.000000 -v -0.332137 -0.135637 -0.344683 -v -0.332137 -0.135637 -0.362424 -v -0.332137 -0.209329 -0.362424 -v -0.285471 -0.061946 -0.381754 -v -0.332137 -0.209329 -0.344683 -v -0.285471 -0.061946 -0.325353 -v -0.344682 -0.209329 -0.332137 -v -0.325353 -0.061946 -0.285472 -v -0.362424 -0.209329 -0.332137 -v -0.381754 -0.061946 -0.285472 -v -0.374969 -0.209329 -0.344683 -v -0.421635 -0.061946 -0.325353 -v -0.374969 -0.209329 -0.362424 -v -0.421635 -0.061946 -0.381754 -v -0.362424 -0.209329 -0.374970 -v -0.381754 -0.061946 -0.421635 -v -0.344682 -0.209329 -0.374970 -v -0.325353 -0.061946 -0.421635 -v -0.344682 -0.135637 -0.332137 -v -0.362424 -0.135637 -0.332137 -v -0.374969 -0.135637 -0.344683 -v -0.374969 -0.135637 -0.362424 -v -0.362424 -0.135637 -0.374970 -v -0.344682 -0.135637 -0.374970 -v -0.328258 -0.098792 -0.414622 -v -0.378849 -0.098792 -0.414622 -v -0.292484 -0.098792 -0.378849 -v -0.332137 -0.172483 -0.344683 -v -0.414622 -0.098792 -0.378849 -v -0.344682 -0.172483 -0.332137 -v -0.414622 -0.098792 -0.328258 -v -0.362424 -0.172483 -0.332137 -v -0.378849 -0.098792 -0.292484 -v -0.374969 -0.172483 -0.344683 -v -0.328258 -0.098792 -0.292484 -v -0.374969 -0.172483 -0.362424 -v -0.292484 -0.098792 -0.328258 -v -0.362424 -0.172483 -0.374970 -v -0.332137 -0.172483 -0.362424 -v -0.344682 -0.172483 -0.374970 -v 0.377471 0.120775 -0.295811 -v 0.377471 -0.066725 -0.295811 -v 0.329636 0.120775 -0.295811 -v 0.329636 -0.066725 -0.295811 -v 0.295811 0.120775 -0.329636 -v 0.295811 -0.066725 -0.329636 -v 0.295811 0.120775 -0.377471 -v 0.295811 -0.066725 -0.377471 -v 0.329636 0.120775 -0.411296 -v 0.329636 -0.066725 -0.411296 -v 0.377471 0.120775 -0.411296 -v 0.377471 -0.066725 -0.411296 -v 0.411296 0.120775 -0.377471 -v 0.411296 -0.066725 -0.377471 -v 0.411296 0.120775 -0.329636 -v 0.411296 -0.066725 -0.329636 -v 0.300709 0.120777 -0.300709 -v 0.300709 0.314857 -0.300709 -v 0.406398 0.314857 -0.406398 -v 0.406398 0.120777 -0.406398 -v 0.300709 0.120777 -0.406398 -v 0.300709 0.314857 -0.406398 -v 0.406398 0.314857 -0.300709 -v 0.406398 0.120777 -0.300709 -v 0.300709 0.120777 -0.300709 -v 0.406398 0.120777 -0.406398 -v 0.406398 0.314857 -0.406398 -v 0.300709 0.314857 -0.300709 -v 0.300709 0.120777 -0.406398 -v 0.406398 0.120777 -0.300709 -v 0.406398 0.314857 -0.300709 -v 0.300709 0.314857 -0.406398 -v 0.142764 -0.489924 -0.142765 -v 0.127448 -0.477606 -0.158080 -v 0.127448 -0.452969 -0.158080 -v 0.142764 -0.440650 -0.142765 -v 0.158080 -0.452969 -0.127449 -v 0.158080 -0.477606 -0.127449 -v 0.372980 -0.265266 -0.372981 -v 0.348286 -0.265266 -0.380054 -v 0.330665 -0.265266 -0.362433 -v 0.337738 -0.265266 -0.337738 -v 0.362432 -0.265266 -0.330665 -v 0.380054 -0.265266 -0.348286 -v 0.348362 -0.353916 -0.348363 -v 0.325231 -0.349148 -0.355819 -v 0.309556 -0.339611 -0.340144 -v 0.317012 -0.334843 -0.317013 -v 0.340143 -0.339611 -0.309556 -v 0.355818 -0.349148 -0.325232 -v 0.291164 -0.429409 -0.291164 -v 0.270366 -0.420598 -0.300968 -v 0.259372 -0.402977 -0.289974 -v 0.269176 -0.394166 -0.269176 -v 0.289974 -0.402977 -0.259372 -v 0.300968 -0.420598 -0.270366 -v 0.220433 -0.474407 -0.220433 -v 0.202396 -0.462895 -0.233205 -v 0.197132 -0.439872 -0.227941 -v 0.209904 -0.428360 -0.209904 -v 0.227941 -0.439872 -0.197132 -v 0.233205 -0.462895 -0.202396 -v 0.010263 -0.490208 -0.010263 -v -0.004998 -0.477748 -0.025524 -v -0.004998 -0.452827 -0.025524 -v 0.010263 -0.440367 -0.010263 -v 0.025524 -0.452827 0.004997 -v 0.025524 -0.477748 0.004997 -v 0.344683 -0.135637 -0.332137 -v 0.362424 -0.135637 -0.332137 -v 0.362424 -0.209329 -0.332137 -v 0.381754 -0.061946 -0.285471 -v 0.344683 -0.209329 -0.332137 -v 0.325353 -0.061946 -0.285471 -v 0.332137 -0.209329 -0.344683 -v 0.285472 -0.061946 -0.325353 -v 0.332137 -0.209329 -0.362424 -v 0.285472 -0.061946 -0.381754 -v 0.344683 -0.209329 -0.374969 -v 0.325353 -0.061946 -0.421635 -v 0.362424 -0.209329 -0.374969 -v 0.381754 -0.061946 -0.421635 -v 0.374970 -0.209329 -0.362424 -v 0.421635 -0.061946 -0.381754 -v 0.374970 -0.209329 -0.344683 -v 0.421635 -0.061946 -0.325353 -v 0.332137 -0.135637 -0.344683 -v 0.332137 -0.135637 -0.362424 -v 0.344683 -0.135637 -0.374969 -v 0.362424 -0.135637 -0.374969 -v 0.374970 -0.135637 -0.362424 -v 0.374970 -0.135637 -0.344683 -v 0.414623 -0.098792 -0.328258 -v 0.414622 -0.098792 -0.378849 -v 0.378849 -0.098792 -0.292484 -v 0.344683 -0.172483 -0.332137 -v 0.378849 -0.098792 -0.414622 -v 0.332137 -0.172483 -0.344683 -v 0.328258 -0.098792 -0.414622 -v 0.332137 -0.172483 -0.362424 -v 0.292484 -0.098792 -0.378849 -v 0.344683 -0.172483 -0.374969 -v 0.292484 -0.098792 -0.328258 -v 0.362424 -0.172483 -0.374969 -v 0.328258 -0.098792 -0.292484 -v 0.374970 -0.172483 -0.362424 -v 0.362424 -0.172483 -0.332137 -v 0.374970 -0.172483 -0.344683 -v 0.295811 0.120775 0.377471 -v 0.295811 -0.066725 0.377471 -v 0.295811 0.120775 0.329636 -v 0.295811 -0.066725 0.329636 -v 0.329636 0.120775 0.295811 -v 0.329636 -0.066725 0.295811 -v 0.377471 0.120775 0.295811 -v 0.377471 -0.066725 0.295811 -v 0.411296 0.120775 0.329636 -v 0.411296 -0.066725 0.329636 -v 0.411296 0.120775 0.377471 -v 0.411296 -0.066725 0.377471 -v 0.377471 0.120775 0.411296 -v 0.377471 -0.066725 0.411296 -v 0.329636 0.120775 0.411296 -v 0.329636 -0.066725 0.411296 -v 0.300709 0.120776 0.300709 -v 0.300709 0.314857 0.300709 -v 0.406398 0.314857 0.406398 -v 0.406398 0.120776 0.406398 -v 0.406398 0.120776 0.300709 -v 0.406398 0.314857 0.300709 -v 0.300709 0.314857 0.406398 -v 0.300709 0.120776 0.406398 -v 0.300709 0.120776 0.300709 -v 0.406398 0.120776 0.406398 -v 0.406398 0.314857 0.406398 -v 0.300709 0.314857 0.300709 -v 0.406398 0.120776 0.300709 -v 0.300709 0.120776 0.406398 -v 0.300709 0.314857 0.406398 -v 0.406398 0.314857 0.300709 -v 0.142765 -0.489924 0.142764 -v 0.158080 -0.477606 0.127448 -v 0.158080 -0.452969 0.127449 -v 0.142765 -0.440650 0.142764 -v 0.127449 -0.452969 0.158080 -v 0.127449 -0.477606 0.158080 -v 0.372981 -0.265266 0.372980 -v 0.380054 -0.265266 0.348286 -v 0.362433 -0.265266 0.330665 -v 0.337738 -0.265266 0.337738 -v 0.330665 -0.265266 0.362432 -v 0.348286 -0.265266 0.380054 -v 0.348363 -0.353916 0.348362 -v 0.355819 -0.349148 0.325231 -v 0.340144 -0.339611 0.309556 -v 0.317013 -0.334843 0.317012 -v 0.309556 -0.339611 0.340143 -v 0.325232 -0.349148 0.355818 -v 0.291164 -0.429409 0.291164 -v 0.300968 -0.420598 0.270366 -v 0.289974 -0.402977 0.259372 -v 0.269176 -0.394166 0.269176 -v 0.259372 -0.402977 0.289974 -v 0.270366 -0.420598 0.300968 -v 0.220433 -0.474407 0.220433 -v 0.233205 -0.462895 0.202396 -v 0.227941 -0.439872 0.197132 -v 0.209904 -0.428360 0.209904 -v 0.197132 -0.439872 0.227941 -v 0.202396 -0.462895 0.233205 -v 0.010263 -0.490208 0.010263 -v 0.025524 -0.477748 -0.004998 -v 0.025524 -0.452827 -0.004998 -v 0.010263 -0.440367 0.010263 -v -0.004997 -0.452827 0.025524 -v -0.004997 -0.477748 0.025524 -v 0.332137 -0.135637 0.344683 -v 0.332137 -0.135637 0.362424 -v 0.332137 -0.209329 0.362424 -v 0.285472 -0.061946 0.381754 -v 0.332137 -0.209329 0.344683 -v 0.285471 -0.061946 0.325353 -v 0.344683 -0.209329 0.332137 -v 0.325353 -0.061946 0.285472 -v 0.362424 -0.209329 0.332137 -v 0.381754 -0.061946 0.285472 -v 0.374969 -0.209329 0.344683 -v 0.421635 -0.061946 0.325353 -v 0.374970 -0.209329 0.362424 -v 0.421635 -0.061946 0.381754 -v 0.362424 -0.209329 0.374970 -v 0.381754 -0.061946 0.421635 -v 0.344683 -0.209329 0.374970 -v 0.325353 -0.061946 0.421635 -v 0.344683 -0.135637 0.332137 -v 0.362424 -0.135637 0.332137 -v 0.374969 -0.135637 0.344683 -v 0.374970 -0.135637 0.362424 -v 0.362424 -0.135637 0.374970 -v 0.344683 -0.135637 0.374970 -v 0.328258 -0.098792 0.414622 -v 0.378849 -0.098792 0.414622 -v 0.292484 -0.098792 0.378849 -v 0.332137 -0.172483 0.344683 -v 0.414622 -0.098792 0.378849 -v 0.344683 -0.172483 0.332137 -v 0.414622 -0.098792 0.328258 -v 0.362424 -0.172483 0.332137 -v 0.378849 -0.098792 0.292484 -v 0.374969 -0.172483 0.344683 -v 0.328258 -0.098792 0.292484 -v 0.374970 -0.172483 0.362424 -v 0.292484 -0.098792 0.328258 -v 0.362424 -0.172483 0.374970 -v 0.332137 -0.172483 0.362424 -v 0.344683 -0.172483 0.374970 -v -0.377471 0.120775 0.295811 -v -0.377471 -0.066725 0.295811 -v -0.329636 0.120775 0.295811 -v -0.329636 -0.066725 0.295811 -v -0.295811 0.120775 0.329636 -v -0.295811 -0.066725 0.329636 -v -0.295811 0.120775 0.377471 -v -0.295811 -0.066725 0.377471 -v -0.329636 0.120775 0.411296 -v -0.329636 -0.066725 0.411296 -v -0.377470 0.120775 0.411296 -v -0.377471 -0.066725 0.411296 -v -0.411296 0.120775 0.377471 -v -0.411296 -0.066725 0.377471 -v -0.411296 0.120775 0.329636 -v -0.411296 -0.066725 0.329636 -v -0.300709 0.120777 0.300709 -v -0.300709 0.314857 0.300709 -v -0.406398 0.314857 0.406398 -v -0.406398 0.120777 0.406398 -v -0.300709 0.120777 0.406398 -v -0.300709 0.314857 0.406398 -v -0.406398 0.314857 0.300709 -v -0.406398 0.120777 0.300709 -v -0.300709 0.120777 0.300709 -v -0.406398 0.120777 0.406398 -v -0.406398 0.314857 0.406398 -v -0.300709 0.314857 0.300709 -v -0.300709 0.120777 0.406398 -v -0.406398 0.120777 0.300709 -v -0.406398 0.314857 0.300709 -v -0.300709 0.314857 0.406398 -v -0.142764 -0.489924 0.142765 -v -0.127448 -0.477606 0.158080 -v -0.127448 -0.452969 0.158080 -v -0.142764 -0.440650 0.142765 -v -0.158080 -0.452969 0.127449 -v -0.158080 -0.477606 0.127449 -v -0.372980 -0.265266 0.372981 -v -0.348286 -0.265266 0.380054 -v -0.330665 -0.265266 0.362433 -v -0.337738 -0.265266 0.337738 -v -0.362432 -0.265266 0.330665 -v -0.380054 -0.265266 0.348286 -v -0.348362 -0.353916 0.348363 -v -0.325231 -0.349148 0.355819 -v -0.309556 -0.339611 0.340144 -v -0.317012 -0.334843 0.317013 -v -0.340143 -0.339611 0.309557 -v -0.355818 -0.349148 0.325232 -v -0.291164 -0.429409 0.291165 -v -0.270366 -0.420598 0.300968 -v -0.259372 -0.402977 0.289974 -v -0.269176 -0.394166 0.269176 -v -0.289974 -0.402977 0.259372 -v -0.300968 -0.420598 0.270366 -v -0.220433 -0.474407 0.220433 -v -0.202396 -0.462895 0.233205 -v -0.197132 -0.439872 0.227941 -v -0.209904 -0.428360 0.209904 -v -0.227941 -0.439872 0.197132 -v -0.233205 -0.462895 0.202396 -v -0.010263 -0.490208 0.010263 -v 0.004998 -0.477748 0.025524 -v 0.004998 -0.452827 0.025524 -v -0.010263 -0.440367 0.010263 -v -0.025524 -0.452827 -0.004997 -v -0.025524 -0.477748 -0.004997 -v -0.344683 -0.135637 0.332137 -v -0.362424 -0.135637 0.332137 -v -0.362424 -0.209329 0.332137 -v -0.381754 -0.061946 0.285472 -v -0.344683 -0.209329 0.332137 -v -0.325353 -0.061946 0.285472 -v -0.332137 -0.209329 0.344683 -v -0.285472 -0.061946 0.325353 -v -0.332137 -0.209329 0.362424 -v -0.285472 -0.061946 0.381754 -v -0.344683 -0.209329 0.374970 -v -0.325353 -0.061946 0.421635 -v -0.362424 -0.209329 0.374970 -v -0.381754 -0.061946 0.421635 -v -0.374970 -0.209329 0.362424 -v -0.421635 -0.061946 0.381754 -v -0.374969 -0.209329 0.344683 -v -0.421635 -0.061946 0.325353 -v -0.332137 -0.135637 0.344683 -v -0.332137 -0.135637 0.362424 -v -0.344682 -0.135637 0.374970 -v -0.362424 -0.135637 0.374970 -v -0.374970 -0.135637 0.362424 -v -0.374970 -0.135637 0.344683 -v -0.414622 -0.098792 0.328258 -v -0.414622 -0.098792 0.378849 -v -0.378849 -0.098792 0.292484 -v -0.344683 -0.172483 0.332137 -v -0.378849 -0.098792 0.414622 -v -0.332137 -0.172483 0.344683 -v -0.328258 -0.098792 0.414622 -v -0.332137 -0.172483 0.362424 -v -0.292484 -0.098792 0.378849 -v -0.344683 -0.172483 0.374970 -v -0.292484 -0.098792 0.328258 -v -0.362424 -0.172483 0.374970 -v -0.328258 -0.098792 0.292484 -v -0.374970 -0.172483 0.362424 -v -0.362424 -0.172483 0.332137 -v -0.374970 -0.172483 0.344683 -vt 0.687500 0.812500 -vt 0.750000 0.812500 -vt 0.750000 0.875000 -vt 0.687500 0.875000 -vt 0.750000 0.937500 -vt 0.687500 0.937500 -vt 0.750000 1.000000 -vt 0.687500 1.000000 -vt 0.687500 0.625000 -vt 0.750000 0.625000 -vt 0.750000 0.687500 -vt 0.687500 0.687500 -vt 0.750000 0.750000 -vt 0.687500 0.750000 -vt 0.812500 0.812500 -vt 0.812500 0.875000 -vt 0.812500 0.937500 -vt 0.812500 1.000000 -vt 0.812500 0.625000 -vt 0.812500 0.687500 -vt 0.812500 0.750000 -vt 0.875000 0.812500 -vt 0.875000 0.875000 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.875000 0.625000 -vt 0.875000 0.687500 -vt 0.875000 0.750000 -vt 0.937500 0.812500 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.937500 1.000000 -vt 0.937500 0.625000 -vt 0.937500 0.687500 -vt 0.937500 0.750000 -vt 1.000000 0.812500 -vt 1.000000 0.875000 -vt 1.000000 0.937500 -vt 1.000000 1.000000 -vt 1.000000 0.625000 -vt 1.000000 0.687500 -vt 1.000000 0.750000 -vt 0.000000 0.812500 -vt 0.062500 0.812500 -vt 0.062500 0.875000 -vt 0.000000 0.875000 -vt 0.062500 0.937500 -vt 0.000000 0.937500 -vt 0.062500 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.625000 -vt 0.062500 0.625000 -vt 0.062500 0.687500 -vt 0.000000 0.687500 -vt 0.062500 0.750000 -vt 0.000000 0.750000 -vt 0.125000 0.812500 -vt 0.125000 0.875000 -vt 0.125000 0.937500 -vt 0.125000 1.000000 -vt 0.125000 0.625000 -vt 0.125000 0.687500 -vt 0.125000 0.750000 -vt 0.187500 0.812500 -vt 0.187500 0.875000 -vt 0.187500 0.937500 -vt 0.187500 1.000000 -vt 0.187500 0.625000 -vt 0.187500 0.687500 -vt 0.187500 0.750000 -vt 0.250000 0.812500 -vt 0.250000 0.875000 -vt 0.250000 0.937500 -vt 0.250000 1.000000 -vt 0.250000 0.625000 -vt 0.250000 0.687500 -vt 0.250000 0.750000 -vt 0.312500 0.812500 -vt 0.312500 0.875000 -vt 0.312500 0.937500 -vt 0.312500 1.000000 -vt 0.312500 0.625000 -vt 0.312500 0.687500 -vt 0.312500 0.750000 -vt 0.375000 0.812500 -vt 0.375000 0.875000 -vt 0.375000 0.937500 -vt 0.375000 1.000000 -vt 0.375000 0.625000 -vt 0.375000 0.687500 -vt 0.375000 0.750000 -vt 0.437500 0.812500 -vt 0.437500 0.875000 -vt 0.437500 0.937500 -vt 0.437500 1.000000 -vt 0.437500 0.625000 -vt 0.437500 0.687500 -vt 0.437500 0.750000 -vt 0.500000 0.812500 -vt 0.500000 0.875000 -vt 0.500000 0.937500 -vt 0.500000 1.000000 -vt 0.500000 0.625000 -vt 0.500000 0.687500 -vt 0.500000 0.750000 -vt 0.562500 0.812500 -vt 0.562500 0.875000 -vt 0.562500 0.937500 -vt 0.562500 1.000000 -vt 0.562500 0.625000 -vt 0.562500 0.687500 -vt 0.562500 0.750000 -vt 0.625000 0.812500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.625000 1.000000 -vt 0.625000 0.625000 -vt 0.625000 0.687500 -vt 0.625000 0.750000 -vt 0.750000 0.500000 -vt 0.812500 0.500000 -vt 0.812500 0.562500 -vt 0.750000 0.562500 -vt 0.750000 0.312500 -vt 0.812500 0.312500 -vt 0.812500 0.375000 -vt 0.750000 0.375000 -vt 0.812500 0.437500 -vt 0.750000 0.437500 -vt 0.875000 0.500000 -vt 0.875000 0.562500 -vt 0.875000 0.312500 -vt 0.875000 0.375000 -vt 0.875000 0.437500 -vt 0.937500 0.500000 -vt 0.937500 0.562500 -vt 0.937500 0.312500 -vt 0.937500 0.375000 -vt 0.937500 0.437500 -vt 1.000000 0.500000 -vt 1.000000 0.562500 -vt 1.000000 0.312500 -vt 1.000000 0.375000 -vt 1.000000 0.437500 -vt 0.750000 0.062500 -vt 0.687500 0.062500 -vt 0.625000 0.062500 -vt 0.562500 0.062500 -vt 0.812500 0.062500 -vt 1.000000 0.062500 -vt 0.937500 0.062500 -vt 0.433478 0.933478 -vt 0.375000 0.957700 -vt 0.316522 0.933478 -vt 0.292299 0.875000 -vt 0.316522 0.816522 -vt 0.375000 0.792300 -vt 0.433478 0.816522 -vt 0.457700 0.875000 -vt 0.875000 0.062500 -vt 0.500000 0.062500 -vt 0.250000 0.125000 -vt 0.375000 0.125000 -vt 0.375000 0.187500 -vt 0.250000 0.187500 -vt 0.375000 0.250000 -vt 0.250000 0.250000 -vt 0.375000 0.312500 -vt 0.250000 0.312500 -vt 0.375000 0.375000 -vt 0.250000 0.375000 -vt 0.375000 0.437500 -vt 0.250000 0.437500 -vt 0.375000 0.500000 -vt 0.250000 0.500000 -vt 0.500000 0.125000 -vt 0.500000 0.187500 -vt 0.500000 0.250000 -vt 0.500000 0.312500 -vt 0.500000 0.375000 -vt 0.500000 0.437500 -vt 0.500000 0.500000 -vt 0.625000 0.125000 -vt 0.625000 0.187500 -vt 0.625000 0.250000 -vt 0.625000 0.312500 -vt 0.625000 0.375000 -vt 0.625000 0.437500 -vt 0.625000 0.500000 -vt 0.750000 0.125000 -vt 0.750000 0.187500 -vt 0.750000 0.250000 -vt 1.000000 0.187500 -vt 1.000000 0.250000 -vt 1.000000 0.125000 -vt 0.562500 0.905294 -vt 0.583921 0.896421 -vt 0.592794 0.875000 -vt 0.583921 0.853579 -vt 0.562500 0.844706 -vt 0.541079 0.853579 -vt 0.532206 0.875000 -vt 0.541079 0.896421 -vt 0.250000 0.562500 -vt 0.187500 0.562500 -vt 0.187500 0.500000 -vt 0.187500 0.312500 -vt 0.125000 0.312500 -vt 0.125000 0.250000 -vt 0.187500 0.250000 -vt 0.062500 0.437500 -vt 0.000000 0.437500 -vt 0.000000 0.375000 -vt 0.062500 0.375000 -vt 0.187500 0.437500 -vt 0.187500 0.375000 -vt 0.125000 0.187500 -vt 0.187500 0.187500 -vt 0.000000 0.312500 -vt 0.062500 0.312500 -vt 0.125000 0.500000 -vt 0.062500 0.500000 -vt 0.125000 0.437500 -vt 0.125000 0.125000 -vt 0.187500 0.125000 -vt 0.000000 0.250000 -vt 0.062500 0.250000 -vt 0.125000 0.562500 -vt 0.062500 0.562500 -vt 0.125000 0.062500 -vt 0.187500 0.062500 -vt 0.000000 0.187500 -vt 0.062500 0.187500 -vt 0.000000 0.125000 -vt 0.062500 0.125000 -vt 0.125000 0.375000 -vt 0.000000 0.062500 -vt 0.062500 0.062500 -vt 0.193749 0.903477 -vt 0.153477 0.943749 -vt 0.096523 0.943749 -vt 0.056250 0.903477 -vt 0.056250 0.846523 -vt 0.096523 0.806251 -vt 0.153477 0.806251 -vt 0.193749 0.846523 -vt 0.000000 0.500000 -vt 0.000000 0.562500 -vt 0.250000 0.062500 -vt 0.875000 0.250000 -vt 0.454164 0.776526 -vt 0.476190 0.785650 -vt 0.498216 0.776526 -vt 0.507340 0.754500 -vt 0.498216 0.732474 -vt 0.476190 0.723350 -vt 0.454164 0.732474 -vt 0.445040 0.754500 -vt 1.000000 -0.000000 -vt -0.000000 -0.000000 -vn 0.707100 0.000000 0.707100 -vn 0.923900 0.000000 0.382700 -vn 0.502500 0.839100 0.208200 -vn 0.384600 0.839100 0.384600 -vn -0.416000 0.892900 -0.172300 -vn -0.318400 0.892900 -0.318400 -vn -0.923900 0.000000 -0.382700 -vn -0.707100 0.000000 -0.707100 -vn -0.416000 -0.892900 -0.172300 -vn -0.318400 -0.892900 -0.318400 -vn 0.502500 -0.839100 0.208200 -vn 0.384600 -0.839100 0.384600 -vn 1.000000 0.000000 0.000000 -vn 0.544000 0.839100 0.000000 -vn -0.450300 0.892900 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.450300 -0.892900 0.000000 -vn 0.544000 -0.839100 0.000000 -vn 0.923900 0.000000 -0.382700 -vn 0.502500 0.839100 -0.208200 -vn -0.416000 0.892900 0.172300 -vn -0.923900 0.000000 0.382700 -vn -0.416000 -0.892900 0.172300 -vn 0.502500 -0.839100 -0.208200 -vn 0.707100 0.000000 -0.707100 -vn 0.384600 0.839100 -0.384600 -vn -0.318400 0.892900 0.318400 -vn -0.707100 0.000000 0.707100 -vn -0.318400 -0.892900 0.318400 -vn 0.384600 -0.839100 -0.384600 -vn 0.382700 0.000000 -0.923900 -vn 0.208200 0.839100 -0.502500 -vn -0.172300 0.892900 0.416000 -vn -0.382700 0.000000 0.923900 -vn -0.172300 -0.892900 0.416000 -vn 0.208200 -0.839100 -0.502500 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.839100 -0.544000 -vn 0.000000 0.892900 0.450300 -vn 0.000000 0.000000 1.000000 -vn 0.000000 -0.892900 0.450300 -vn 0.000000 -0.839100 -0.544000 -vn -0.382700 0.000000 -0.923900 -vn -0.208200 0.839100 -0.502500 -vn 0.172300 0.892900 0.416000 -vn 0.382700 0.000000 0.923900 -vn 0.172300 -0.892900 0.416000 -vn -0.208200 -0.839100 -0.502500 -vn -0.384600 0.839100 -0.384600 -vn 0.318400 0.892900 0.318400 -vn 0.318400 -0.892900 0.318400 -vn -0.384600 -0.839100 -0.384600 -vn -0.502500 0.839100 -0.208200 -vn 0.416000 0.892900 0.172300 -vn 0.416000 -0.892900 0.172300 -vn -0.502500 -0.839100 -0.208200 -vn -0.544000 0.839100 0.000000 -vn 0.450300 0.892900 0.000000 -vn 0.450300 -0.892900 0.000000 -vn -0.544000 -0.839100 0.000000 -vn -0.502500 0.839100 0.208200 -vn 0.416000 0.892900 -0.172300 -vn 0.416000 -0.892900 -0.172300 -vn -0.502500 -0.839100 0.208200 -vn -0.384600 0.839100 0.384600 -vn 0.318400 0.892900 -0.318400 -vn 0.318400 -0.892900 -0.318400 -vn -0.384600 -0.839100 0.384600 -vn -0.208200 0.839100 0.502500 -vn 0.172300 0.892900 -0.416000 -vn 0.172300 -0.892900 -0.416000 -vn -0.208200 -0.839100 0.502500 -vn 0.000000 0.839100 0.544000 -vn 0.000000 0.892900 -0.450300 -vn 0.000000 -0.892900 -0.450300 -vn 0.000000 -0.839100 0.544000 -vn 0.208200 0.839100 0.502500 -vn -0.172300 0.892900 -0.416000 -vn -0.172300 -0.892900 -0.416000 -vn 0.208200 -0.839100 0.502500 -vn 0.000000 0.271400 0.962500 -vn 0.000000 0.657400 0.753500 -vn -0.898300 0.248500 0.362300 -vn -0.919700 0.109100 0.377200 -vn -0.661500 -0.421500 -0.620200 -vn -0.603800 -0.206100 -0.770000 -vn 0.661500 -0.421500 -0.620200 -vn 0.603800 -0.206100 -0.770000 -vn 0.898300 0.248500 0.362300 -vn 0.919700 0.109100 0.377200 -vn 0.000000 1.000000 0.000000 -vn -0.866100 0.499800 0.000000 -vn -0.746000 -0.665900 0.000000 -vn 0.746000 -0.665900 0.000000 -vn 0.866100 0.499800 0.000000 -vn 0.000000 0.657400 -0.753500 -vn -0.898300 0.248500 -0.362400 -vn -0.661500 -0.421500 0.620200 -vn 0.661500 -0.421500 0.620200 -vn 0.898300 0.248500 -0.362400 -vn 0.000000 0.271300 -0.962500 -vn -0.919700 0.109100 -0.377300 -vn -0.603800 -0.206100 0.770000 -vn 0.603800 -0.206100 0.770000 -vn 0.919700 0.109100 -0.377300 -vn 0.705000 -0.077000 -0.705000 -vn 0.441300 0.781300 -0.441300 -vn 0.624100 0.781300 0.000000 -vn 0.997000 -0.077000 0.000000 -vn 0.441300 0.781300 0.441300 -vn 0.705000 -0.077000 0.705000 -vn 0.000000 0.781300 0.624100 -vn 0.000000 -0.077000 0.997000 -vn 0.000000 -0.316200 0.948700 -vn -0.670800 -0.316200 0.670800 -vn -0.591400 -0.548100 0.591400 -vn 0.000000 -0.548100 0.836400 -vn 0.948700 -0.316200 0.000000 -vn 0.670800 -0.316200 0.670800 -vn 0.591400 -0.548100 0.591400 -vn 0.836400 -0.548100 0.000000 -vn -0.441300 0.781300 0.441300 -vn -0.705000 -0.077000 0.705000 -vn -0.948700 -0.316200 0.000000 -vn -0.836400 -0.548100 0.000000 -vn -0.624100 0.781300 0.000000 -vn -0.997000 -0.077000 0.000000 -vn 0.000000 -0.316200 -0.948700 -vn 0.670800 -0.316200 -0.670800 -vn 0.591400 -0.548100 -0.591400 -vn 0.000000 -0.548100 -0.836400 -vn -0.441300 0.781300 -0.441300 -vn -0.705000 -0.077000 -0.705000 -vn 0.000000 0.781300 -0.624100 -vn 0.000000 -0.077000 -0.997000 -vn -0.670800 -0.316200 -0.670800 -vn -0.591400 -0.548100 -0.591400 -vn -0.656900 -0.370100 -0.656900 -vn -0.588500 -0.554300 -0.588500 -vn -0.908700 -0.325900 0.260900 -vn -0.959400 -0.228900 0.164600 -vn -0.365700 0.254800 0.895100 -vn -0.365200 0.154400 0.918000 -vn 0.569700 0.592400 0.569700 -vn 0.653400 0.382100 0.653400 -vn 0.895100 0.254800 -0.365700 -vn 0.918000 0.154400 -0.365200 -vn 0.260900 -0.325900 -0.908700 -vn 0.164600 -0.228900 -0.959400 -vn -0.393900 -0.830400 -0.393900 -vn -0.802900 -0.461100 0.377800 -vn -0.444700 0.398100 0.802300 -vn 0.369900 0.852200 0.369900 -vn 0.802300 0.398100 -0.444700 -vn 0.377800 -0.461100 -0.802900 -vn -0.196100 -0.960800 -0.196100 -vn -0.699900 -0.519500 0.490100 -vn -0.534000 0.459500 0.709600 -vn 0.181700 0.966400 0.181700 -vn 0.709600 0.459500 -0.534000 -vn 0.490100 -0.519500 -0.699900 -vn -0.048400 -0.997600 -0.048400 -vn -0.630000 -0.518800 0.577900 -vn -0.595000 0.486700 0.639600 -vn 0.046900 0.997800 0.046900 -vn 0.639600 0.486700 -0.595000 -vn 0.577900 -0.518800 -0.630000 -vn -0.611900 -0.501600 0.611500 -vn -0.611900 0.501600 0.611500 -vn -0.000700 1.000000 -0.000700 -vn 0.611500 0.501600 -0.611900 -vn -0.000700 -1.000000 -0.000700 -vn 0.611500 -0.501600 -0.611900 -vn 0.000000 -1.000000 0.000000 -vn 0.339400 -0.461800 0.819400 -vn -0.339400 -0.461800 0.819400 -vn 0.812600 -0.475700 -0.336600 -vn 0.770000 0.552600 -0.318900 -vn 0.770000 0.552600 0.318900 -vn 0.812600 -0.475700 0.336600 -vn -0.819400 -0.461800 0.339400 -vn 0.318900 0.552600 0.770000 -vn 0.336600 -0.475700 0.812600 -vn 0.339400 -0.461800 -0.819400 -vn 0.336600 -0.475700 -0.812600 -vn 0.819400 -0.461800 -0.339400 -vn -0.819400 -0.461800 -0.339400 -vn -0.318900 0.552600 0.770000 -vn -0.336600 -0.475700 0.812600 -vn -0.339400 -0.461800 -0.819400 -vn -0.336600 -0.475700 -0.812600 -vn -0.770000 0.552600 0.318900 -vn -0.812600 -0.475700 0.336600 -vn -0.770000 0.552600 -0.318900 -vn -0.812600 -0.475700 -0.336600 -vn 0.819400 -0.461800 0.339400 -vn -0.318900 0.552600 -0.770000 -vn 0.318900 0.552600 -0.770000 -vn 0.656900 -0.370100 -0.656900 -vn 0.588500 -0.554300 -0.588500 -vn -0.260900 -0.325900 -0.908700 -vn -0.164600 -0.228900 -0.959400 -vn -0.895100 0.254800 -0.365700 -vn -0.918000 0.154400 -0.365200 -vn -0.569700 0.592400 0.569700 -vn -0.653400 0.382100 0.653400 -vn 0.365700 0.254800 0.895100 -vn 0.365200 0.154400 0.918000 -vn 0.908700 -0.325900 0.260900 -vn 0.959400 -0.228900 0.164600 -vn 0.393900 -0.830400 -0.393900 -vn -0.377800 -0.461100 -0.802900 -vn -0.802300 0.398100 -0.444700 -vn -0.369900 0.852200 0.369900 -vn 0.444700 0.398100 0.802300 -vn 0.802900 -0.461100 0.377800 -vn 0.196100 -0.960800 -0.196100 -vn -0.490100 -0.519500 -0.699900 -vn -0.709600 0.459500 -0.534000 -vn -0.181700 0.966400 0.181700 -vn 0.534000 0.459500 0.709600 -vn 0.699900 -0.519500 0.490100 -vn 0.048400 -0.997600 -0.048400 -vn -0.577900 -0.518800 -0.630000 -vn -0.639600 0.486700 -0.595000 -vn -0.046900 0.997800 0.046900 -vn 0.595000 0.486700 0.639600 -vn 0.630000 -0.518800 0.577900 -vn -0.611500 -0.501600 -0.611900 -vn -0.611500 0.501600 -0.611900 -vn 0.000700 1.000000 -0.000700 -vn 0.611900 0.501600 0.611500 -vn 0.000700 -1.000000 -0.000700 -vn 0.611900 -0.501600 0.611500 -vn 0.656900 -0.370100 0.656900 -vn 0.588500 -0.554300 0.588500 -vn 0.908700 -0.325900 -0.260900 -vn 0.959400 -0.228900 -0.164600 -vn 0.365700 0.254800 -0.895100 -vn 0.365200 0.154400 -0.918000 -vn -0.569700 0.592400 -0.569700 -vn -0.653400 0.382100 -0.653400 -vn -0.895100 0.254800 0.365700 -vn -0.918000 0.154400 0.365200 -vn -0.260900 -0.325900 0.908700 -vn -0.164600 -0.228900 0.959400 -vn 0.393900 -0.830400 0.393900 -vn 0.802900 -0.461100 -0.377800 -vn 0.444700 0.398100 -0.802300 -vn -0.369900 0.852200 -0.369900 -vn -0.802300 0.398100 0.444700 -vn -0.377800 -0.461100 0.802900 -vn 0.196100 -0.960800 0.196100 -vn 0.699900 -0.519500 -0.490100 -vn 0.534000 0.459500 -0.709600 -vn -0.181700 0.966400 -0.181700 -vn -0.709600 0.459500 0.534000 -vn -0.490100 -0.519500 0.699900 -vn 0.048400 -0.997600 0.048400 -vn 0.630000 -0.518800 -0.577900 -vn 0.595000 0.486700 -0.639600 -vn -0.046900 0.997800 -0.046900 -vn -0.639600 0.486700 0.595000 -vn -0.577900 -0.518800 0.630000 -vn 0.611900 -0.501600 -0.611500 -vn 0.611900 0.501600 -0.611500 -vn 0.000700 1.000000 0.000700 -vn -0.611500 0.501600 0.611900 -vn 0.000700 -1.000000 0.000700 -vn -0.611500 -0.501600 0.611900 -vn -0.656900 -0.370100 0.656900 -vn -0.588500 -0.554300 0.588500 -vn 0.260900 -0.325900 0.908700 -vn 0.164600 -0.228900 0.959400 -vn 0.895100 0.254800 0.365700 -vn 0.918000 0.154400 0.365200 -vn 0.569700 0.592400 -0.569700 -vn 0.653400 0.382100 -0.653400 -vn -0.365700 0.254800 -0.895100 -vn -0.365200 0.154400 -0.918000 -vn -0.908700 -0.325900 -0.260800 -vn -0.959400 -0.228900 -0.164600 -vn -0.393900 -0.830400 0.393900 -vn 0.377800 -0.461100 0.802900 -vn 0.802300 0.398100 0.444700 -vn 0.369900 0.852200 -0.369900 -vn -0.444700 0.398100 -0.802300 -vn -0.802900 -0.461100 -0.377800 -vn -0.196100 -0.960800 0.196100 -vn 0.490100 -0.519500 0.699900 -vn 0.709600 0.459500 0.534000 -vn 0.181700 0.966400 -0.181700 -vn -0.534000 0.459500 -0.709600 -vn -0.699900 -0.519500 -0.490100 -vn -0.048400 -0.997600 0.048400 -vn 0.577900 -0.518800 0.630000 -vn 0.639600 0.486700 0.595000 -vn 0.046900 0.997800 -0.046900 -vn -0.595000 0.486700 -0.639600 -vn -0.630000 -0.518800 -0.577900 -vn 0.611500 -0.501600 0.611900 -vn 0.611500 0.501600 0.611900 -vn -0.000700 1.000000 0.000700 -vn -0.611900 0.501600 -0.611500 -vn -0.000700 -1.000000 0.000700 -vn -0.611900 -0.501600 -0.611500 -vn -0.297100 0.630200 -0.717300 -vn 0.297100 0.630200 -0.717300 -vn -0.717300 0.630200 0.297100 -vn -0.297100 0.630200 0.717300 -vn -0.717300 0.630200 -0.297100 -vn 0.717300 0.630200 0.297100 -vn 0.717300 0.630200 -0.297100 -vn 0.297100 0.630200 0.717300 -g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_metal -s 1 -f 33/1/1 39/2/2 40/3/3 34/4/4 -f 34/4/4 40/3/3 41/5/5 35/6/6 -f 35/6/6 41/5/5 42/7/7 36/8/8 -f 36/9/8 42/10/7 43/11/9 37/12/10 -f 37/12/10 43/11/9 44/13/11 38/14/12 -f 33/1/1 38/14/12 44/13/11 39/2/2 -f 39/2/2 45/15/13 46/16/14 40/3/3 -f 40/3/3 46/16/14 47/17/15 41/5/5 -f 41/5/5 47/17/15 48/18/16 42/7/7 -f 42/10/7 48/19/16 49/20/17 43/11/9 -f 43/11/9 49/20/17 50/21/18 44/13/11 -f 44/13/11 50/21/18 45/15/13 39/2/2 -f 45/15/13 51/22/19 52/23/20 46/16/14 -f 46/16/14 52/23/20 53/24/21 47/17/15 -f 47/17/15 53/24/21 54/25/22 48/18/16 -f 48/19/16 54/26/22 55/27/23 49/20/17 -f 49/20/17 55/27/23 56/28/24 50/21/18 -f 50/21/18 56/28/24 51/22/19 45/15/13 -f 51/22/19 57/29/25 58/30/26 52/23/20 -f 52/23/20 58/30/26 59/31/27 53/24/21 -f 53/24/21 59/31/27 60/32/28 54/25/22 -f 54/26/22 60/33/28 61/34/29 55/27/23 -f 55/27/23 61/34/29 62/35/30 56/28/24 -f 56/28/24 62/35/30 57/29/25 51/22/19 -f 57/29/25 63/36/31 64/37/32 58/30/26 -f 58/30/26 64/37/32 65/38/33 59/31/27 -f 59/31/27 65/38/33 66/39/34 60/32/28 -f 60/33/28 66/40/34 67/41/35 61/34/29 -f 61/34/29 67/41/35 68/42/36 62/35/30 -f 62/35/30 68/42/36 63/36/31 57/29/25 -f 63/43/31 69/44/37 70/45/38 64/46/32 -f 64/46/32 70/45/38 71/47/39 65/48/33 -f 65/48/33 71/47/39 72/49/40 66/50/34 -f 66/51/34 72/52/40 73/53/41 67/54/35 -f 67/54/35 73/53/41 74/55/42 68/56/36 -f 68/56/36 74/55/42 69/44/37 63/43/31 -f 69/44/37 75/57/43 76/58/44 70/45/38 -f 70/45/38 76/58/44 77/59/45 71/47/39 -f 71/47/39 77/59/45 78/60/46 72/49/40 -f 72/52/40 78/61/46 79/62/47 73/53/41 -f 73/53/41 79/62/47 80/63/48 74/55/42 -f 74/55/42 80/63/48 75/57/43 69/44/37 -f 75/57/43 81/64/8 82/65/49 76/58/44 -f 76/58/44 82/65/49 83/66/50 77/59/45 -f 77/59/45 83/66/50 84/67/1 78/60/46 -f 78/61/46 84/68/1 85/69/51 79/62/47 -f 79/62/47 85/69/51 86/70/52 80/63/48 -f 80/63/48 86/70/52 81/64/8 75/57/43 -f 81/64/8 87/71/7 88/72/53 82/65/49 -f 82/65/49 88/72/53 89/73/54 83/66/50 -f 83/66/50 89/73/54 90/74/2 84/67/1 -f 84/68/1 90/75/2 91/76/55 85/69/51 -f 85/69/51 91/76/55 92/77/56 86/70/52 -f 86/70/52 92/77/56 87/71/7 81/64/8 -f 87/71/7 93/78/16 94/79/57 88/72/53 -f 88/72/53 94/79/57 95/80/58 89/73/54 -f 89/73/54 95/80/58 96/81/13 90/74/2 -f 90/75/2 96/82/13 97/83/59 91/76/55 -f 91/76/55 97/83/59 98/84/60 92/77/56 -f 92/77/56 98/84/60 93/78/16 87/71/7 -f 93/78/16 99/85/22 100/86/61 94/79/57 -f 94/79/57 100/86/61 101/87/62 95/80/58 -f 95/80/58 101/87/62 102/88/19 96/81/13 -f 96/82/13 102/89/19 103/90/63 97/83/59 -f 97/83/59 103/90/63 104/91/64 98/84/60 -f 98/84/60 104/91/64 99/85/22 93/78/16 -f 99/85/22 105/92/28 106/93/65 100/86/61 -f 100/86/61 106/93/65 107/94/66 101/87/62 -f 101/87/62 107/94/66 108/95/25 102/88/19 -f 102/89/19 108/96/25 109/97/67 103/90/63 -f 103/90/63 109/97/67 110/98/68 104/91/64 -f 104/91/64 110/98/68 105/92/28 99/85/22 -f 105/92/28 111/99/34 112/100/69 106/93/65 -f 106/93/65 112/100/69 113/101/70 107/94/66 -f 107/94/66 113/101/70 114/102/31 108/95/25 -f 108/96/25 114/103/31 115/104/71 109/97/67 -f 109/97/67 115/104/71 116/105/72 110/98/68 -f 110/98/68 116/105/72 111/99/34 105/92/28 -f 111/99/34 117/106/40 118/107/73 112/100/69 -f 112/100/69 118/107/73 119/108/74 113/101/70 -f 113/101/70 119/108/74 120/109/37 114/102/31 -f 114/103/31 120/110/37 121/111/75 115/104/71 -f 115/104/71 121/111/75 122/112/76 116/105/72 -f 116/105/72 122/112/76 117/106/40 111/99/34 -f 117/106/40 123/113/46 124/114/77 118/107/73 -f 118/107/73 124/114/77 125/115/78 119/108/74 -f 119/108/74 125/115/78 126/116/43 120/109/37 -f 120/110/37 126/117/43 127/118/79 121/111/75 -f 121/111/75 127/118/79 128/119/80 122/112/76 -f 122/112/76 128/119/80 123/113/46 117/106/40 -f 123/113/46 33/1/1 34/4/4 124/114/77 -f 124/114/77 34/4/4 35/6/6 125/115/78 -f 125/115/78 35/6/6 36/8/8 126/116/43 -f 126/117/43 36/9/8 37/12/10 127/118/79 -f 127/118/79 37/12/10 38/14/12 128/119/80 -f 128/119/80 38/14/12 33/1/1 123/113/46 -f 129/120/81 134/121/82 135/122/83 130/123/84 -f 130/123/84 135/122/83 136/19/85 131/10/86 -f 131/124/86 136/125/85 137/126/87 132/127/88 -f 132/127/88 137/126/87 138/128/89 133/129/90 -f 133/129/90 138/128/89 134/121/82 129/120/81 -f 134/121/82 139/130/91 140/131/92 135/122/83 -f 135/122/83 140/131/92 141/26/93 136/19/85 -f 136/125/85 141/132/93 142/133/94 137/126/87 -f 137/126/87 142/133/94 143/134/95 138/128/89 -f 138/128/89 143/134/95 139/130/91 134/121/82 -f 139/130/91 144/135/96 145/136/97 140/131/92 -f 140/131/92 145/136/97 146/33/98 141/26/93 -f 141/132/93 146/137/98 147/138/99 142/133/94 -f 142/133/94 147/138/99 148/139/100 143/134/95 -f 143/134/95 148/139/100 144/135/96 139/130/91 -f 144/135/96 149/140/101 150/141/102 145/136/97 -f 145/136/97 150/141/102 151/40/103 146/33/98 -f 146/137/98 151/142/103 152/143/104 147/138/99 -f 147/138/99 152/143/104 153/144/105 148/139/100 -f 148/139/100 153/144/105 149/140/101 144/135/96 -f 178/30/106 155/31/107 157/24/108 185/23/109 -f 185/23/109 157/24/108 159/17/110 184/16/111 -f 184/16/111 159/17/110 161/5/112 183/3/113 -f 175/1/114 174/2/115 162/145/116 160/146/117 -f 177/106/118 176/113/119 158/147/120 156/148/121 -f 183/3/113 161/5/112 163/6/122 182/4/123 -f 174/2/115 173/15/124 164/149/125 162/145/116 -f 182/4/123 163/6/122 165/115/126 181/114/127 -f 171/29/128 170/36/129 154/150/130 168/151/131 -f 181/114/127 165/115/126 167/108/132 180/107/133 -f 157/152/108 155/153/107 169/154/134 167/155/132 165/156/126 163/157/122 161/158/112 159/159/110 -f 179/37/135 169/38/134 155/31/107 178/30/106 -f 180/107/133 167/108/132 169/101/134 179/100/135 -f 172/22/136 171/29/128 168/151/131 166/160/137 -f 173/15/124 172/22/136 166/160/137 164/149/125 -f 176/113/119 175/1/114 160/146/117 158/147/120 -f 154/161/130 170/99/129 177/106/118 156/148/121 -f 172/106/136 180/107/133 179/100/135 171/99/128 -f 171/36/128 179/37/135 178/30/106 170/29/129 -f 173/113/124 181/114/127 180/107/133 172/106/136 -f 174/1/115 182/4/123 181/114/127 173/113/124 -f 175/2/114 183/3/113 182/4/123 174/1/115 -f 176/15/119 184/16/111 183/3/113 175/2/114 -f 177/22/118 185/23/109 184/16/111 176/15/119 -f 170/29/129 178/30/106 185/23/109 177/22/118 -f 192/162/138 198/163/139 199/164/140 193/165/141 -f 193/165/141 199/164/140 200/166/142 194/167/143 -f 194/167/143 200/166/142 201/168/144 195/169/145 -f 195/169/145 201/168/144 202/170/146 196/171/147 -f 196/171/147 202/170/146 203/172/148 197/173/149 -f 197/173/149 203/172/148 198/174/139 192/175/138 -f 198/163/139 204/176/150 205/177/151 199/164/140 -f 199/164/140 205/177/151 206/178/152 200/166/142 -f 200/166/142 206/178/152 207/179/153 201/168/144 -f 201/168/144 207/179/153 208/180/154 202/170/146 -f 202/170/146 208/180/154 209/181/155 203/172/148 -f 203/172/148 209/181/155 204/182/150 198/174/139 -f 204/176/150 210/183/156 211/184/157 205/177/151 -f 205/177/151 211/184/157 212/185/158 206/178/152 -f 206/178/152 212/185/158 213/186/159 207/179/153 -f 207/179/153 213/186/159 214/187/160 208/180/154 -f 208/180/154 214/187/160 215/188/161 209/181/155 -f 209/181/155 215/188/161 210/189/156 204/182/150 -f 210/183/156 186/190/162 187/191/163 211/184/157 -f 211/184/157 187/191/163 188/192/164 212/185/158 -f 212/185/158 188/192/164 189/124/165 213/186/159 -f 213/186/159 189/124/165 190/127/166 214/187/160 -f 214/187/160 190/127/166 191/129/167 215/188/161 -f 215/188/161 191/129/167 186/120/162 210/189/156 -f 188/192/164 187/191/163 217/193/168 218/194/169 -f 190/127/166 189/124/165 219/142/170 220/143/171 -f 187/191/163 186/190/162 216/195/172 217/193/168 -f 189/124/165 188/192/164 218/194/169 219/142/170 -f 186/120/162 191/129/167 221/144/173 216/140/172 -f 191/129/167 190/127/166 220/143/171 221/144/173 -f 154/196/130 156/197/121 222/107/174 -f 156/197/121 158/198/120 222/107/174 -f 158/198/120 160/199/117 222/107/174 -f 160/199/117 162/200/116 222/107/174 -f 162/200/116 164/201/125 222/107/174 -f 164/201/125 166/202/137 222/107/174 -f 166/202/137 168/203/131 222/107/174 -f 168/203/131 154/196/130 222/107/174 -f 237/204/43 260/205/43 262/206/31 239/175/31 -f 252/207/46 241/208/175 242/209/176 254/210/34 -f 249/211/177 226/212/178 228/213/179 259/214/180 -f 225/173/19 261/215/19 250/216/2 227/171/2 -f 254/210/34 242/209/176 243/217/181 256/218/22 -f 259/214/180 228/213/179 230/219/182 257/220/183 -f 246/221/184 247/222/185 249/211/177 224/223/186 -f 256/218/22 243/217/181 244/224/187 258/225/7 -f 257/220/183 230/219/182 232/226/188 255/227/189 -f 245/228/190 248/229/191 247/222/185 246/221/184 -f 258/225/7 244/224/187 245/230/190 260/231/43 -f 255/227/189 232/226/188 234/232/192 253/233/193 -f 227/171/2 250/216/2 252/207/46 229/169/46 -f 262/206/31 246/221/184 224/223/186 261/215/19 -f 253/233/193 234/232/192 236/234/194 251/235/195 -f 261/215/19 224/223/186 223/236/196 250/216/2 -f 260/205/43 245/228/190 246/221/184 262/206/31 -f 251/235/195 236/234/194 238/237/197 248/238/191 -f 228/239/179 226/240/178 240/241/198 238/242/197 236/243/194 234/244/192 232/245/188 230/246/182 -f 247/222/185 240/247/198 226/212/178 249/211/177 -f 248/229/191 238/248/197 240/247/198 247/222/185 -f 244/224/187 251/235/195 248/238/191 245/230/190 -f 250/216/2 223/236/196 241/208/175 252/207/46 -f 243/217/181 253/233/193 251/235/195 244/224/187 -f 239/175/31 262/206/31 261/215/19 225/173/19 -f 242/209/176 255/227/189 253/233/193 243/217/181 -f 235/162/7 258/225/7 260/231/43 237/249/43 -f 241/208/175 257/220/183 255/227/189 242/209/176 -f 233/165/22 256/218/22 258/225/7 235/162/7 -f 223/236/196 259/214/180 257/220/183 241/208/175 -f 231/167/34 254/210/34 256/218/22 233/165/22 -f 224/223/186 249/211/177 259/214/180 223/236/196 -f 229/169/46 252/207/46 254/210/34 231/167/34 -f 301/162/199 307/163/200 308/164/201 302/165/202 -f 302/165/202 308/164/201 309/166/203 303/167/204 -f 303/167/204 309/166/203 310/168/205 304/169/206 -f 304/169/206 310/168/205 311/170/207 305/171/208 -f 305/171/208 311/170/207 312/172/209 306/173/210 -f 306/173/210 312/172/209 307/174/200 301/175/199 -f 307/163/200 313/176/211 314/177/212 308/164/201 -f 308/164/201 314/177/212 315/178/213 309/166/203 -f 309/166/203 315/178/213 316/179/214 310/168/205 -f 310/168/205 316/179/214 317/180/215 311/170/207 -f 311/170/207 317/180/215 318/181/216 312/172/209 -f 312/172/209 318/181/216 313/182/211 307/174/200 -f 313/176/211 319/183/217 320/184/218 314/177/212 -f 314/177/212 320/184/218 321/185/219 315/178/213 -f 315/178/213 321/185/219 322/186/220 316/179/214 -f 316/179/214 322/186/220 323/187/221 317/180/215 -f 317/180/215 323/187/221 324/188/222 318/181/216 -f 318/181/216 324/188/222 319/189/217 313/182/211 -f 319/183/217 295/190/223 296/191/224 320/184/218 -f 320/184/218 296/191/224 297/192/225 321/185/219 -f 321/185/219 297/192/225 298/124/226 322/186/220 -f 322/186/220 298/124/226 299/127/227 323/187/221 -f 323/187/221 299/127/227 300/129/228 324/188/222 -f 324/188/222 300/129/228 295/120/223 319/189/217 -f 297/192/225 296/191/224 326/193/229 327/194/230 -f 299/127/227 298/124/226 328/142/231 329/143/232 -f 296/191/224 295/190/223 325/195/233 326/193/229 -f 298/124/226 297/192/225 327/194/230 328/142/231 -f 295/120/223 300/129/228 330/144/234 325/140/233 -f 300/129/228 299/127/227 329/143/232 330/144/234 -f 345/204/19 368/205/19 370/206/2 347/175/2 -f 360/207/22 349/208/181 350/209/187 362/210/7 -f 357/211/183 334/212/182 336/213/188 367/214/189 -f 333/173/46 369/215/46 358/216/34 335/171/34 -f 362/210/7 350/209/187 351/217/190 364/218/43 -f 367/214/189 336/213/188 338/219/192 365/220/193 -f 354/221/196 355/222/180 357/211/183 332/223/175 -f 364/218/43 351/217/190 352/224/184 366/225/31 -f 365/220/193 338/219/192 340/226/194 363/227/195 -f 353/228/186 356/229/177 355/222/180 354/221/196 -f 366/225/31 352/224/184 353/230/186 368/231/19 -f 363/227/195 340/226/194 342/232/197 361/233/191 -f 335/171/34 358/216/34 360/207/22 337/169/22 -f 370/206/2 354/221/196 332/223/175 369/215/46 -f 361/233/191 342/232/197 344/234/198 359/235/185 -f 369/215/46 332/223/175 331/236/176 358/216/34 -f 368/205/19 353/228/186 354/221/196 370/206/2 -f 359/235/185 344/234/198 346/237/178 356/238/177 -f 336/239/188 334/240/182 348/241/179 346/242/178 344/243/198 342/244/197 340/245/194 338/246/192 -f 355/222/180 348/247/179 334/212/182 357/211/183 -f 356/229/177 346/248/178 348/247/179 355/222/180 -f 352/224/184 359/235/185 356/238/177 353/230/186 -f 358/216/34 331/236/176 349/208/181 360/207/22 -f 351/217/190 361/233/191 359/235/185 352/224/184 -f 347/175/2 370/206/2 369/215/46 333/173/46 -f 350/209/187 363/227/195 361/233/191 351/217/190 -f 343/162/31 366/225/31 368/231/19 345/249/19 -f 349/208/181 365/220/193 363/227/195 350/209/187 -f 341/165/43 364/218/43 366/225/31 343/162/31 -f 331/236/176 367/214/189 365/220/193 349/208/181 -f 339/167/7 362/210/7 364/218/43 341/165/43 -f 332/223/175 357/211/183 367/214/189 331/236/176 -f 337/169/22 360/207/22 362/210/7 339/167/7 -f 409/162/235 415/163/236 416/164/237 410/165/238 -f 410/165/238 416/164/237 417/166/239 411/167/240 -f 411/167/240 417/166/239 418/168/241 412/169/242 -f 412/169/242 418/168/241 419/170/243 413/171/244 -f 413/171/244 419/170/243 420/172/245 414/173/246 -f 414/173/246 420/172/245 415/174/236 409/175/235 -f 415/163/236 421/176/247 422/177/248 416/164/237 -f 416/164/237 422/177/248 423/178/249 417/166/239 -f 417/166/239 423/178/249 424/179/250 418/168/241 -f 418/168/241 424/179/250 425/180/251 419/170/243 -f 419/170/243 425/180/251 426/181/252 420/172/245 -f 420/172/245 426/181/252 421/182/247 415/174/236 -f 421/176/247 427/183/253 428/184/254 422/177/248 -f 422/177/248 428/184/254 429/185/255 423/178/249 -f 423/178/249 429/185/255 430/186/256 424/179/250 -f 424/179/250 430/186/256 431/187/257 425/180/251 -f 425/180/251 431/187/257 432/188/258 426/181/252 -f 426/181/252 432/188/258 427/189/253 421/182/247 -f 427/183/253 403/190/259 404/191/260 428/184/254 -f 428/184/254 404/191/260 405/192/261 429/185/255 -f 429/185/255 405/192/261 406/124/262 430/186/256 -f 430/186/256 406/124/262 407/127/263 431/187/257 -f 431/187/257 407/127/263 408/129/264 432/188/258 -f 432/188/258 408/129/264 403/120/259 427/189/253 -f 405/192/261 404/191/260 434/193/265 435/194/266 -f 407/127/263 406/124/262 436/142/267 437/143/268 -f 404/191/260 403/190/259 433/195/269 434/193/265 -f 406/124/262 405/192/261 435/194/266 436/142/267 -f 403/120/259 408/129/264 438/144/270 433/140/269 -f 408/129/264 407/127/263 437/143/268 438/144/270 -f 453/204/46 476/205/46 478/206/34 455/175/34 -f 468/207/43 457/208/190 458/209/184 470/210/31 -f 465/211/193 442/212/192 444/213/194 475/214/195 -f 441/173/22 477/215/22 466/216/7 443/171/7 -f 470/210/31 458/209/184 459/217/186 472/218/19 -f 475/214/195 444/213/194 446/219/197 473/220/191 -f 462/221/176 463/222/189 465/211/193 440/223/181 -f 472/218/19 459/217/186 460/224/196 474/225/2 -f 473/220/191 446/219/197 448/226/198 471/227/185 -f 461/228/175 464/229/183 463/222/189 462/221/176 -f 474/225/2 460/224/196 461/230/175 476/231/46 -f 471/227/185 448/226/198 450/232/178 469/233/177 -f 443/171/7 466/216/7 468/207/43 445/169/43 -f 478/206/34 462/221/176 440/223/181 477/215/22 -f 469/233/177 450/232/178 452/234/179 467/235/180 -f 477/215/22 440/223/181 439/236/187 466/216/7 -f 476/205/46 461/228/175 462/221/176 478/206/34 -f 467/235/180 452/234/179 454/237/182 464/238/183 -f 444/239/194 442/240/192 456/241/188 454/242/182 452/243/179 450/244/178 448/245/198 446/246/197 -f 463/222/189 456/247/188 442/212/192 465/211/193 -f 464/229/183 454/248/182 456/247/188 463/222/189 -f 460/224/196 467/235/180 464/238/183 461/230/175 -f 466/216/7 439/236/187 457/208/190 468/207/43 -f 459/217/186 469/233/177 467/235/180 460/224/196 -f 455/175/34 478/206/34 477/215/22 441/173/22 -f 458/209/184 471/227/185 469/233/177 459/217/186 -f 451/162/2 474/225/2 476/231/46 453/249/46 -f 457/208/190 473/220/191 471/227/185 458/209/184 -f 449/165/19 472/218/19 474/225/2 451/162/2 -f 439/236/187 475/214/195 473/220/191 457/208/190 -f 447/167/31 470/210/31 472/218/19 449/165/19 -f 440/223/181 465/211/193 475/214/195 439/236/187 -f 445/169/43 468/207/43 470/210/31 447/167/31 -f 517/162/271 523/163/272 524/164/273 518/165/274 -f 518/165/274 524/164/273 525/166/275 519/167/276 -f 519/167/276 525/166/275 526/168/277 520/169/278 -f 520/169/278 526/168/277 527/170/279 521/171/280 -f 521/171/280 527/170/279 528/172/281 522/173/282 -f 522/173/282 528/172/281 523/174/272 517/175/271 -f 523/163/272 529/176/283 530/177/284 524/164/273 -f 524/164/273 530/177/284 531/178/285 525/166/275 -f 525/166/275 531/178/285 532/179/286 526/168/277 -f 526/168/277 532/179/286 533/180/287 527/170/279 -f 527/170/279 533/180/287 534/181/288 528/172/281 -f 528/172/281 534/181/288 529/182/283 523/174/272 -f 529/176/283 535/183/289 536/184/290 530/177/284 -f 530/177/284 536/184/290 537/185/291 531/178/285 -f 531/178/285 537/185/291 538/186/292 532/179/286 -f 532/179/286 538/186/292 539/187/293 533/180/287 -f 533/180/287 539/187/293 540/188/294 534/181/288 -f 534/181/288 540/188/294 535/189/289 529/182/283 -f 535/183/289 511/190/295 512/191/296 536/184/290 -f 536/184/290 512/191/296 513/192/297 537/185/291 -f 537/185/291 513/192/297 514/124/298 538/186/292 -f 538/186/292 514/124/298 515/127/299 539/187/293 -f 539/187/293 515/127/299 516/129/300 540/188/294 -f 540/188/294 516/129/300 511/120/295 535/189/289 -f 513/192/297 512/191/296 542/193/301 543/194/302 -f 515/127/299 514/124/298 544/142/303 545/143/304 -f 512/191/296 511/190/295 541/195/305 542/193/301 -f 514/124/298 513/192/297 543/194/302 544/142/303 -f 511/120/295 516/129/300 546/144/306 541/140/305 -f 516/129/300 515/127/299 545/143/304 546/144/306 -f 561/204/22 584/205/22 586/206/7 563/175/7 -f 576/207/19 565/208/186 566/209/196 578/210/2 -f 573/211/191 550/212/197 552/213/198 583/214/185 -f 549/173/43 585/215/43 574/216/31 551/171/31 -f 578/210/2 566/209/196 567/217/175 580/218/46 -f 583/214/185 552/213/198 554/219/178 581/220/177 -f 570/221/187 571/222/195 573/211/191 548/223/190 -f 580/218/46 567/217/175 568/224/176 582/225/34 -f 581/220/177 554/219/178 556/226/179 579/227/180 -f 569/228/181 572/229/193 571/222/195 570/221/187 -f 582/225/34 568/224/176 569/230/181 584/231/22 -f 579/227/180 556/226/179 558/232/182 577/233/183 -f 551/171/31 574/216/31 576/207/19 553/169/19 -f 586/206/7 570/221/187 548/223/190 585/215/43 -f 577/233/183 558/232/182 560/234/188 575/235/189 -f 585/215/43 548/223/190 547/236/184 574/216/31 -f 584/205/22 569/228/181 570/221/187 586/206/7 -f 575/235/189 560/234/188 562/237/192 572/238/193 -f 552/239/198 550/240/197 564/241/194 562/242/192 560/243/188 558/244/182 556/245/179 554/246/178 -f 571/222/195 564/247/194 550/212/197 573/211/191 -f 572/229/193 562/248/192 564/247/194 571/222/195 -f 568/224/176 575/235/189 572/238/193 569/230/181 -f 574/216/31 547/236/184 565/208/186 576/207/19 -f 567/217/175 577/233/183 575/235/189 568/224/176 -f 563/175/7 586/206/7 585/215/43 549/173/43 -f 566/209/196 579/227/180 577/233/183 567/217/175 -f 559/162/34 582/225/34 584/231/22 561/249/22 -f 565/208/186 581/220/177 579/227/180 566/209/196 -f 557/165/46 580/218/46 582/225/34 559/162/34 -f 547/236/184 583/214/185 581/220/177 565/208/186 -f 555/167/2 578/210/2 580/218/46 557/165/46 -f 548/223/190 573/211/191 583/214/185 547/236/184 -f 553/169/19 576/207/19 578/210/2 555/167/2 -g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_candle -f 13/130/307 15/120/308 16/192/31 14/250/43 -f 9/221/309 10/209/22 8/167/34 7/175/310 -f 9/221/309 11/247/311 12/226/7 10/209/22 -f 3/182/312 4/178/2 2/185/19 1/189/313 -f 13/130/307 14/250/43 12/194/7 11/140/311 -f 2/185/19 16/192/31 15/120/308 1/189/313 -f 3/182/312 5/174/314 6/166/46 4/178/2 -f 3/251/312 1/252/313 15/253/308 13/254/307 11/255/311 9/256/309 7/257/310 5/258/314 -f 5/174/314 7/175/310 8/167/34 6/166/46 -f 275/130/313 277/120/312 278/192/2 276/250/19 -f 271/221/307 272/209/43 270/167/7 269/175/311 -f 271/221/307 273/247/308 274/226/31 272/209/43 -f 265/182/310 266/178/34 264/185/46 263/189/314 -f 275/130/313 276/250/19 274/194/31 273/140/308 -f 264/185/46 278/192/2 277/120/312 263/189/314 -f 265/182/310 267/174/309 268/166/22 266/178/34 -f 265/251/310 263/252/314 277/253/312 275/254/313 273/255/308 271/256/307 269/257/311 267/258/309 -f 267/174/309 269/175/311 270/167/7 268/166/22 -f 383/130/314 385/120/310 386/192/34 384/250/46 -f 379/221/313 380/209/19 378/167/31 377/175/308 -f 379/221/313 381/247/312 382/226/2 380/209/19 -f 373/182/311 374/178/7 372/185/22 371/189/309 -f 383/130/314 384/250/46 382/194/2 381/140/312 -f 372/185/22 386/192/34 385/120/310 371/189/309 -f 373/182/311 375/174/307 376/166/43 374/178/7 -f 373/251/311 371/252/309 385/253/310 383/254/314 381/255/312 379/256/313 377/257/308 375/258/307 -f 375/174/307 377/175/308 378/167/31 376/166/43 -f 491/130/309 493/120/311 494/192/7 492/250/22 -f 487/221/314 488/209/46 486/167/2 485/175/312 -f 487/221/314 489/247/310 490/226/34 488/209/46 -f 481/182/308 482/178/31 480/185/43 479/189/307 -f 491/130/309 492/250/22 490/194/34 489/140/310 -f 480/185/43 494/192/7 493/120/311 479/189/307 -f 481/182/308 483/174/313 484/166/19 482/178/31 -f 481/251/308 479/252/307 493/253/311 491/254/309 489/255/310 487/256/314 485/257/312 483/258/313 -f 483/174/313 485/175/312 486/167/2 484/166/19 -g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_flame -s off -f 17/259/25 20/260/25 19/50/25 18/39/25 -f 21/259/1 24/260/1 23/50/1 22/39/1 -f 25/259/25 26/260/25 27/50/25 28/39/25 -f 29/259/8 32/39/8 31/50/8 30/260/8 -f 279/259/1 282/260/1 281/50/1 280/39/1 -f 283/259/28 286/260/28 285/50/28 284/39/28 -f 287/259/1 288/260/1 289/50/1 290/39/1 -f 291/259/25 294/39/25 293/50/25 292/260/25 -f 387/259/28 390/260/28 389/50/28 388/39/28 -f 391/259/8 394/260/8 393/50/8 392/39/8 -f 395/259/28 396/260/28 397/50/28 398/39/28 -f 399/259/1 402/39/1 401/50/1 400/260/1 -f 495/259/8 498/260/8 497/50/8 496/39/8 -f 499/259/25 502/260/25 501/50/25 500/39/25 -f 503/259/8 504/260/8 505/50/8 506/39/8 -f 507/259/28 510/39/28 509/50/28 508/260/28 diff --git a/chains/models/top_chains.obj b/chains/models/top_chains.obj deleted file mode 100644 index 9e4f3f7..0000000 --- a/chains/models/top_chains.obj +++ /dev/null @@ -1,943 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'chains-top.blend' -# www.blender.org -o Torus.016_Torus -v 0.000000 -0.429978 0.000002 -v 0.000000 -0.401109 0.055211 -v -0.014044 -0.391975 0.048870 -v -0.014044 -0.423304 0.000002 -v -0.009826 -0.379748 0.040970 -v -0.009826 -0.406012 0.000002 -v 0.009826 -0.379748 0.040970 -v 0.009826 -0.406012 0.000002 -v 0.014044 -0.391975 0.048870 -v 0.014044 -0.423304 0.000002 -v 0.000000 -0.316336 0.080195 -v -0.014044 -0.316336 0.069112 -v -0.009826 -0.316336 0.057941 -v 0.009826 -0.316336 0.057941 -v 0.014044 -0.316336 0.069112 -v 0.000000 -0.231564 0.055211 -v -0.014044 -0.240700 0.048870 -v -0.009826 -0.252925 0.040970 -v 0.009826 -0.252925 0.040970 -v 0.014044 -0.240700 0.048870 -v 0.000000 -0.202695 0.000002 -v -0.014044 -0.209368 0.000002 -v -0.009826 -0.226661 0.000002 -v 0.009826 -0.226661 0.000002 -v 0.014044 -0.209368 0.000002 -v 0.000000 -0.231564 -0.055206 -v -0.014044 -0.240700 -0.048868 -v -0.009826 -0.252925 -0.040967 -v 0.009826 -0.252925 -0.040967 -v 0.014044 -0.240700 -0.048865 -v 0.000000 -0.316336 -0.080190 -v -0.014044 -0.316336 -0.069108 -v -0.009826 -0.316336 -0.057936 -v 0.009826 -0.316336 -0.057936 -v 0.014044 -0.316336 -0.069108 -v 0.000000 -0.400361 -0.055206 -v -0.014044 -0.391975 -0.048868 -v -0.009826 -0.379748 -0.040967 -v 0.009826 -0.379748 -0.040967 -v 0.014044 -0.391975 -0.048868 -v 0.000000 -0.262249 0.000002 -v -0.061672 -0.233381 0.000002 -v -0.054590 -0.224245 -0.012569 -v 0.000000 -0.255577 -0.012569 -v -0.045765 -0.212018 -0.008794 -v 0.000000 -0.238285 -0.008794 -v -0.045765 -0.212018 0.008798 -v 0.000000 -0.238285 0.008798 -v -0.054590 -0.224245 0.012574 -v 0.000000 -0.255577 0.012574 -v -0.089582 -0.148609 0.000002 -v -0.077200 -0.148609 -0.012569 -v -0.064722 -0.148609 -0.008794 -v -0.064722 -0.148609 0.008799 -v -0.077200 -0.148609 0.012574 -v -0.061672 -0.063837 0.000002 -v -0.054590 -0.072971 -0.012569 -v -0.045765 -0.085198 -0.008794 -v -0.045765 -0.085198 0.008799 -v -0.054590 -0.072971 0.012574 -v 0.000000 -0.034967 0.000002 -v 0.000000 -0.041641 -0.012569 -v 0.000000 -0.058933 -0.008794 -v 0.000000 -0.058933 0.008799 -v 0.000000 -0.041641 0.012574 -v 0.061672 -0.063837 0.000002 -v 0.054590 -0.072971 -0.012569 -v 0.045765 -0.085198 -0.008794 -v 0.045765 -0.085198 0.008799 -v 0.054590 -0.072971 0.012574 -v 0.089582 -0.148609 0.000002 -v 0.077200 -0.148609 -0.012569 -v 0.064722 -0.148609 -0.008794 -v 0.064722 -0.148609 0.008799 -v 0.077200 -0.148609 0.012574 -v 0.061672 -0.232631 0.000002 -v 0.054590 -0.224245 -0.012569 -v 0.045765 -0.212018 -0.008794 -v 0.045765 -0.212018 0.008798 -v 0.054590 -0.224245 0.012574 -v 0.000000 0.073316 0.000002 -v 0.061672 0.102183 0.000002 -v 0.054590 0.111319 0.012574 -v 0.000000 0.079988 0.012574 -v 0.045765 0.123546 0.008799 -v 0.000000 0.097280 0.008799 -v 0.045765 0.123546 -0.008794 -v 0.000000 0.097280 -0.008794 -v 0.054590 0.111319 -0.012569 -v 0.000000 0.079988 -0.012569 -v 0.089582 0.186956 0.000002 -v 0.077200 0.186956 0.012574 -v 0.064722 0.186956 0.008799 -v 0.064722 0.186956 -0.008794 -v 0.077200 0.186956 -0.012569 -v 0.061672 0.271728 0.000002 -v 0.054590 0.262594 0.012574 -v 0.045765 0.250367 0.008799 -v 0.045765 0.250367 -0.008794 -v 0.054590 0.262594 -0.012569 -v 0.000000 0.300597 0.000002 -v 0.000000 0.293923 0.012574 -v 0.000000 0.276631 0.008799 -v 0.000000 0.276631 -0.008794 -v 0.000000 0.293923 -0.012569 -v -0.061672 0.271728 0.000002 -v -0.054590 0.262594 0.012574 -v -0.045765 0.250367 0.008799 -v -0.045765 0.250367 -0.008794 -v -0.054590 0.262594 -0.012569 -v -0.089582 0.186956 0.000002 -v -0.077200 0.186956 0.012574 -v -0.064722 0.186956 0.008799 -v -0.064722 0.186956 -0.008794 -v -0.077200 0.186956 -0.012569 -v -0.061672 0.102931 0.000002 -v -0.054590 0.111319 0.012574 -v -0.045765 0.123546 0.008799 -v -0.045765 0.123546 -0.008794 -v -0.054590 0.111319 -0.012569 -v 0.000000 -0.095037 0.000002 -v 0.000000 -0.066168 -0.055206 -v 0.014044 -0.057034 -0.048868 -v 0.014044 -0.088363 0.000002 -v 0.009826 -0.044807 -0.040967 -v 0.009826 -0.071071 0.000002 -v -0.009826 -0.044807 -0.040967 -v -0.009826 -0.071071 0.000002 -v -0.014044 -0.057034 -0.048868 -v -0.014044 -0.088363 0.000002 -v 0.000000 0.018605 -0.080190 -v 0.014044 0.018605 -0.069108 -v 0.009826 0.018605 -0.057936 -v -0.009826 0.018605 -0.057936 -v -0.014044 0.018605 -0.069108 -v 0.000000 0.103377 -0.055206 -v 0.014044 0.094243 -0.048868 -v 0.009826 0.082016 -0.040967 -v -0.009826 0.082016 -0.040967 -v -0.014044 0.094243 -0.048868 -v 0.000000 0.132246 0.000002 -v 0.014044 0.125572 0.000002 -v 0.009826 0.108280 0.000002 -v -0.009826 0.108280 0.000002 -v -0.014044 0.125572 0.000002 -v 0.000000 0.103377 0.055211 -v 0.014044 0.094243 0.048870 -v 0.009826 0.082016 0.040970 -v -0.009826 0.082016 0.040970 -v -0.014044 0.094243 0.048870 -v 0.000000 0.018605 0.080195 -v 0.014044 0.018605 0.069112 -v 0.009826 0.018605 0.057941 -v -0.009826 0.018605 0.057941 -v -0.014044 0.018605 0.069112 -v 0.000000 -0.065420 0.055211 -v 0.014044 -0.057032 0.048870 -v 0.009826 -0.044807 0.040970 -v -0.009826 -0.044807 0.040970 -v -0.014044 -0.057032 0.048870 -v 0.000000 -0.598329 0.000002 -v 0.061672 -0.569460 0.000002 -v 0.054590 -0.560326 0.012574 -v 0.000000 -0.591655 0.012574 -v 0.045765 -0.548099 0.008798 -v 0.000000 -0.574363 0.008798 -v 0.045765 -0.548099 -0.008794 -v 0.000000 -0.574363 -0.008794 -v 0.054590 -0.560326 -0.012569 -v 0.000000 -0.591655 -0.012569 -v 0.089582 -0.484687 0.000002 -v 0.077200 -0.484687 0.012574 -v 0.064722 -0.484687 0.008798 -v 0.064722 -0.484687 -0.008794 -v 0.077200 -0.484687 -0.012569 -v 0.061672 -0.399915 0.000002 -v 0.054590 -0.409051 0.012574 -v 0.045765 -0.421278 0.008798 -v 0.045765 -0.421278 -0.008794 -v 0.054590 -0.409051 -0.012569 -v 0.000000 -0.371048 0.000002 -v 0.000000 -0.377719 0.012574 -v 0.000000 -0.395012 0.008798 -v 0.000000 -0.395012 -0.008794 -v 0.000000 -0.377719 -0.012569 -v -0.061672 -0.399915 0.000002 -v -0.054590 -0.409051 0.012574 -v -0.045765 -0.421278 0.008798 -v -0.045765 -0.421278 -0.008794 -v -0.054590 -0.409051 -0.012569 -v -0.089582 -0.484687 0.000002 -v -0.077200 -0.484687 0.012574 -v -0.064722 -0.484687 0.008798 -v -0.064722 -0.484687 -0.008794 -v -0.077200 -0.484687 -0.012569 -v -0.061672 -0.568712 0.000002 -v -0.054590 -0.560326 0.012574 -v -0.045765 -0.548099 0.008798 -v -0.045765 -0.548099 -0.008794 -v -0.054590 -0.560326 -0.012569 -v 0.000000 0.241043 0.000002 -v 0.000000 0.269910 0.055211 -v -0.014044 0.279047 0.048870 -v -0.014044 0.247717 0.000002 -v -0.009826 0.291274 0.040970 -v -0.009826 0.265007 0.000002 -v 0.009826 0.291274 0.040970 -v 0.009826 0.265007 0.000002 -v 0.014044 0.279047 0.048870 -v 0.014044 0.247717 0.000002 -v 0.000000 0.354683 0.080195 -v -0.014044 0.354683 0.069112 -v -0.009826 0.354683 0.057941 -v 0.009826 0.354683 0.057941 -v 0.014044 0.354683 0.069112 -v 0.000000 0.354683 -0.080190 -v -0.014044 0.354683 -0.069108 -v -0.009826 0.354683 -0.057936 -v 0.009826 0.354683 -0.057936 -v 0.014044 0.354683 -0.069108 -v 0.000000 0.270661 -0.055206 -v -0.014044 0.279047 -0.048868 -v -0.009826 0.291274 -0.040967 -v 0.009826 0.291274 -0.040967 -v 0.014044 0.279047 -0.048868 -v -0.000000 0.343750 -0.116420 -v 0.000000 0.500000 -0.250000 -v 0.082321 0.343750 -0.082321 -v 0.176777 0.500000 -0.176777 -v 0.116420 0.343750 0.000000 -v 0.250000 0.500000 0.000000 -v 0.082321 0.343750 0.082321 -v 0.176777 0.500000 0.176777 -v -0.000000 0.343750 0.116420 -v -0.000000 0.500000 0.250000 -v -0.082321 0.343750 0.082321 -v -0.176777 0.500000 0.176777 -v -0.116420 0.343750 -0.000000 -v -0.250000 0.500000 -0.000000 -v -0.082321 0.343750 -0.082321 -v -0.176777 0.500000 -0.176777 -v 0.068265 0.433424 -0.164807 -v 0.164807 0.433424 -0.068265 -v 0.164807 0.433424 0.068265 -v 0.068265 0.433424 0.164807 -v -0.068265 0.433424 0.164807 -v -0.164807 0.433424 0.068265 -v -0.068265 0.433424 -0.164807 -v -0.164807 0.433424 -0.068265 -vt 0.187500 0.125000 -vt 0.250000 0.125000 -vt 0.250000 0.187500 -vt 0.187500 0.187500 -vt 0.250000 0.250000 -vt 0.187500 0.250000 -vt 0.250000 0.312500 -vt 0.187500 0.312500 -vt 0.250000 0.375000 -vt 0.187500 0.375000 -vt 0.187500 0.062500 -vt 0.250000 0.062500 -vt 0.312500 0.125000 -vt 0.312500 0.187500 -vt 0.312500 0.250000 -vt 0.312500 0.312500 -vt 0.312500 0.375000 -vt 0.312500 0.062500 -vt 0.375000 0.125000 -vt 0.375000 0.187500 -vt 0.375000 0.250000 -vt 0.375000 0.312500 -vt 0.375000 0.375000 -vt 0.375000 0.062500 -vt 0.437500 0.125000 -vt 0.437500 0.187500 -vt 0.437500 0.250000 -vt 0.437500 0.312500 -vt 0.437500 0.375000 -vt 0.437500 0.062500 -vt 0.500000 0.125000 -vt 0.500000 0.187500 -vt 0.500000 0.250000 -vt 0.500000 0.312500 -vt 0.500000 0.375000 -vt 0.500000 0.062500 -vt -0.000000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.187500 -vt -0.000000 0.187500 -vt 0.062500 0.250000 -vt -0.000000 0.250000 -vt 0.062500 0.312500 -vt -0.000000 0.312500 -vt 0.062500 0.375000 -vt -0.000000 0.375000 -vt -0.000000 0.062500 -vt 0.062500 0.062500 -vt 0.125000 0.125000 -vt 0.125000 0.187500 -vt 0.125000 0.250000 -vt 0.125000 0.312500 -vt 0.125000 0.375000 -vt 0.125000 0.062500 -vt 0.750000 0.625000 -vt 0.812500 0.625000 -vt 0.812500 0.687500 -vt 0.750000 0.687500 -vt 0.750000 0.375000 -vt 0.812500 0.375000 -vt 0.812500 0.437500 -vt 0.750000 0.437500 -vt 0.812500 0.500000 -vt 0.750000 0.500000 -vt 0.812500 0.562500 -vt 0.750000 0.562500 -vt 0.875000 0.625000 -vt 0.875000 0.687500 -vt 0.875000 0.375000 -vt 0.875000 0.437500 -vt 0.875000 0.500000 -vt 0.875000 0.562500 -vt 0.937500 0.625000 -vt 0.937500 0.687500 -vt 0.937500 0.375000 -vt 0.937500 0.437500 -vt 0.937500 0.500000 -vt 0.937500 0.562500 -vt 1.000000 0.625000 -vt 1.000000 0.687500 -vt 1.000000 0.375000 -vt 1.000000 0.437500 -vt 1.000000 0.500000 -vt 1.000000 0.562500 -vt 0.500000 0.625000 -vt 0.562500 0.625000 -vt 0.562500 0.687500 -vt 0.500000 0.687500 -vt 0.562500 0.375000 -vt 0.562500 0.437500 -vt 0.500000 0.437500 -vt 0.562500 0.500000 -vt 0.500000 0.500000 -vt 0.562500 0.562500 -vt 0.500000 0.562500 -vt 0.625000 0.625000 -vt 0.625000 0.687500 -vt 0.625000 0.375000 -vt 0.625000 0.437500 -vt 0.625000 0.500000 -vt 0.625000 0.562500 -vt 0.687500 0.625000 -vt 0.687500 0.687500 -vt 0.687500 0.375000 -vt 0.687500 0.437500 -vt 0.687500 0.500000 -vt 0.687500 0.562500 -vt 0.250000 0.625000 -vt 0.312500 0.625000 -vt 0.312500 0.687500 -vt 0.250000 0.687500 -vt 0.312500 0.437500 -vt 0.250000 0.437500 -vt 0.312500 0.500000 -vt 0.250000 0.500000 -vt 0.312500 0.562500 -vt 0.250000 0.562500 -vt 0.375000 0.625000 -vt 0.375000 0.687500 -vt 0.375000 0.437500 -vt 0.375000 0.500000 -vt 0.375000 0.562500 -vt 0.437500 0.625000 -vt 0.437500 0.687500 -vt 0.437500 0.437500 -vt 0.437500 0.500000 -vt 0.437500 0.562500 -vt -0.000000 0.625000 -vt 0.062500 0.625000 -vt 0.062500 0.687500 -vt -0.000000 0.687500 -vt 0.062500 0.437500 -vt -0.000000 0.437500 -vt 0.062500 0.500000 -vt -0.000000 0.500000 -vt 0.062500 0.562500 -vt -0.000000 0.562500 -vt 0.125000 0.625000 -vt 0.125000 0.687500 -vt 0.125000 0.437500 -vt 0.125000 0.500000 -vt 0.125000 0.562500 -vt 0.187500 0.625000 -vt 0.187500 0.687500 -vt 0.187500 0.437500 -vt 0.187500 0.500000 -vt 0.187500 0.562500 -vt 0.687500 0.750000 -vt 0.750000 0.750000 -vt 0.750000 0.812500 -vt 0.687500 0.812500 -vt 0.750000 0.875000 -vt 0.687500 0.875000 -vt 0.750000 0.937500 -vt 0.687500 0.937500 -vt 0.750000 1.000000 -vt 0.687500 1.000000 -vt 0.812500 0.750000 -vt 0.812500 0.812500 -vt 0.812500 0.875000 -vt 0.812500 0.937500 -vt 0.812500 1.000000 -vt 0.875000 0.750000 -vt 0.875000 0.812500 -vt 0.875000 0.875000 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.937500 0.750000 -vt 0.937500 0.812500 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.937500 1.000000 -vt 1.000000 0.750000 -vt 1.000000 0.812500 -vt 1.000000 0.875000 -vt 1.000000 0.937500 -vt 1.000000 1.000000 -vt 0.500000 0.750000 -vt 0.562500 0.750000 -vt 0.562500 0.812500 -vt 0.500000 0.812500 -vt 0.562500 0.875000 -vt 0.500000 0.875000 -vt 0.562500 0.937500 -vt 0.500000 0.937500 -vt 0.562500 1.000000 -vt 0.500000 1.000000 -vt 0.625000 0.750000 -vt 0.625000 0.812500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.625000 1.000000 -vt 0.750000 0.312500 -vt 0.812500 0.312500 -vt 0.750000 0.062500 -vt 0.812500 0.062500 -vt 0.812500 0.125000 -vt 0.750000 0.125000 -vt 0.812500 0.187500 -vt 0.750000 0.187500 -vt 0.812500 0.250000 -vt 0.750000 0.250000 -vt 0.875000 0.312500 -vt 0.875000 0.062500 -vt 0.875000 0.125000 -vt 0.875000 0.187500 -vt 0.875000 0.250000 -vt 0.937500 0.312500 -vt 0.937500 0.062500 -vt 0.937500 0.125000 -vt 0.937500 0.187500 -vt 0.937500 0.250000 -vt 1.000000 0.312500 -vt 1.000000 0.062500 -vt 1.000000 0.125000 -vt 1.000000 0.187500 -vt 1.000000 0.250000 -vt 0.562500 0.312500 -vt 0.562500 0.062500 -vt 0.562500 0.125000 -vt 0.562500 0.187500 -vt 0.562500 0.250000 -vt 0.625000 0.312500 -vt 0.625000 0.062500 -vt 0.625000 0.125000 -vt 0.625000 0.187500 -vt 0.625000 0.250000 -vt 0.687500 0.312500 -vt 0.687500 0.062500 -vt 0.687500 0.125000 -vt 0.687500 0.187500 -vt 0.687500 0.250000 -vt 0.250000 0.937500 -vt 0.312500 0.937500 -vt 0.312500 1.000000 -vt 0.250000 1.000000 -vt 0.312500 0.750000 -vt 0.250000 0.750000 -vt 0.312500 0.812500 -vt 0.250000 0.812500 -vt 0.312500 0.875000 -vt 0.250000 0.875000 -vt 0.375000 0.937500 -vt 0.375000 1.000000 -vt 0.375000 0.750000 -vt 0.375000 0.812500 -vt 0.375000 0.875000 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 0.750000 -vt 0.125000 0.750000 -vt 0.187500 0.812500 -vt 0.125000 0.812500 -vt 0.187500 0.875000 -vt 0.125000 0.875000 -vt 0.687500 0.821740 -vt 0.562500 0.821739 -vt 0.437500 0.821739 -vt 0.312500 0.821739 -vt 0.187500 0.821740 -vt 0.937500 0.821739 -vt 0.676786 0.676786 -vt 0.323214 0.676786 -vt 0.323214 0.323214 -vt 0.676786 0.323214 -vt 0.062500 0.821740 -vt 0.500000 0.616426 -vt 0.582326 0.582326 -vt 0.616426 0.500000 -vt 0.582326 0.417674 -vt 0.500000 0.383574 -vt 0.417674 0.417674 -vt 0.383574 0.500000 -vt 0.417674 0.582326 -vt 0.812500 0.821739 -vt 0.000000 0.875000 -vt 0.000000 0.750000 -vn 0.000000 -1.000000 -0.004800 -vn 0.000000 -0.657400 0.753500 -vn -0.898300 -0.248500 0.362300 -vn -0.863600 -0.504100 -0.003400 -vn -0.661500 0.421500 -0.620200 -vn -0.746000 0.665900 0.000000 -vn 0.661500 0.421500 -0.620200 -vn 0.746000 0.665900 0.000000 -vn 0.898300 -0.248500 0.362300 -vn 0.863600 -0.504100 -0.003400 -vn 0.000000 0.000000 1.000000 -vn -0.925200 0.000000 0.379500 -vn -0.617100 0.000000 -0.786900 -vn 0.617100 0.000000 -0.786900 -vn 0.925200 0.000000 0.379500 -vn 0.000000 0.657400 0.753500 -vn -0.898300 0.248400 0.362300 -vn -0.661500 -0.421500 -0.620200 -vn 0.661500 -0.421500 -0.620200 -vn 0.898300 0.248400 0.362300 -vn 0.000000 1.000000 0.000000 -vn -0.866100 0.499800 0.000000 -vn -0.746000 -0.665900 0.000000 -vn 0.746000 -0.665900 0.000000 -vn 0.866100 0.499800 0.000000 -vn 0.000000 0.657400 -0.753500 -vn -0.898300 0.248400 -0.362400 -vn -0.661600 -0.421500 0.620200 -vn 0.661500 -0.421500 0.620200 -vn 0.898300 0.248400 -0.362300 -vn 0.000000 -0.000900 -1.000000 -vn -0.924600 -0.000600 -0.380700 -vn -0.617100 0.000000 0.786900 -vn 0.617100 0.000000 0.786900 -vn 0.924700 -0.000600 -0.380700 -vn 0.000000 -0.650300 -0.759600 -vn -0.895600 -0.254600 -0.364800 -vn -0.661600 0.421500 0.620200 -vn 0.661600 0.421500 0.620200 -vn 0.895600 -0.254600 -0.364800 -vn 0.004900 -1.000000 0.000000 -vn -0.729700 -0.683800 0.000000 -vn -0.324500 -0.256300 -0.910500 -vn 0.003300 -0.475500 -0.879700 -vn 0.578700 0.436200 -0.689100 -vn 0.000000 0.666600 -0.745400 -vn 0.578700 0.436200 0.689100 -vn 0.000000 0.666600 0.745400 -vn -0.324500 -0.256300 0.910500 -vn 0.003300 -0.475500 0.879700 -vn -1.000000 0.000000 0.000000 -vn -0.359600 0.000000 -0.933100 -vn 0.756400 0.000000 -0.654100 -vn 0.756400 0.000000 0.654100 -vn -0.359600 0.000000 0.933100 -vn -0.729700 0.683700 0.000000 -vn -0.324500 0.256300 -0.910500 -vn 0.578700 -0.436200 -0.689100 -vn 0.578700 -0.436200 0.689100 -vn -0.324500 0.256300 0.910500 -vn 0.000000 0.470900 -0.882200 -vn 0.000000 -0.666600 -0.745400 -vn 0.000000 -0.666600 0.745400 -vn 0.000000 0.470900 0.882200 -vn 0.729700 0.683700 0.000000 -vn 0.324500 0.256300 -0.910500 -vn -0.578700 -0.436200 -0.689100 -vn -0.578700 -0.436200 0.689100 -vn 0.324500 0.256300 0.910500 -vn 1.000000 -0.001100 0.000000 -vn 0.361000 -0.000700 -0.932600 -vn -0.756400 0.000000 -0.654100 -vn -0.756400 0.000000 0.654100 -vn 0.361000 -0.000700 0.932600 -vn 0.736100 -0.676800 0.000000 -vn 0.327100 -0.263100 -0.907600 -vn -0.578700 0.436200 -0.689100 -vn -0.578700 0.436200 0.689100 -vn 0.327100 -0.263100 0.907600 -vn -0.004900 -1.000000 0.000000 -vn 0.729700 -0.683800 0.000000 -vn 0.324500 -0.256300 0.910500 -vn -0.003300 -0.475400 0.879700 -vn 0.324500 -0.256300 -0.910500 -vn -0.003300 -0.475400 -0.879700 -vn 1.000000 0.000000 0.000000 -vn 0.359600 0.000000 0.933100 -vn 0.359600 0.000000 -0.933100 -vn -1.000000 -0.001100 0.000000 -vn -0.361000 -0.000700 0.932600 -vn -0.361000 -0.000700 -0.932600 -vn -0.736100 -0.676800 0.000000 -vn -0.327100 -0.263100 0.907600 -vn -0.327100 -0.263100 -0.907600 -vn 0.000000 -1.000000 0.004800 -vn 0.000000 -0.657400 -0.753500 -vn 0.898300 -0.248500 -0.362400 -vn 0.863600 -0.504100 0.003400 -vn -0.898300 -0.248500 -0.362400 -vn -0.863600 -0.504100 0.003400 -vn 0.000000 0.000000 -1.000000 -vn 0.925200 0.000000 -0.379500 -vn -0.925200 0.000000 -0.379500 -vn 0.898300 0.248500 -0.362400 -vn 0.661600 -0.421500 0.620200 -vn -0.898300 0.248500 -0.362400 -vn 0.898300 0.248500 0.362300 -vn -0.898300 0.248500 0.362300 -vn 0.000000 -0.000900 1.000000 -vn 0.924700 -0.000600 0.380700 -vn -0.924700 -0.000600 0.380700 -vn 0.000000 -0.650300 0.759600 -vn 0.895600 -0.254600 0.364700 -vn -0.895600 -0.254600 0.364700 -vn 0.729700 -0.683700 0.000000 -vn 0.729700 0.683800 0.000000 -vn -0.729700 0.683800 0.000000 -vn -0.898300 -0.248400 0.362300 -vn -0.863600 -0.504100 -0.003500 -vn 0.898300 -0.248400 0.362300 -vn 0.863600 -0.504100 -0.003500 -vn 0.000000 -0.271400 0.962500 -vn -0.919700 -0.109100 0.377200 -vn -0.603800 0.206100 -0.770000 -vn 0.603800 0.206100 -0.770000 -vn 0.919700 -0.109100 0.377200 -vn 0.000000 -0.272500 -0.962100 -vn -0.918500 -0.110600 -0.379700 -vn -0.661500 0.421500 0.620200 -vn -0.603800 0.206100 0.770000 -vn 0.661500 0.421500 0.620200 -vn 0.603800 0.206100 0.770000 -vn 0.918500 -0.110600 -0.379700 -vn 0.351300 -0.867800 -0.351300 -vn 0.661700 0.352400 -0.661700 -vn 0.725000 -0.619800 -0.300300 -vn 0.496800 -0.867800 0.000000 -vn 0.935800 0.352400 0.000000 -vn 0.725000 -0.619800 0.300300 -vn 0.351300 -0.867800 0.351300 -vn 0.661700 0.352400 0.661700 -vn 0.300300 -0.619800 0.725000 -vn 0.000000 -0.867800 0.496800 -vn 0.000000 0.352400 0.935800 -vn -0.300300 -0.619800 0.725000 -vn -0.351300 -0.867800 0.351300 -vn -0.661700 0.352400 0.661700 -vn -0.725000 -0.619800 0.300300 -vn -0.351300 -0.867800 -0.351300 -vn -0.661700 0.352400 -0.661700 -vn -0.300300 -0.619800 -0.725000 -vn 0.000000 0.352400 -0.935800 -vn -0.935800 0.352400 0.000000 -vn -0.496800 -0.867800 0.000000 -vn -0.725000 -0.619800 -0.300300 -vn 0.000000 -0.867800 -0.496800 -vn 0.300300 -0.619800 -0.725000 -s 1 -f 1/1/1 2/2/2 3/3/3 4/4/4 -f 4/4/4 3/3/3 5/5/5 6/6/6 -f 6/6/6 5/5/5 7/7/7 8/8/8 -f 8/8/8 7/7/7 9/9/9 10/10/10 -f 1/1/1 10/11/10 9/12/9 2/2/2 -f 2/2/2 11/13/11 12/14/12 3/3/3 -f 3/3/3 12/14/12 13/15/13 5/5/5 -f 5/5/5 13/15/13 14/16/14 7/7/7 -f 7/7/7 14/16/14 15/17/15 9/9/9 -f 9/12/9 15/18/15 11/13/11 2/2/2 -f 11/13/11 16/19/16 17/20/17 12/14/12 -f 12/14/12 17/20/17 18/21/18 13/15/13 -f 13/15/13 18/21/18 19/22/19 14/16/14 -f 14/16/14 19/22/19 20/23/20 15/17/15 -f 15/18/15 20/24/20 16/19/16 11/13/11 -f 16/19/16 21/25/21 22/26/22 17/20/17 -f 17/20/17 22/26/22 23/27/23 18/21/18 -f 18/21/18 23/27/23 24/28/24 19/22/19 -f 19/22/19 24/28/24 25/29/25 20/23/20 -f 20/24/20 25/30/25 21/25/21 16/19/16 -f 21/25/21 26/31/26 27/32/27 22/26/22 -f 22/26/22 27/32/27 28/33/28 23/27/23 -f 23/27/23 28/33/28 29/34/29 24/28/24 -f 24/28/24 29/34/29 30/35/30 25/29/25 -f 25/30/25 30/36/30 26/31/26 21/25/21 -f 26/37/26 31/38/31 32/39/32 27/40/27 -f 27/40/27 32/39/32 33/41/33 28/42/28 -f 28/42/28 33/41/33 34/43/34 29/44/29 -f 29/44/29 34/43/34 35/45/35 30/46/30 -f 30/47/30 35/48/35 31/38/31 26/37/26 -f 31/38/31 36/49/36 37/50/37 32/39/32 -f 32/39/32 37/50/37 38/51/38 33/41/33 -f 33/41/33 38/51/38 39/52/39 34/43/34 -f 34/43/34 39/52/39 40/53/40 35/45/35 -f 35/48/35 40/54/40 36/49/36 31/38/31 -f 36/49/36 1/1/1 4/4/4 37/50/37 -f 37/50/37 4/4/4 6/6/6 38/51/38 -f 38/51/38 6/6/6 8/8/8 39/52/39 -f 39/52/39 8/8/8 10/10/10 40/53/40 -f 1/1/1 36/49/36 40/54/40 10/11/10 -f 41/55/41 42/56/42 43/57/43 44/58/44 -f 44/59/44 43/60/43 45/61/45 46/62/46 -f 46/62/46 45/61/45 47/63/47 48/64/48 -f 48/64/48 47/63/47 49/65/49 50/66/50 -f 41/55/41 50/66/50 49/65/49 42/56/42 -f 42/56/42 51/67/51 52/68/52 43/57/43 -f 43/60/43 52/69/52 53/70/53 45/61/45 -f 45/61/45 53/70/53 54/71/54 47/63/47 -f 47/63/47 54/71/54 55/72/55 49/65/49 -f 49/65/49 55/72/55 51/67/51 42/56/42 -f 51/67/51 56/73/56 57/74/57 52/68/52 -f 52/69/52 57/75/57 58/76/58 53/70/53 -f 53/70/53 58/76/58 59/77/59 54/71/54 -f 54/71/54 59/77/59 60/78/60 55/72/55 -f 55/72/55 60/78/60 56/73/56 51/67/51 -f 56/73/56 61/79/21 62/80/61 57/74/57 -f 57/75/57 62/81/61 63/82/62 58/76/58 -f 58/76/58 63/82/62 64/83/63 59/77/59 -f 59/77/59 64/83/63 65/84/64 60/78/60 -f 60/78/60 65/84/64 61/79/21 56/73/56 -f 61/85/21 66/86/65 67/87/66 62/88/61 -f 62/35/61 67/89/66 68/90/67 63/91/62 -f 63/91/62 68/90/67 69/92/68 64/93/63 -f 64/93/63 69/92/68 70/94/69 65/95/64 -f 65/95/64 70/94/69 66/86/65 61/85/21 -f 66/86/65 71/96/70 72/97/71 67/87/66 -f 67/89/66 72/98/71 73/99/72 68/90/67 -f 68/90/67 73/99/72 74/100/73 69/92/68 -f 69/92/68 74/100/73 75/101/74 70/94/69 -f 70/94/69 75/101/74 71/96/70 66/86/65 -f 71/96/70 76/102/75 77/103/76 72/97/71 -f 72/98/71 77/104/76 78/105/77 73/99/72 -f 73/99/72 78/105/77 79/106/78 74/100/73 -f 74/100/73 79/106/78 80/107/79 75/101/74 -f 75/101/74 80/107/79 76/102/75 71/96/70 -f 76/102/75 41/55/41 44/58/44 77/103/76 -f 77/104/76 44/59/44 46/62/46 78/105/77 -f 78/105/77 46/62/46 48/64/48 79/106/78 -f 79/106/78 48/64/48 50/66/50 80/107/79 -f 41/55/41 76/102/75 80/107/79 50/66/50 -f 81/108/80 82/109/81 83/110/82 84/111/83 -f 84/9/83 83/17/82 85/112/78 86/113/48 -f 86/113/48 85/112/78 87/114/77 88/115/46 -f 88/115/46 87/114/77 89/116/84 90/117/85 -f 81/108/80 90/117/85 89/116/84 82/109/81 -f 82/109/81 91/118/86 92/119/87 83/110/82 -f 83/17/82 92/23/87 93/120/73 85/112/78 -f 85/112/78 93/120/73 94/121/72 87/114/77 -f 87/114/77 94/121/72 95/122/88 89/116/84 -f 89/116/84 95/122/88 91/118/86 82/109/81 -f 91/118/86 96/123/65 97/124/69 92/119/87 -f 92/23/87 97/29/69 98/125/68 93/120/73 -f 93/120/73 98/125/68 99/126/67 94/121/72 -f 94/121/72 99/126/67 100/127/66 95/122/88 -f 95/122/88 100/127/66 96/123/65 91/118/86 -f 96/123/65 101/85/21 102/88/64 97/124/69 -f 97/29/69 102/35/64 103/91/63 98/125/68 -f 98/125/68 103/91/63 104/93/62 99/126/67 -f 99/126/67 104/93/62 105/95/61 100/127/66 -f 100/127/66 105/95/61 101/85/21 96/123/65 -f 101/128/21 106/129/56 107/130/60 102/131/64 -f 102/46/64 107/45/60 108/132/59 103/133/63 -f 103/133/63 108/132/59 109/134/58 104/135/62 -f 104/135/62 109/134/58 110/136/57 105/137/61 -f 105/137/61 110/136/57 106/129/56 101/128/21 -f 106/129/56 111/138/89 112/139/90 107/130/60 -f 107/45/60 112/53/90 113/140/54 108/132/59 -f 108/132/59 113/140/54 114/141/53 109/134/58 -f 109/134/58 114/141/53 115/142/91 110/136/57 -f 110/136/57 115/142/91 111/138/89 106/129/56 -f 111/138/89 116/143/92 117/144/93 112/139/90 -f 112/53/90 117/10/93 118/145/47 113/140/54 -f 113/140/54 118/145/47 119/146/45 114/141/53 -f 114/141/53 119/146/45 120/147/94 115/142/91 -f 115/142/91 120/147/94 116/143/92 111/138/89 -f 116/143/92 81/108/80 84/111/83 117/144/93 -f 117/10/93 84/9/83 86/113/48 118/145/47 -f 118/145/47 86/113/48 88/115/46 119/146/45 -f 119/146/45 88/115/46 90/117/85 120/147/94 -f 81/108/80 116/143/92 120/147/94 90/117/85 -f 121/148/95 122/149/96 123/150/97 124/151/98 -f 124/151/98 123/150/97 125/152/39 126/153/8 -f 126/153/8 125/152/39 127/154/38 128/155/6 -f 128/155/6 127/154/38 129/156/99 130/157/100 -f 121/148/95 130/103/100 129/58/99 122/149/96 -f 122/149/96 131/158/101 132/159/102 123/150/97 -f 123/150/97 132/159/102 133/160/34 125/152/39 -f 125/152/39 133/160/34 134/161/33 127/154/38 -f 127/154/38 134/161/33 135/162/103 129/156/99 -f 129/58/99 135/57/103 131/158/101 122/149/96 -f 131/158/101 136/163/26 137/164/104 132/159/102 -f 132/159/102 137/164/104 138/165/105 133/160/34 -f 133/160/34 138/165/105 139/166/28 134/161/33 -f 134/161/33 139/166/28 140/167/106 135/162/103 -f 135/57/103 140/68/106 136/163/26 131/158/101 -f 136/163/26 141/168/21 142/169/25 137/164/104 -f 137/164/104 142/169/25 143/170/24 138/165/105 -f 138/165/105 143/170/24 144/171/23 139/166/28 -f 139/166/28 144/171/23 145/172/22 140/167/106 -f 140/68/106 145/74/22 141/168/21 136/163/26 -f 141/168/21 146/173/16 147/174/107 142/169/25 -f 142/169/25 147/174/107 148/175/19 143/170/24 -f 143/170/24 148/175/19 149/176/18 144/171/23 -f 144/171/23 149/176/18 150/177/108 145/172/22 -f 145/74/22 150/80/108 146/173/16 141/168/21 -f 146/178/16 151/179/109 152/180/110 147/181/107 -f 147/181/107 152/180/110 153/182/14 148/183/19 -f 148/183/19 153/182/14 154/184/13 149/185/18 -f 149/185/18 154/184/13 155/186/111 150/187/108 -f 150/88/108 155/87/111 151/179/109 146/178/16 -f 151/179/109 156/188/112 157/189/113 152/180/110 -f 152/180/110 157/189/113 158/190/7 153/182/14 -f 153/182/14 158/190/7 159/191/5 154/184/13 -f 154/184/13 159/191/5 160/192/114 155/186/111 -f 155/87/111 160/97/114 156/188/112 151/179/109 -f 156/188/112 121/148/95 124/151/98 157/189/113 -f 157/189/113 124/151/98 126/153/8 158/190/7 -f 158/190/7 126/153/8 128/155/6 159/191/5 -f 159/191/5 128/155/6 130/157/100 160/192/114 -f 121/148/95 156/188/112 160/97/114 130/103/100 -f 161/193/80 162/194/115 163/60/82 164/59/83 -f 164/195/83 163/196/82 165/197/78 166/198/48 -f 166/198/48 165/197/78 167/199/77 168/200/46 -f 168/200/46 167/199/77 169/201/84 170/202/85 -f 161/193/80 170/202/85 169/201/84 162/194/115 -f 162/194/115 171/203/86 172/69/87 163/60/82 -f 163/196/82 172/204/87 173/205/73 165/197/78 -f 165/197/78 173/205/73 174/206/72 167/199/77 -f 167/199/77 174/206/72 175/207/88 169/201/84 -f 169/201/84 175/207/88 171/203/86 162/194/115 -f 171/203/86 176/208/116 177/75/69 172/69/87 -f 172/204/87 177/209/69 178/210/68 173/205/73 -f 173/205/73 178/210/68 179/211/67 174/206/72 -f 174/206/72 179/211/67 180/212/66 175/207/88 -f 175/207/88 180/212/66 176/208/116 171/203/86 -f 176/208/116 181/213/21 182/81/64 177/75/69 -f 177/209/69 182/214/64 183/215/63 178/210/68 -f 178/210/68 183/215/63 184/216/62 179/211/67 -f 179/211/67 184/216/62 185/217/61 180/212/66 -f 180/212/66 185/217/61 181/213/21 176/208/116 -f 181/34/21 186/218/117 187/89/60 182/35/64 -f 182/36/64 187/219/60 188/220/59 183/31/63 -f 183/31/63 188/220/59 189/221/58 184/32/62 -f 184/32/62 189/221/58 190/222/57 185/33/61 -f 185/33/61 190/222/57 186/218/117 181/34/21 -f 186/218/117 191/223/89 192/98/90 187/89/60 -f 187/219/60 192/224/90 193/225/54 188/220/59 -f 188/220/59 193/225/54 194/226/53 189/221/58 -f 189/221/58 194/226/53 195/227/91 190/222/57 -f 190/222/57 195/227/91 191/223/89 186/218/117 -f 191/223/89 196/228/92 197/104/93 192/98/90 -f 192/224/90 197/229/93 198/230/47 193/225/54 -f 193/225/54 198/230/47 199/231/45 194/226/53 -f 194/226/53 199/231/45 200/232/94 195/227/91 -f 195/227/91 200/232/94 196/228/92 191/223/89 -f 196/228/92 161/193/80 164/59/83 197/104/93 -f 197/229/93 164/195/83 166/198/48 198/230/47 -f 198/230/47 166/198/48 168/200/46 199/231/45 -f 199/231/45 168/200/46 170/202/85 200/232/94 -f 161/193/80 196/228/92 200/232/94 170/202/85 -f 201/233/1 202/234/2 203/235/118 204/236/119 -f 204/111/119 203/110/118 205/237/5 206/238/6 -f 206/238/6 205/237/5 207/239/7 208/240/8 -f 208/240/8 207/239/7 209/241/120 210/242/121 -f 201/233/1 210/242/121 209/241/120 202/234/2 -f 202/234/2 211/243/122 212/244/123 203/235/118 -f 203/110/118 212/119/123 213/245/124 205/237/5 -f 205/237/5 213/245/124 214/246/125 207/239/7 -f 207/239/7 214/246/125 215/247/126 209/241/120 -f 209/241/120 215/247/126 211/243/122 202/234/2 -f 216/248/127 221/249/36 222/250/37 217/251/128 -f 217/139/128 222/144/37 223/252/129 218/253/130 -f 218/253/130 223/252/129 224/254/131 219/255/132 -f 219/255/132 224/254/131 225/256/40 220/257/133 -f 220/257/133 225/256/40 221/249/36 216/248/127 -f 221/249/36 201/233/1 204/236/119 222/250/37 -f 222/144/37 204/111/119 206/238/6 223/252/129 -f 223/252/129 206/238/6 208/240/8 224/254/131 -f 224/254/131 208/240/8 210/242/121 225/256/40 -f 201/233/1 221/249/36 225/256/40 210/242/121 -f 228/149/134 229/152/135 243/258/136 -f 230/188/137 231/190/138 244/259/139 -f 232/178/140 233/183/141 245/260/142 -f 234/245/143 235/247/144 246/261/145 -f 236/238/146 237/242/147 247/262/148 -f 240/173/149 241/175/150 248/263/151 -f 229/264/135 227/178/152 241/265/150 239/115/153 237/266/147 235/33/144 233/267/141 231/64/138 -f 238/253/154 239/257/153 249/268/155 -f 226/269/156 228/270/134 230/271/137 232/272/140 234/273/143 236/274/146 238/275/154 240/276/149 -f 226/163/156 227/165/152 242/277/157 -f 227/165/152 229/152/135 242/277/157 -f 229/152/135 228/149/134 242/277/157 -f 228/149/134 226/163/156 242/277/157 -f 229/152/135 231/190/138 243/258/136 -f 231/190/138 230/188/137 243/258/136 -f 230/188/137 228/149/134 243/258/136 -f 231/190/138 233/183/141 244/259/139 -f 233/183/141 232/178/140 244/259/139 -f 232/178/140 230/188/137 244/259/139 -f 233/183/141 235/247/144 245/260/142 -f 235/247/144 234/245/143 245/260/142 -f 234/245/143 232/178/140 245/260/142 -f 235/247/144 237/242/147 246/261/145 -f 237/242/147 236/238/146 246/261/145 -f 236/238/146 234/245/143 246/261/145 -f 237/242/147 239/257/153 247/262/148 -f 239/257/153 238/253/154 247/262/148 -f 238/253/154 236/238/146 247/262/148 -f 241/175/150 227/165/152 248/263/151 -f 227/165/152 226/163/156 248/263/151 -f 226/163/156 240/173/149 248/263/151 -f 239/257/153 241/278/150 249/268/155 -f 241/278/150 240/279/149 249/268/155 -f 240/279/149 238/253/154 249/268/155 diff --git a/chains/textures/chain_brass_inv.png b/chains/textures/chain_brass_inv.png deleted file mode 100644 index 8c2d554..0000000 Binary files a/chains/textures/chain_brass_inv.png and /dev/null differ diff --git a/chains/textures/chain_wrought_iron_inv.png b/chains/textures/chain_wrought_iron_inv.png deleted file mode 100644 index c552f7b..0000000 Binary files a/chains/textures/chain_wrought_iron_inv.png and /dev/null differ diff --git a/chains/textures/chains_brass.png b/chains/textures/chains_brass.png deleted file mode 100644 index e2fb20d..0000000 Binary files a/chains/textures/chains_brass.png and /dev/null differ diff --git a/chains/textures/chains_candle.png b/chains/textures/chains_candle.png deleted file mode 100644 index d709a8c..0000000 Binary files a/chains/textures/chains_candle.png and /dev/null differ diff --git a/chains/textures/chains_candle_flame.png b/chains/textures/chains_candle_flame.png deleted file mode 100644 index a34b9a5..0000000 Binary files a/chains/textures/chains_candle_flame.png and /dev/null differ diff --git a/chains/textures/chains_wrought_iron.png b/chains/textures/chains_wrought_iron.png deleted file mode 100644 index 29af8db..0000000 Binary files a/chains/textures/chains_wrought_iron.png and /dev/null differ diff --git a/chains/textures/top_chain_brass_inv.png b/chains/textures/top_chain_brass_inv.png deleted file mode 100644 index dc8183c..0000000 Binary files a/chains/textures/top_chain_brass_inv.png and /dev/null differ diff --git a/chains/textures/top_chain_wrought_iron_inv.png b/chains/textures/top_chain_wrought_iron_inv.png deleted file mode 100644 index cddf6c9..0000000 Binary files a/chains/textures/top_chain_wrought_iron_inv.png and /dev/null differ diff --git a/computer/miscitems.lua b/computer/miscitems.lua index 5f63c7d..a750378 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -8,7 +8,7 @@ local S = homedecor_i18n.gettext if (not minetest.get_modpath("homedecor")) then - minetest.register_craftitem(":homedecor:plastic_sheeting", { + minetest.register_craftitem(":basic_materials:plastic_sheet", { description = S("Plastic sheet"), inventory_image = "homedecor_plastic_sheeting.png", }) @@ -51,7 +51,7 @@ if (not minetest.get_modpath("homedecor")) then minetest.register_craft({ type = "cooking", - output = "homedecor:plastic_sheeting", + output = "basic_materials:plastic_sheet", recipe = "homedecor:plastic_base", }) @@ -63,7 +63,7 @@ if (not minetest.get_modpath("homedecor")) then minetest.register_craft({ type = 'fuel', - recipe = 'homedecor:plastic_sheeting', + recipe = 'basic_materials:plastic_sheet', burntime = 30, }) diff --git a/computer/recipes.lua b/computer/recipes.lua index 51337ad..d562425 100644 --- a/computer/recipes.lua +++ b/computer/recipes.lua @@ -5,50 +5,50 @@ minetest.register_craft({ output = "computer:shefriendSOO", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "group:wood", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:slaystation", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "group:wood", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:vanio", recipe = { - { "homedecor:plastic_sheeting", "", "" }, + { "basic_materials:plastic_sheet", "", "" }, { "default:glass", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:specter", recipe = { - { "", "", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "", "", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:slaystation2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:admiral64", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:wood", "group:wood", "group:wood" } } }) @@ -56,7 +56,7 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:admiral128", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } } }) @@ -64,16 +64,16 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:wee", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:copper_ingot", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:piepad", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" } } }) @@ -82,9 +82,9 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:monitor", recipe = { - { "homedecor:plastic_sheeting", "default:glass","" }, - { "homedecor:plastic_sheeting", "default:glass","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "default:glass","" }, + { "basic_materials:plastic_sheet", "default:glass","" }, + { "basic_materials:plastic_sheet", "default:mese_crystal_fragment", "basic_materials:plastic_sheet" } } }) @@ -92,35 +92,35 @@ minetest.register_craft({ output = "computer:router", recipe = { { "default:steel_ingot","","" }, - { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "default:steel_ingot" ,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "default:mese_crystal_fragment","basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:tower", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "default:steel_ingot","" }, + { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:coal_lump", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", } + { "basic_materials:plastic_sheet", "default:steel_ingot","" }, + { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet", } } }) @@ -136,8 +136,8 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:tetris_arcade", recipe = { - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting", }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet", }, { "dye:black", "default:glass", "dye:black" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet" } } }) diff --git a/concrete/depends.txt b/concrete/depends.txt index c48fe0d..269e83a 100644 --- a/concrete/depends.txt +++ b/concrete/depends.txt @@ -1,3 +1,4 @@ default +basic_materials intllib? diff --git a/concrete/init.lua b/concrete/init.lua index ca04733..89a3cf1 100644 --- a/concrete/init.lua +++ b/concrete/init.lua @@ -23,21 +23,12 @@ else steel_ingot = "default:steel_ingot" end -minetest.register_craft({ - output = 'technic:rebar 6', - recipe = { - {'','', steel_ingot}, - {'',steel_ingot,''}, - {steel_ingot, '', ''}, - } -}) - minetest.register_craft({ output = 'technic:concrete 5', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'technic:rebar','default:stone','technic:rebar'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'basic_materials:steel_bar','default:stone','basic_materials:steel_bar'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -51,9 +42,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:concrete_post 12', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -66,11 +57,6 @@ minetest.register_craft({ } }) -minetest.register_craftitem(":technic:rebar", { - description = S("Rebar"), - inventory_image = "technic_rebar.png", -}) - minetest.register_node(":technic:concrete", { description = S("Concrete Block"), tiles = {"technic_concrete_block.png",}, diff --git a/concrete/textures/technic_rebar.png b/concrete/textures/technic_rebar.png deleted file mode 100644 index 16d1fc5..0000000 Binary files a/concrete/textures/technic_rebar.png and /dev/null differ diff --git a/dreambuilder_mp_extras/depends.txt b/dreambuilder_mp_extras/depends.txt index 4ad96d5..635f0ae 100644 --- a/dreambuilder_mp_extras/depends.txt +++ b/dreambuilder_mp_extras/depends.txt @@ -1 +1,3 @@ default +technic +basic_materials diff --git a/dreambuilder_mp_extras/init.lua b/dreambuilder_mp_extras/init.lua index e2ee62f..46ae07c 100644 --- a/dreambuilder_mp_extras/init.lua +++ b/dreambuilder_mp_extras/init.lua @@ -36,3 +36,56 @@ minetest.override_item("default:apple", { mesh = "default_apple.obj", tiles = {"default_apple_3d.png"} }) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:steel_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:gold_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:bronze_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:copper_ingot", + } +}) + +minetest.clear_craft({output = "default:chest_locked"}) + +minetest.register_craft({ + output = "default:chest_locked", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "basic_materials:padlock", "group:wood" }, + { "group:wood", "group:wood", "group:wood" } + } +}) + +minetest.register_craft({ + output = "default:chest_locked", + type = "shapeless", + recipe = { + "default:chest", + "basic_materials:padlock" + } +}) + diff --git a/extranodes/depends.txt b/extranodes/depends.txt index 4dcb99e..0279a18 100644 --- a/extranodes/depends.txt +++ b/extranodes/depends.txt @@ -1,5 +1,6 @@ default technic_worldgen +basic_materials concrete unifieddyes? intllib? diff --git a/extranodes/init.lua b/extranodes/init.lua index 1f65c29..8734476 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -57,10 +57,10 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) - stairsplus:register_all("technic", "brass_block", "technic:brass_block", { + stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { description=S("Brass Block"), groups={cracky=1, not_in_creative_inventory=1}, - tiles={"technic_brass_block.png"}, + tiles={"basic_materials_brass_block.png"}, }) function register_technic_stairs_alias(modname, origname, newmod, newname) diff --git a/framedglass/depends.txt b/framedglass/depends.txt index 765575d..9db6e0e 100644 --- a/framedglass/depends.txt +++ b/framedglass/depends.txt @@ -1,2 +1,3 @@ default -dye? +unifieddyes +dye diff --git a/framedglass/init.lua b/framedglass/init.lua index d42a07b..4d36165 100644 --- a/framedglass/init.lua +++ b/framedglass/init.lua @@ -1,4 +1,4 @@ --- Minetest 0.4.7 mod: framedglass +-- Minetest 0.4.17 mod: framedglass framedglass = {} @@ -68,147 +68,86 @@ minetest.register_node("framedglass:wooden_framed_obsidian_glass", { sounds = default.node_sound_glass_defaults(), }) --- helper functions copied partly from Unified Dyes - -local creative_mode = minetest.setting_getbool("creative_mode") - -local function select_node(pointed_thing) - local pos = pointed_thing.under - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - - if not def or not def.buildable_to then - pos = pointed_thing.above - node = minetest.get_node_or_nil(pos) - def = node and minetest.registered_nodes[node.name] - end - return def and pos, def -end - -local function is_buildable_to(placer_name, ...) - for _, pos in ipairs({...}) do - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - if not (def and def.buildable_to) or minetest.is_protected(pos, placer_name) then - return false - end - end - return true -end - -function framedglass.color_on_punch(pos, node, puncher, pointed_thing) - local itemstack = puncher:get_wielded_item() - local itemname = itemstack:get_name() - - if not string.find(itemname, "dye:") - and not string.find(itemname, "unifieddyes:") then - return itemstack - end - - local a,b = string.find(node.name, "_glass") - local oldcolor = string.sub(node.name, b + 1) - local newcolor = string.sub(itemname, string.find(itemname, ":") + 1) - - local oldcolor2 = string.gsub(oldcolor, "darkgreen", "dark_green") - local oldcolor2 = string.gsub(oldcolor2, "darkgrey", "dark_grey") - - local newcolor2 = string.gsub(newcolor, "dark_green", "darkgreen") - local newcolor2 = string.gsub(newcolor2, "dark_grey", "darkgrey") - - if oldcolor == newcolor2 then - minetest.chat_send_player(puncher:get_player_name(), "That node is already "..newcolor.."." ) - return itemstack - end - - if not (newcolor == "dark_grey" - or newcolor == "dark_green" - or minetest.registered_nodes["framedglass:steel_framed_obsidian_glass"..newcolor]) then - minetest.chat_send_player(puncher:get_player_name(), "Framed glass doesn't support "..newcolor.."." ) - return itemstack - end - - local inv = puncher:get_inventory() - local prevdye = "dye:"..oldcolor2 - - if not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then - if inv:room_for_item("main", prevdye) then - inv:add_item("main", prevdye) - else - minetest.add_item(pos, prevdye) - end - end - - minetest.set_node(pos, { name = "framedglass:steel_framed_obsidian_glass"..newcolor2 }) - itemstack:take_item() - return itemstack -end - -local return_dye_after_dig = function(pos, oldnode, oldmetadata, digger) - - local a,b = string.find(oldnode.name, "_glass") - local oldcolor = string.sub(oldnode.name, b + 1) - local oldcolor2 = string.gsub(oldcolor, "darkgreen", "dark_green") - local oldcolor2 = string.gsub(oldcolor2, "darkgrey", "dark_grey") - - local prevdye = "dye:"..oldcolor2 - - local inv = digger:get_inventory() - - if prevdye and not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then - if inv:room_for_item("main", prevdye) then - inv:add_item("main", prevdye) - else - minetest.add_item(pos, prevdye) - end - end -end - minetest.register_node("framedglass:steel_framed_obsidian_glass", { description = "Steel-framed Obsidian Glass", drawtype = "glasslike_framed", tiles = {"framedglass_steel_frame.png","framedglass_glass_face_clean.png"}, paramtype = "light", sunlight_propagates = true, - groups = {cracky=3,oddly_breakable_by_hand=3}, + palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "framedglass:steel_framed_obsidian_glass_tinted", + groups = {cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, + sounds = default.node_sound_glass_defaults(), +}) + +minetest.register_node("framedglass:steel_framed_obsidian_glass_tinted", { + description = "Steel-framed Obsidian Glass", + drawtype = "glasslike_framed", + tiles = { + { name = "framedglass_steel_frame.png", color = "white" }, + "framedglass_whiteglass.png", + }, + palette = "unifieddyes_palette_extended.png", + inventory_image = minetest.inventorycube("framedglass_glass_face_inv_static.png"), + paramtype = "light", + paramtype2 = "color", + sunlight_propagates = true, + is_ground_content = true, + use_texture_alpha = true, + groups = {cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), - on_punch = framedglass.color_on_punch, - after_dig_node = return_dye_after_dig }) -function add_coloured_framedglass(name, desc, color) - minetest.register_node( "framedglass:steel_framed_obsidian_glass"..name, { - description = "Steel-framed "..desc.." Obsidian Glass", - tiles = { - "framedglass_steel_frame.png", - { name = "framedglass_whiteglass.png", color = color } - }, - drawtype = "glasslike_framed", - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - use_texture_alpha = true, - groups = {cracky=3, not_in_creative_inventory=1}, - sounds = default.node_sound_glass_defaults(), - on_punch = framedglass.color_on_punch, - after_dig_node = return_dye_after_dig, - drop = "framedglass:steel_framed_obsidian_glass" - }) +-- crafts! + +unifieddyes.register_color_craft({ + output = "framedglass:steel_framed_obsidian_glass_tinted", + type = "shapeless", + palette = "extended", + neutral_node = "framedglass:steel_framed_obsidian_glass", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +-- Convert old nodes + +local static_colors = { + red = 4*24 , + orange = 4*24 + 2 , + yellow = 4*24 + 4 , + green = 4*24 + 8 , + cyan = 4*24 + 12 , + blue = 4*24 + 16 , + violet = 4*24 + 18 , + magenta = 4*24 + 20 , + darkgreen = 8*24 + 8 , + pink = 23 , + brown = 8*24 + 2 , + white = 10*24 , + grey = 10*24 + 7 , + darkgrey = 10*24 + 11 , + black = 10*24 + 15 +} + +local old_nodes = {} +for k, v in pairs(static_colors) do + table.insert(old_nodes, "framedglass:steel_framed_obsidian_glass"..k) end -add_coloured_framedglass ("red", "Red", 0xffff0000) -add_coloured_framedglass ("orange", "Orange", 0xfffe7f00) -add_coloured_framedglass ("yellow", "Yellow", 0xffffff01) -add_coloured_framedglass ("green", "Green", 0xff0cff00) -add_coloured_framedglass ("cyan", "Cyan", 0xff7affff) -add_coloured_framedglass ("blue", "Blue", 0xff1600ff) -add_coloured_framedglass ("violet", "Violet", 0xff7d00ff) -add_coloured_framedglass ("magenta", "Magenta", 0xfffd05ff) - -add_coloured_framedglass ("darkgreen", "Dark Green", 0xff144f00) -add_coloured_framedglass ("pink", "Pink", 0xffffa4a4) -add_coloured_framedglass ("brown", "Brown", 0xff542a00) - -add_coloured_framedglass ("white", "White", 0xffffffff) -add_coloured_framedglass ("grey", "Grey", 0xff7f817e) -add_coloured_framedglass ("darkgrey", "Dark Grey", 0xff3f403e) -add_coloured_framedglass ("black", "Black", 0xff000000) +minetest.register_lbm({ + label = "Convert old framedglass static-colored nodes", + name = "framedglass:convert_static", + run_at_every_load = false, + nodenames = old_nodes, + action = function(pos, node) + local oldcolor = string.sub(node.name, 40) + if oldcolor then + minetest.swap_node(pos, {name = "framedglass:steel_framed_obsidian_glass_tinted", + param2 = static_colors[oldcolor] }) + else + minetest.swap_node(pos, {name = "framedglass:steel_framed_obsidian_glass", param2 = 0 }) + end + end +}) diff --git a/framedglass/textures/framedglass_glass_face_inv_static.png b/framedglass/textures/framedglass_glass_face_inv_static.png new file mode 100644 index 0000000..ff43048 Binary files /dev/null and b/framedglass/textures/framedglass_glass_face_inv_static.png differ diff --git a/gloopblocks/crafts.lua b/gloopblocks/crafts.lua index cacea22..634ea9b 100644 --- a/gloopblocks/crafts.lua +++ b/gloopblocks/crafts.lua @@ -41,31 +41,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - type = "shapeless", - output = "gloopblocks:wet_cement", - recipe = { - "bucket:bucket_water", - "default:gravel", - }, - replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},}, -}) - -minetest.register_craft({ - type = "cooking", - output = "gloopblocks:cement", - recipe = "gloopblocks:wet_cement", - cooktime = 8 -}) - -minetest.register_craft({ - output = "default:gravel", - recipe = { - {"gloopblocks:cement"}, - }, -}) - - if minetest.get_modpath("glooptest") then minetest.register_craft({ @@ -194,24 +169,6 @@ minetest.register_craft({ } }) -if minetest.get_modpath("building_blocks") then - minetest.register_craft({ - output = "default:wood 4", - recipe = { - {"building_blocks:sticks", "building_blocks:sticks"}, - {"building_blocks:sticks", "building_blocks:sticks"}, - } - }) -else - minetest.register_craft({ - output = "default:wood", - recipe = { - {"default:stick", "default:stick"}, - {"default:stick", "default:stick"}, - } - }) -end - minetest.register_craft({ output = "gloopblocks:pavement 5", recipe = { diff --git a/gloopblocks/depends.txt b/gloopblocks/depends.txt index 6b7584f..a9d85c2 100644 --- a/gloopblocks/depends.txt +++ b/gloopblocks/depends.txt @@ -1,9 +1,9 @@ default +basic_materials moreblocks? stairs? glooptest? gloopores? -building_blocks? intllib? wool? xdecor? diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua index c759119..a20b833 100644 --- a/gloopblocks/init.lua +++ b/gloopblocks/init.lua @@ -45,14 +45,6 @@ if not minetest.setting_getbool("pbj_pup_alias_nyancat") then end end -minetest.register_node("gloopblocks:cement", { - description = S("Cement"), - tiles = {"gloopblocks_cement.png"}, - is_ground_content = true, - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_node("gloopblocks:evil_block", { description = S("Evil Block"), tiles = {"gloopblocks_evil_block.png"}, @@ -167,6 +159,7 @@ if not minetest.get_modpath("usesdirt") then local dirt_stone_tex = "default_stone.png^(default_dirt.png^[mask:gloopblocks_dirt_stone_mask.png)" local dirt_ladder_tex = "(default_dirt.png^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png" + local dirt_brick_ladder_tex = "(("..dirt_brick_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png" local dirt_cobble_ladder_tex = "(("..dirt_cobble_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png" local dirt_stone_ladder_tex = "(("..dirt_stone_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png" @@ -176,6 +169,45 @@ if not minetest.get_modpath("usesdirt") then groups = {snappy=2,choppy=1,oddly_breakable_by_hand=2}, }) + minetest.register_node(":usesdirt:dirt_brick_ladder", { + description = "Dirt Brick Ladder", + drawtype = "signlike", + tiles = { dirt_brick_ladder_tex }, + inventory_image = dirt_brick_ladder_tex, + wield_image = dirt_brick_ladder_tex, + paramtype = "light", + paramtype2 = "wallmounted", + is_ground_content = true, + walkable = false, + climbable = true, + selection_box = { + type = "wallmounted", + --wall_top = = + --wall_bottom = = + --wall_side = = + }, + groups = {cracky=3, stone=2}, + legacy_wallmounted = true, + }) + minetest.register_craft({ + output = 'usesdirt:dirt_brick_ladder 3', + recipe = { + {'usesdirt:dirt_brick', '', 'usesdirt:dirt_brick'}, + {'usesdirt:dirt_brick', 'usesdirt:dirt_brick','usesdirt:dirt_brick'}, + {'usesdirt:dirt_brick','','usesdirt:dirt_brick'}, + } + }) + + default.register_fence(":usesdirt:dirt_brick_fence", { + description = "Dirt Brick Fence", + texture = dirt_brick_tex, + inventory_image = "default_fence_overlay.png^("..dirt_brick_tex..")^default_fence_overlay.png^[makealpha:255,126,126", + wield_image = "default_fence_overlay.png^("..dirt_brick_tex..")^default_fence_overlay.png^[makealpha:255,126,126", + material = "usesdirt:dirt_brick", + groups = {cracky=3, stone=2}, + sounds = default.node_sound_stone_defaults() + }) + if minetest.get_modpath("moreblocks") then minetest.register_craft({ output = 'usesdirt:dirt_brick 24', @@ -196,7 +228,7 @@ if not minetest.get_modpath("usesdirt") then end minetest.register_node(":usesdirt:dirt_ladder", { - description = "Ladder", + description = "Dirt Ladder", drawtype = "signlike", tiles = { dirt_ladder_tex }, inventory_image = dirt_ladder_tex, @@ -252,7 +284,7 @@ if not minetest.get_modpath("usesdirt") then }) minetest.register_node(":usesdirt:dirt_cobble_stone_ladder", { - description = "Ladder", + description = "Dirt Cobble Stone Ladder", drawtype = "signlike", tiles = { dirt_cobble_ladder_tex }, inventory_image = dirt_cobble_ladder_tex, @@ -300,7 +332,7 @@ if not minetest.get_modpath("usesdirt") then }) minetest.register_node(":usesdirt:dirt_stone_ladder", { - description = "Ladder", + description = "Dirt Stone Ladder", drawtype = "signlike", tiles = { dirt_stone_ladder_tex }, inventory_image = dirt_stone_ladder_tex, @@ -329,8 +361,8 @@ if not minetest.get_modpath("usesdirt") then }) default.register_fence(":usesdirt:dirt_stone_fence", { - description = "Dirt Cobble Stone Fence", - texture = dirt_cobble_tex, + description = "Dirt Stone Fence", + texture = dirt_stone_tex, inventory_image = "default_fence_overlay.png^("..dirt_stone_tex..")^default_fence_overlay.png^[makealpha:255,126,126", wield_image = "default_fence_overlay.png^("..dirt_stone_tex..")^default_fence_overlay.png^[makealpha:255,126,126", material = "usesdirt:dirt_stone", @@ -360,35 +392,7 @@ if minetest.setting_getbool("gloopblocks_mossy_conversion") ~= false then end end end ---[[ -if minetest.get_modpath("xdecor") then - xdecor.worktable_nodes.gloopblocks = { - "oerkki_block", "stone_brick_mossy", "stone_mossy", "cobble_road", - "cobble_road_mossy", "cement", "pavement","rainbow_block", - "evil_block", "basalt", "pumice" - } - if minetest.setting_getbool("gloopblocks_mossy_conversion") then - local subnames = { - "", "_nanoslab", "_micropanel", "_microslab", "_thinstair", "_cube", - "_panel", "_slab", "_doublepanel", "_halfstair", "_outerstair", - "_stair", "_innerstair" - } - for _, subname in ipairs(subnames) do - gloopblocks_register_mossy_conversion({ - -- Cobble --> Mossy Cobble - { "default:cobble"..subname, "default:mossycobble"..subname }, - -- Cobble Road --> Mossy Cobble Road - { "gloopblocks:cobble_road"..subname, "gloopblocks:cobble_road_mossy"..subname }, - -- Stone Brick --> Stone Brick Mossy - { "default:stonebrick"..subname, "gloopblocks:stone_brick_mossy"..subname}, - -- Stone --> Mossy Stone - { "default:stone"..subname, "gloopblocks:stone_mossy"..subname} - }) - end - end -end ---]] if minetest.get_modpath("moreblocks") then stairsplus:register_all("gloopblocks", "oerkki_block", "gloopblocks:oerkki_block", { @@ -438,9 +442,9 @@ if minetest.get_modpath("moreblocks") then sunlight_propagates = true, }) - stairsplus:register_all("gloopblocks", "cement", "gloopblocks:cement", { + stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", { description = S("Cement"), - tiles = {"gloopblocks_cement.png"}, + tiles = {"basic_materials_cement_block.png"}, groups = {cracky=2, not_in_creative_inventory=1}, sounds = default.node_sound_stone_defaults(), sunlight_propagates = true, @@ -826,11 +830,6 @@ minetest.register_tool("gloopblocks:sword_evil", { -- Other items -minetest.register_craftitem("gloopblocks:wet_cement", { - description = S("Wet Cement"), - inventory_image = "gloopblocks_wet_cement.png", -}) - minetest.register_craftitem("gloopblocks:evil_stick", { description = S("Evil Stick"), inventory_image = "gloopblocks_evil_stick.png", diff --git a/gloopblocks/textures/gloopblocks_cement.png b/gloopblocks/textures/gloopblocks_cement.png deleted file mode 100644 index c4c6a11..0000000 Binary files a/gloopblocks/textures/gloopblocks_cement.png and /dev/null differ diff --git a/gloopblocks/textures/gloopblocks_wet_cement.png b/gloopblocks/textures/gloopblocks_wet_cement.png deleted file mode 100644 index 6a7fbf1..0000000 Binary files a/gloopblocks/textures/gloopblocks_wet_cement.png and /dev/null differ diff --git a/glooptest/depends.txt b/glooptest/depends.txt index 331d858..b6b8c61 100644 --- a/glooptest/depends.txt +++ b/glooptest/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +basic_materials diff --git a/glooptest/parts_module/init.lua b/glooptest/parts_module/init.lua index b1a9202..fe3f9b1 100644 --- a/glooptest/parts_module/init.lua +++ b/glooptest/parts_module/init.lua @@ -1,20 +1,6 @@ glooptest.parts_module = {} glooptest.debug("MESSAGE","Loading Parts Module Now!") -minetest.register_craftitem("glooptest:chainlink", { - description = "Chainlink", - inventory_image = "glooptest_chainlink.png" -}) - -minetest.register_craft({ - output = "glooptest:chainlink 8", - recipe = { - {"", "default:steel_ingot", ""}, - {"default:steel_ingot", "", "default:steel_ingot"}, - {"", "default:steel_ingot", ""} - } -}) - minetest.register_node("glooptest:crystal_glass", { description = "Crystal Glass", drawtype = "allfaces", @@ -171,4 +157,4 @@ if LOAD_ORE_MODULE == true then {"glooptest:crystal_glass", "glooptest:crystal_glass", "glooptest:crystal_glass"} } }) -end \ No newline at end of file +end diff --git a/homedecor/bedroom.lua b/homedecor/bedroom.lua index ddb7f99..7059809 100644 --- a/homedecor/bedroom.lua +++ b/homedecor/bedroom.lua @@ -64,9 +64,9 @@ homedecor.register("bed_regular", { if itemname == "homedecor:bed_regular" then homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true) return itemstack - else - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack +-- else +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack end end }) @@ -92,10 +92,10 @@ homedecor.register("bed_extended", { after_dig_node = function(pos, oldnode, oldmetadata, digger) homedecor.unextend_bed(pos) end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, drop = "homedecor:bed_regular" }) @@ -128,10 +128,10 @@ homedecor.register("bed_kingsize", { inv:add_item("main", "homedecor:bed_regular 2") end end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, }) for _, w in pairs({ N_("mahogany"), N_("oak") }) do diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f924981..98f2470 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -6,63 +6,16 @@ local S = homedecor_i18n.gettext -- misc craftitems -minetest.register_craftitem("homedecor:terracotta_base", { - description = S("Uncooked Terracotta Base"), - inventory_image = "homedecor_terracotta_base.png", -}) - minetest.register_craftitem("homedecor:roof_tile_terracotta", { description = S("Terracotta Roof Tile"), inventory_image = "homedecor_roof_tile_terracotta.png", }) -minetest.register_craftitem("homedecor:oil_extract", { - description = S("Oil extract"), - inventory_image = "homedecor_oil_extract.png", -}) - -minetest.register_craftitem("homedecor:paraffin", { - description = S("Unprocessed paraffin"), - inventory_image = "homedecor_paraffin.png", -}) - -minetest.register_alias("homedecor:plastic_base", "homedecor:paraffin") - -minetest.register_craftitem("homedecor:plastic_sheeting", { - description = S("Plastic sheet"), - inventory_image = "homedecor_plastic_sheeting.png", -}) - -minetest.register_craftitem("homedecor:plastic_strips", { - description = S("Plastic strips"), - inventory_image = "homedecor_plastic_strips.png", -}) - minetest.register_craftitem("homedecor:drawer_small", { description = S("Small Wooden Drawer"), inventory_image = "homedecor_drawer_small.png", }) -minetest.register_craftitem("homedecor:ic", { - description = S("Simple Integrated Circuit"), - inventory_image = "homedecor_ic.png", -}) - -minetest.register_craftitem("homedecor:heating_element", { - description = S("Heating element"), - inventory_image = "homedecor_heating_element.png", -}) - -minetest.register_craftitem("homedecor:motor", { - description = S("Motor"), - inventory_image = "homedecor_motor.png", -}) - -minetest.register_craftitem("homedecor:power_crystal", { - description = S("Power Crystal"), - inventory_image = "homedecor_power_crystal.png", -}) - minetest.register_craftitem("homedecor:blank_canvas", { description = S("Blank Canvas"), inventory_image = "homedecor_blank_canvas.png" @@ -78,21 +31,6 @@ minetest.register_craftitem("homedecor:dvd_player", { inventory_image = "homedecor_dvd_player.png" }) -minetest.register_craftitem("homedecor:empty_spool", { - description = S("Empty wire spool"), - inventory_image = "homedecor_empty_spool.png" -}) - -minetest.register_craftitem("homedecor:copper_wire", { - description = S("Spool of copper wire"), - inventory_image = "homedecor_copper_wire.png" -}) - -minetest.register_craftitem("homedecor:steel_wire", { - description = S("Spool of steel wire"), - inventory_image = "homedecor_steel_wire.png" -}) - minetest.register_craftitem("homedecor:speaker_driver", { description = S("Speaker driver"), inventory_image = "homedecor_speaker_driver_inv.png" @@ -103,26 +41,6 @@ minetest.register_craftitem("homedecor:fan_blades", { inventory_image = "homedecor_fan_blades.png" }) -minetest.register_craftitem("homedecor:copper_strip", { - description = S("Copper Strip"), - inventory_image = "homedecor_copper_strip.png" -}) - -minetest.register_craftitem("homedecor:steel_strip", { - description = S("Steel Strip"), - inventory_image = "homedecor_steel_strip.png" -}) - -minetest.register_craftitem(":glooptest:chainlink", { - description = S("Steel chainlink"), - inventory_image = "homedecor_chainlink_steel.png" -}) - -minetest.register_craftitem("homedecor:chainlink_brass", { - description = S("Brass chainlink"), - inventory_image = "homedecor_chainlink_brass.png" -}) - minetest.register_craftitem("homedecor:soda_can", { description = S("Soda Can"), inventory_image = "homedecor_soda_can.png", @@ -134,165 +52,21 @@ minetest.register_craftitem("homedecor:coin", { inventory_image = "homedecor_coin.png", }) --- alternate crafting if mesecons is/isn't installed - -if not minetest.get_modpath("mesecons") then - - minetest.register_craftitem(":mesecons_materials:silicon", { - description = S("Silicon lump"), - inventory_image = "homedecor_silicon.png", - }) - - minetest.register_craft( { - output = "mesecons_materials:silicon 4", - recipe = { - { "default:sand", "default:sand" }, - { "default:sand", "default:steel_ingot" }, - }, - }) - -end - --- alternate crafting if technic is/isn't installed -if not minetest.get_modpath("technic") then - minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "homedecor_brass_ingot.png", - }) - - if minetest.get_modpath("moreores") then - minetest.register_craft( { - type = "shapeless", - output = "technic:brass_ingot 2", - recipe = { - "moreores:silver_ingot", - "default:copper_ingot", - }, - }) - else - minetest.register_craft( { - type = "shapeless", - output = "technic:brass_ingot 3", - recipe = { - "default:steel_ingot", - "default:copper_ingot", - "default:gold_ingot", - }, - }) - end -end - -minetest.register_alias("homedecor:brass_ingot", "technic:brass_ingot") - -- the actual crafts -minetest.register_craft( { - output = "homedecor:copper_strip 12", - recipe = { - { "", "default:copper_ingot", "" }, - { "default:copper_ingot", "", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:steel_strip 12", - recipe = { - { "", "default:steel_ingot", "" }, - { "default:steel_ingot", "", "" }, - }, -}) - minetest.register_craft( { output = "homedecor:fan_blades 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, + { "", "basic_materials:plastic_sheet", "" }, { "", "default:steel_ingot", "" }, - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" } - }, -}) - -minetest.register_craft( { - output = "homedecor:empty_spool 3", - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "", "homedecor:plastic_sheeting", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } - }, -}) - -minetest.register_craft( { - output = "homedecor:steel_wire 2", - type = "shapeless", - recipe = { - "default:steel_ingot", - "homedecor:empty_spool", - "homedecor:empty_spool", - }, -}) - -minetest.register_craft( { - output = "homedecor:copper_wire 2", - type = "shapeless", - recipe = { - "default:copper_ingot", - "homedecor:empty_spool", - "homedecor:empty_spool", - }, -}) - -minetest.register_craft( { - output = "homedecor:plastic_strips 3", - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } - }, -}) - -minetest.register_craft( { - output = "homedecor:heating_element 2", - recipe = { - { "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:motor 2", - recipe = { - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, - { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" } }, }) -minetest.register_craft({ - --type = "shapeless", - output = "homedecor:power_crystal 2", - recipe = { - { "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" }, - { "default:diamond", "default:gold_ingot", "default:diamond" } - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:power_crystal", - burntime = 50, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:terracotta_base 8", - recipe = { - "default:dirt", - "default:clay_lump", - "bucket:bucket_water" - }, - replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, -}) - minetest.register_craft({ type = "cooking", output = "homedecor:roof_tile_terracotta", - recipe = "homedecor:terracotta_base", + recipe = "basic_materials:terracotta_base", }) minetest.register_craft( { @@ -320,55 +94,12 @@ minetest.register_craft( { -- -minetest.register_craft({ - type = "shapeless", - output = "homedecor:oil_extract 4", - recipe = { - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves" - } -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:paraffin", - recipe = "homedecor:oil_extract", -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:plastic_sheeting", - recipe = "homedecor:paraffin", -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:oil_extract", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:paraffin", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:plastic_sheeting", - burntime = 30, -}) - minetest.register_craft( { output = "homedecor:flower_pot_green", recipe = { { "", "dye:dark_green", "" }, - { "homedecor:plastic_sheeting", "default:dirt", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -376,8 +107,8 @@ minetest.register_craft( { output = "homedecor:flower_pot_black", recipe = { { "dye:black", "dye:black", "dye:black" }, - { "homedecor:plastic_sheeting", "default:dirt", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -387,8 +118,8 @@ minetest.register_craft( { output = "homedecor:projection_screen 3", recipe = { { "", "default:glass", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -421,10 +152,6 @@ minetest.register_craft( { }, }) - --- ======================================================= --- Items/recipes not requiring smelting of anything new - minetest.register_craft( { output = "homedecor:glass_table_small_round_b 15", recipe = { @@ -500,7 +227,7 @@ minetest.register_craft( { recipe = { { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" }, { "group:sand", "dye:black", "group:sand" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -677,9 +404,9 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:table_legs_brass 3", recipe = { - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" }, - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" } + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" } }, }) @@ -703,9 +430,9 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:pole_brass 4", recipe = { - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" } + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" } }, }) @@ -721,37 +448,37 @@ minetest.register_craft( { -- Home electronics minetest.register_craft( { - output = "homedecor:ic 4", + output = "basic_materials:ic 4", recipe = { - { "mesecons_materials:silicon", "mesecons_materials:silicon" }, - { "mesecons_materials:silicon", "default:copper_ingot" }, + { "basic_materials:silicon", "basic_materials:silicon" }, + { "basic_materials:silicon", "default:copper_ingot" }, }, }) minetest.register_craft( { output = "homedecor:television", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "moreblocks:glow_glass", "homedecor:plastic_sheeting" }, - { "homedecor:ic", "homedecor:ic", "homedecor:ic" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" }, }, }) minetest.register_craft( { output = "homedecor:television", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" }, - { "homedecor:ic", "homedecor:power_crystal", "homedecor:ic" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" }, }, }) minetest.register_craft( { output = "homedecor:stereo", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "homedecor:ic", "default:steel_ingot" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" }, }, }) @@ -835,7 +562,7 @@ minetest.register_craft( { output = "homedecor:speaker_driver 2", recipe = { { "", "default:steel_ingot", "" }, - { "default:paper", "homedecor:copper_wire", "default:iron_lump" }, + { "default:paper", "basic_materials:copper_wire", "default:iron_lump" }, { "", "default:steel_ingot", "" }, }, }) @@ -1017,18 +744,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"homedecor:heating_element", "default:steel_ingot", "homedecor:heating_element", }, + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, {"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", }, - {"default:steel_ingot", "homedecor:heating_element", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, } }) minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"homedecor:heating_element", "default:steel_ingot", "homedecor:heating_element", }, + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, {"default:steel_ingot", "default:glass", "default:steel_ingot", }, - {"default:steel_ingot", "homedecor:heating_element", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, } }) @@ -1046,8 +773,8 @@ minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "moreblocks:iron_glass", "homedecor:ic", }, - {"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", }, + {"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, } }) @@ -1055,8 +782,8 @@ minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "default:glass", "homedecor:ic", }, - {"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", }, + {"default:steel_ingot", "default:glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, } }) @@ -1152,7 +879,7 @@ minetest.register_craft({ output = "homedecor:candle_thin 4", recipe = { {"farming:string" }, - {"homedecor:paraffin" } + {"basic_materials:paraffin" } } }) @@ -1160,8 +887,8 @@ minetest.register_craft({ output = "homedecor:candle 2", recipe = { {"farming:string" }, - {"homedecor:paraffin" }, - {"homedecor:paraffin" } + {"basic_materials:paraffin" }, + {"basic_materials:paraffin" } } }) @@ -1188,7 +915,7 @@ minetest.register_craft({ recipe = { {""}, {"homedecor:candle_thin"}, - {"technic:brass_ingot"}, + {"basic_materials:brass_ingot"}, } }) @@ -1197,7 +924,7 @@ minetest.register_craft({ recipe = { { "", "vessels:glass_bottle", "" }, { "", "farming:string", "" }, - { "default:steel_ingot", "homedecor:oil_extract", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" } } }) @@ -1206,7 +933,7 @@ minetest.register_craft({ recipe = { { "", "vessels:glass_bottle", "" }, { "", "farming:string", "" }, - { "default:iron_lump", "homedecor:oil_extract", "default:iron_lump" } + { "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" } } }) @@ -1251,7 +978,7 @@ else recipe = { { "dye:black", "dye:yellow", "dye:black" }, { "group:stick", "building_blocks:woodglass", "group:stick" }, - { "group:stick", "homedecor:power_crystal", "group:stick" } + { "group:stick", "basic_materials:energy_crystal_simple", "group:stick" } }, }) @@ -1283,7 +1010,7 @@ end minetest.register_craft({ output = "homedecor:glowlight_half 6", recipe = { - { "default:glass", "homedecor:power_crystal", "default:glass", }, + { "default:glass", "basic_materials:energy_crystal_simple", "default:glass", }, } }) @@ -1345,7 +1072,7 @@ minetest.register_craft({ recipe = { { "dye:white" }, { "default:glass" }, - { "homedecor:power_crystal" }, + { "basic_materials:energy_crystal_simple" }, } }) @@ -1381,7 +1108,7 @@ minetest.register_craft({ output = "homedecor:plasma_lamp", recipe = { {"", "default:glass", ""}, - {"default:glass", "homedecor:power_crystal", "default:glass"}, + {"default:glass", "basic_materials:energy_crystal_simple", "default:glass"}, {"", "default:glass", ""} } }) @@ -1391,7 +1118,7 @@ minetest.register_craft({ recipe = { {"", "default:glass", ""}, {"default:glass", "default:copper_ingot", "default:glass"}, - {"homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"} } }) @@ -1401,8 +1128,8 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:fence_brass 6", recipe = { - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, }, }) @@ -1533,9 +1260,9 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:fence_barbed_wire 6", recipe = { - { "group:stick", "homedecor:steel_wire", "group:stick" }, + { "group:stick", "basic_materials:steel_wire", "group:stick" }, { "group:stick", "", "group:stick" }, - { "group:stick", "homedecor:steel_wire", "group:stick" } + { "group:stick", "basic_materials:steel_wire", "group:stick" } }, }) @@ -1558,8 +1285,8 @@ minetest.register_craft( { output = "homedecor:fence_chainlink 9", recipe = { { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "homedecor:steel_wire", "homedecor:steel_wire", "default:steel_ingot" }, - { "homedecor:steel_wire", "homedecor:steel_wire", "default:steel_ingot" } + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }, + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" } }, }) @@ -1723,17 +1450,6 @@ minetest.register_craft( { }, }) --- Solid glass with metal handle - -minetest.register_craft( { - output = "homedecor:door_glass_left 2", - recipe = { - { "default:glass", "default:glass" }, - { "default:glass", "default:steel_ingot" }, - { "default:glass", "default:glass" }, - }, -}) - -- Closet doors -- oak @@ -1787,7 +1503,7 @@ minetest.register_craft( { output = "homedecor:door_bedroom_left", recipe = { { "dye:white", "dye:white", "" }, - { "homedecor:door_wood_plain_left", "technic:brass_ingot", "" }, + { "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" }, { "", "", "" }, }, }) @@ -1798,7 +1514,7 @@ minetest.register_craft( { output = "homedecor:door_woodglass_left", recipe = { { "group:wood", "default:glass", "" }, - { "group:wood", "default:glass", "technic:brass_ingot" }, + { "group:wood", "default:glass", "basic_materials:brass_ingot" }, { "group:wood", "group:wood", "" }, }, }) @@ -1819,16 +1535,16 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:washing_machine", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:motor", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } }, }) minetest.register_craft( { output = "homedecor:washing_machine", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, { "default:steel_ingot", "technic:motor", "default:steel_ingot" } }, @@ -1837,18 +1553,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:dryer", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, - { "default:steel_ingot", "bucket:bucket_empty", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) minetest.register_craft( { output = "homedecor:dryer", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_empty", "technic:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -1866,18 +1582,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "homedecor:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "bucket:bucket_water" } + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "homedecor:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, { "default:steel_ingot", "homedecor:shower_head", "technic:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "bucket:bucket_water" } + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) @@ -2051,7 +1767,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:fishtank", recipe = { - { "homedecor:plastic_sheeting", "homedecor:glowlight_small_cube", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" }, { "default:glass", "bucket:bucket_water", "default:glass" }, { "default:glass", "building_blocks:gravel_spread", "default:glass" }, }, @@ -2131,9 +1847,9 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:analog_clock_plastic 2", recipe = { - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, }, }) @@ -2141,7 +1857,7 @@ minetest.register_craft({ output = "homedecor:analog_clock_wood 2", recipe = { { "group:stick", "dye:black", "group:stick" }, - { "group:stick", "homedecor:ic", "group:stick" }, + { "group:stick", "basic_materials:ic", "group:stick" }, { "group:stick", "dye:black", "group:stick" }, }, }) @@ -2149,18 +1865,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:digital_clock 2", recipe = { - { "homedecor:plastic_sheeting", "default:paper", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, }, }) minetest.register_craft({ output = "homedecor:alarm_clock", recipe = { - { "homedecor:plastic_sheeting", "homedecor:speaker_driver", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:digital_clock", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, }, }) @@ -2168,8 +1884,8 @@ minetest.register_craft({ output = "homedecor:air_conditioner", recipe = { { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:fan_blades", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:motor", "default:steel_ingot" }, + { "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, }, }) @@ -2185,7 +1901,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:ceiling_fan", recipe = { - { "homedecor:motor" }, + { "basic_materials:motor" }, { "homedecor:fan_blades" }, { "homedecor:glowlight_small_cube" } } @@ -2259,27 +1975,27 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:vcr 2", recipe = { - { "homedecor:ic", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" }, { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, }, }) minetest.register_craft({ output = "homedecor:dvd_player 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, - { "default:obsidian_glass", "homedecor:motor", "homedecor:motor" }, - { "default:mese_crystal_fragment", "homedecor:ic", "homedecor:power_crystal" }, + { "", "basic_materials:plastic_sheet", "" }, + { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, }, }) minetest.register_craft({ output = "homedecor:dvd_player 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, + { "", "basic_materials:plastic_sheet", "" }, { "default:obsidian_glass", "technic:motor", "technic:motor" }, - { "default:mese_crystal_fragment", "homedecor:ic", "homedecor:power_crystal" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, }, }) @@ -2295,18 +2011,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:blinds_thin", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "group:stick" }, - { "farming:string", "homedecor:plastic_strips", "" }, - { "", "homedecor:plastic_strips", "" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "" }, + { "", "basic_materials:plastic_strip", "" }, }, }) minetest.register_craft({ output = "homedecor:blinds_thick", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "group:stick" }, - { "farming:string", "homedecor:plastic_strips", "homedecor:plastic_strips" }, - { "", "homedecor:plastic_strips", "homedecor:plastic_strips" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, + { "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, }, }) @@ -2322,7 +2038,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:desk_fan", recipe = { - {"default:steel_ingot", "homedecor:fan_blades", "homedecor:motor"}, + {"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"}, {"", "default:steel_ingot", ""} }, }) @@ -2330,18 +2046,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:space_heater", recipe = { - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "homedecor:fan_blades", "homedecor:motor"}, - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} }, }) minetest.register_craft( { output = "homedecor:radiator", recipe = { - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" }, - { "homedecor:ic", "homedecor:heating_element", "" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "basic_materials:ic", "basic_materials:heating_element", "" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -2409,18 +2125,18 @@ unifieddyes.register_color_craft({ minetest.register_craft( { output = "homedecor:power_outlet", recipe = { - {"homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"homedecor:plastic_sheeting", ""}, - {"homedecor:plastic_sheeting", "homedecor:copper_strip"} + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", ""}, + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"} }, }) minetest.register_craft( { output = "homedecor:light_switch", recipe = { - {"", "homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"", "homedecor:plastic_sheeting", "homedecor:copper_strip"} + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"} }, }) @@ -2504,7 +2220,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:trash_can 3", recipe = { - { "homedecor:steel_wire", "", "homedecor:steel_wire" }, + { "basic_materials:steel_wire", "", "basic_materials:steel_wire" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } }, }) @@ -2512,8 +2228,8 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:telephone", recipe = { - { "homedecor:speaker_driver", "homedecor:copper_wire", "homedecor:speaker_driver" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } }, }) @@ -2555,7 +2271,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:doorbell", recipe = { - { "homedecor:light_switch", "homedecor:power_crystal", "homedecor:speaker_driver" } + { "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" } }, }) @@ -2600,7 +2316,7 @@ minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, - { "homedecor:steel_strip", "building_blocks:slab_marble", "homedecor:steel_strip" }, + { "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" }, }, }) @@ -2608,7 +2324,7 @@ minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, - { "homedecor:steel_strip", "building_blocks:micro_marble_1", "homedecor:steel_strip" }, + { "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" }, }, }) @@ -2692,71 +2408,38 @@ minetest.register_craft( { }, }) -if not minetest.get_modpath("glooptest") then - - minetest.register_craft({ - output = "glooptest:chainlink 12", - recipe = { - {"", "default:steel_ingot", "default:steel_ingot"}, - { "default:steel_ingot", "", "default:steel_ingot" }, - { "default:steel_ingot", "default:steel_ingot", "" }, - }, - }) - -end - -minetest.register_alias("homedecor:chainlink_steel", "glooptest:chainlink") - -minetest.register_craft({ - output = "homedecor:chains 4", - recipe = { - { "default:steel_ingot", "", "default:steel_ingot"}, - { "glooptest:chainlink", "", "glooptest:chainlink" }, - { "glooptest:chainlink", "", "glooptest:chainlink" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:chainlink_brass 12", - recipe = { - {"", "technic:brass_ingot", "technic:brass_ingot"}, - { "technic:brass_ingot", "", "technic:brass_ingot" }, - { "technic:brass_ingot", "technic:brass_ingot", "" }, - }, -}) - minetest.register_craft({ output = "homedecor:coffee_maker", recipe = { - {"homedecor:plastic_sheeting", "bucket:bucket_water", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} }, }) minetest.register_craft({ output = "homedecor:dartboard", recipe = { - {"dye:black", "homedecor:plastic_sheeting", "dye:white"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, - {"dye:dark_green", "homedecor:plastic_sheeting", "dye:red"} + {"dye:black", "basic_materials:plastic_sheet", "dye:white"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, + {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"} }, }) minetest.register_craft({ output = "homedecor:piano", recipe = { - { "", "homedecor:steel_wire", "building_blocks:hardwood" }, - { "homedecor:plastic_strips", "homedecor:steel_wire", "building_blocks:hardwood" }, - { "technic:brass_ingot", "default:steelblock", "building_blocks:hardwood" } + { "", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" } }, }) minetest.register_craft({ output = "homedecor:toaster", recipe = { - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -2791,7 +2474,7 @@ minetest.register_craft({ output = "homedecor:office_chair_upscale", recipe = { { "dye:black", "building_blocks:sticks", "group:wool" }, - { "homedecor:plastic_sheeting", "group:wool", "default:steel_ingot" }, + { "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" }, { "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" } }, }) @@ -2816,8 +2499,8 @@ minetest.register_craft({ output = "homedecor:grandfather_clock", recipe = { { "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","technic:brass_ingot","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","technic:brass_ingot","building_blocks:slab_hardwood" } + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }, + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" } }, }) @@ -2842,7 +2525,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:copper_pans", recipe = { - { "homedecor:copper_strip","","homedecor:copper_strip" }, + { "basic_materials:copper_strip","","basic_materials:copper_strip" }, { "default:copper_ingot","","default:copper_ingot" }, { "default:copper_ingot","","default:copper_ingot" } }, @@ -3033,8 +2716,8 @@ minetest.register_craft({ output = "homedecor:desk_lamp 2", recipe = { { "", "default:steel_ingot", "homedecor:glowlight_small_cube" }, - { "", "homedecor:steel_strip", "" }, - { "homedecor:plastic_sheeting", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, + { "", "basic_materials:steel_strip", "" }, + { "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, }, }) @@ -3079,8 +2762,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:desk_globe", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, - { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:stick", "stairs:slab_wood", "dye:blue" } }, }) @@ -3088,8 +2771,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:desk_globe", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, - { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:stick", "moreblocks:slab_wood", "dye:blue" } }, }) @@ -3097,7 +2780,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:tool_cabinet", recipe = { - { "homedecor:motor", "default:axe_steel", "default:pick_steel" }, + { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } }, @@ -3107,25 +2790,25 @@ minetest.register_craft({ output = "homedecor:bathroom_set", recipe = { { "", "homedecor:glass_table_small_round", "" }, - { "homedecor:plastic_sheeting", "homedecor:glass_table_small_round", "homedecor:plastic_sheeting" }, - { "group:stick", "homedecor:plastic_sheeting", "group:stick" } + { "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" } }, }) minetest.register_craft({ output = "homedecor:trash_can_green", recipe = { - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:green", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) minetest.register_craft({ output = "homedecor:ceiling_lamp", recipe = { - { "", "technic:brass_ingot", ""}, - { "", "homedecor:chainlink_brass", ""}, + { "", "basic_materials:brass_ingot", ""}, + { "", "basic_materials:chainlink_brass", ""}, { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} }, }) @@ -3133,7 +2816,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:ceiling_lamp", recipe = { - { "", "chains:chain_top_brass", ""}, + { "", "basic_materials:chain_steel_top_brass", ""}, { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} }, }) @@ -3351,5 +3034,5 @@ unifieddyes.register_color_craft({ }) if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then - technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) + technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"basic_materials:oil_extract 2","dye:yellow 1"} }) end diff --git a/homedecor/depends.txt b/homedecor/depends.txt index baaeb85..29ab645 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -1,4 +1,5 @@ default +basic_materials unifieddyes homedecor_i18n creative diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index 34ba017..afcc7ff 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -142,11 +142,6 @@ local door_model_list = { usealpha = true }, - { name = "glass", - description = N_("Glass Office Door (@1 opening)"), - mesh = "homedecor_door_plain.obj" - }, - { name = "wood_glass_oak", description = N_("Glass and Wood, Oak-colored (@1 opening)"), mesh = "homedecor_door_wood_glass.obj", @@ -662,3 +657,6 @@ minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_cl minetest.register_alias("homedecor:jpn_door_top_open", "air") minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") + +minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b") +minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a") diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index 633adc1..cfcc6fc 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -141,17 +141,3 @@ homedecor.register("telephone", { walkable = false, sounds = default.node_sound_wood_defaults(), }) - -minetest.register_abm({ - nodenames = "homedecor:telephone", - label = "sfx", - interval = 30, - chance = 15, - action = function(pos, node) - minetest.sound_play("homedecor_telephone_ringing", { - pos = pos, - gain = 1.0, - max_hear_distance = 5 - }) - end -}) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index a995242..aeceeef 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -2,7 +2,7 @@ minetest.register_craft({ output = "homedecor:table", recipe = { - { "group:wood","group:wood", "group:wood" }, + { "default:wood","default:wood", "default:wood" }, { "group:stick", "", "group:stick" }, }, }) @@ -205,6 +205,7 @@ minetest.register_craft({ output = "homedecor:sink", recipe = { { "group:marble","bucket:bucket_empty", "group:marble" }, + { "", "group:marble", "" } }, }) @@ -225,7 +226,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:shower_tray", recipe = { - { "group:marble","bucket:bucket_water", "group:marble" }, + { "group:marble","bucket:bucket_empty", "group:marble" }, }, }) diff --git a/homedecor/handlers/inventory.lua b/homedecor/handlers/inventory.lua index 62269e6..dd09133 100644 --- a/homedecor/handlers/inventory.lua +++ b/homedecor/handlers/inventory.lua @@ -182,7 +182,7 @@ function homedecor.handle_inventory(name, def, original_def) minetest.register_craft({ type = "shapeless", output = "homedecor:" .. locked_name, - recipe = { "homedecor:" .. name, "default:steel_ingot" } + recipe = { "homedecor:" .. name, "basic_materials:padlock" } }) end diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index ddd0e44..67c54d6 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -742,3 +742,141 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..color) end }) + +local chains_sbox = { + type = "fixed", + fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 } +} + +local topchains_sbox = { + type = "fixed", + fixed = { + { -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 }, + { -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 } + } +} + +minetest.register_node("homedecor:chain_steel_top", { + description = S("Hanging chain (ceiling mount, steel)"), + drawtype = "mesh", + mesh = "homedecor_chains_top.obj", + tiles = {"basic_materials_chain_steel.png"}, + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + inventory_image = "basic_materials_chain_steel_inv.png", + groups = {cracky=3}, + selection_box = topchains_sbox, +}) + +minetest.register_node("homedecor:chain_brass_top", { + description = S("Hanging chain (ceiling mount, brass)"), + drawtype = "mesh", + mesh = "homedecor_chains_top.obj", + tiles = {"basic_materials_chain_brass.png"}, + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + inventory_image = "basic_materials_chain_brass_inv.png", + groups = {cracky=3}, + selection_box = topchains_sbox, +}) + +minetest.register_node("homedecor:chandelier_steel", { + description = S("Chandelier (steel)"), + paramtype = "light", + light_source = 12, + walkable = false, + climbable = true, + sunlight_propagates = true, + tiles = { + "basic_materials_chain_steel.png", + "homedecor_candle_flat.png", + { + name="homedecor_candle_flame.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=3.0 + } + } + }, + drawtype = "mesh", + mesh = "homedecor_chandelier.obj", + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("homedecor:chandelier_brass", { + description = S("Chandelier (brass)"), + paramtype = "light", + light_source = 12, + walkable = false, + climbable = true, + sunlight_propagates = true, + tiles = { + "basic_materials_chain_brass.png", + "homedecor_candle_flat.png", + { + name="homedecor_candle_flame.png", + animation={ + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=3.0 + } + } + }, + drawtype = "mesh", + mesh = "homedecor_chandelier.obj", + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +-- crafts + +minetest.register_craft({ + output = 'homedecor:chain_steel_top', + recipe = { + {'default:steel_ingot'}, + {'basic_materials:chainlink_steel'}, + }, +}) + +minetest.register_craft({ + output = 'homedecor:chandelier_steel', + recipe = { + {'', 'basic_materials:chainlink_steel', ''}, + {'default:torch', 'basic_materials:chainlink_steel', 'default:torch'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + } +}) + +-- brass versions + +minetest.register_craft({ + output = 'homedecor:chain_brass_top', + recipe = { + {'basic_materials:brass_ingot'}, + {'basic_materials:chainlink_brass'}, + }, +}) + +minetest.register_craft({ + output = 'homedecor:chandelier_brass', + recipe = { + {'', 'basic_materials:chainlink_brass', ''}, + {'default:torch', 'basic_materials:chainlink_brass', 'default:torch'}, + {'basic_materials:brass_ingot', 'basic_materials:brass_ingot', 'basic_materials:brass_ingot'}, + } +}) + +minetest.register_alias("chains:chain_top", "homedecor:chain_steel_top") +minetest.register_alias("chains:chain_top_brass", "homedecor:chain_brass_top") + +minetest.register_alias("chains:chandelier_steel", "homedecor:chandelier_steel") +minetest.register_alias("chains:chandelier_brass", "homedecor:chandelier_brass") + diff --git a/homedecor/models/homedecor_chains_top.obj b/homedecor/models/homedecor_chains_top.obj new file mode 100644 index 0000000..9e4f3f7 --- /dev/null +++ b/homedecor/models/homedecor_chains_top.obj @@ -0,0 +1,943 @@ +# Blender v2.73 (sub 0) OBJ File: 'chains-top.blend' +# www.blender.org +o Torus.016_Torus +v 0.000000 -0.429978 0.000002 +v 0.000000 -0.401109 0.055211 +v -0.014044 -0.391975 0.048870 +v -0.014044 -0.423304 0.000002 +v -0.009826 -0.379748 0.040970 +v -0.009826 -0.406012 0.000002 +v 0.009826 -0.379748 0.040970 +v 0.009826 -0.406012 0.000002 +v 0.014044 -0.391975 0.048870 +v 0.014044 -0.423304 0.000002 +v 0.000000 -0.316336 0.080195 +v -0.014044 -0.316336 0.069112 +v -0.009826 -0.316336 0.057941 +v 0.009826 -0.316336 0.057941 +v 0.014044 -0.316336 0.069112 +v 0.000000 -0.231564 0.055211 +v -0.014044 -0.240700 0.048870 +v -0.009826 -0.252925 0.040970 +v 0.009826 -0.252925 0.040970 +v 0.014044 -0.240700 0.048870 +v 0.000000 -0.202695 0.000002 +v -0.014044 -0.209368 0.000002 +v -0.009826 -0.226661 0.000002 +v 0.009826 -0.226661 0.000002 +v 0.014044 -0.209368 0.000002 +v 0.000000 -0.231564 -0.055206 +v -0.014044 -0.240700 -0.048868 +v -0.009826 -0.252925 -0.040967 +v 0.009826 -0.252925 -0.040967 +v 0.014044 -0.240700 -0.048865 +v 0.000000 -0.316336 -0.080190 +v -0.014044 -0.316336 -0.069108 +v -0.009826 -0.316336 -0.057936 +v 0.009826 -0.316336 -0.057936 +v 0.014044 -0.316336 -0.069108 +v 0.000000 -0.400361 -0.055206 +v -0.014044 -0.391975 -0.048868 +v -0.009826 -0.379748 -0.040967 +v 0.009826 -0.379748 -0.040967 +v 0.014044 -0.391975 -0.048868 +v 0.000000 -0.262249 0.000002 +v -0.061672 -0.233381 0.000002 +v -0.054590 -0.224245 -0.012569 +v 0.000000 -0.255577 -0.012569 +v -0.045765 -0.212018 -0.008794 +v 0.000000 -0.238285 -0.008794 +v -0.045765 -0.212018 0.008798 +v 0.000000 -0.238285 0.008798 +v -0.054590 -0.224245 0.012574 +v 0.000000 -0.255577 0.012574 +v -0.089582 -0.148609 0.000002 +v -0.077200 -0.148609 -0.012569 +v -0.064722 -0.148609 -0.008794 +v -0.064722 -0.148609 0.008799 +v -0.077200 -0.148609 0.012574 +v -0.061672 -0.063837 0.000002 +v -0.054590 -0.072971 -0.012569 +v -0.045765 -0.085198 -0.008794 +v -0.045765 -0.085198 0.008799 +v -0.054590 -0.072971 0.012574 +v 0.000000 -0.034967 0.000002 +v 0.000000 -0.041641 -0.012569 +v 0.000000 -0.058933 -0.008794 +v 0.000000 -0.058933 0.008799 +v 0.000000 -0.041641 0.012574 +v 0.061672 -0.063837 0.000002 +v 0.054590 -0.072971 -0.012569 +v 0.045765 -0.085198 -0.008794 +v 0.045765 -0.085198 0.008799 +v 0.054590 -0.072971 0.012574 +v 0.089582 -0.148609 0.000002 +v 0.077200 -0.148609 -0.012569 +v 0.064722 -0.148609 -0.008794 +v 0.064722 -0.148609 0.008799 +v 0.077200 -0.148609 0.012574 +v 0.061672 -0.232631 0.000002 +v 0.054590 -0.224245 -0.012569 +v 0.045765 -0.212018 -0.008794 +v 0.045765 -0.212018 0.008798 +v 0.054590 -0.224245 0.012574 +v 0.000000 0.073316 0.000002 +v 0.061672 0.102183 0.000002 +v 0.054590 0.111319 0.012574 +v 0.000000 0.079988 0.012574 +v 0.045765 0.123546 0.008799 +v 0.000000 0.097280 0.008799 +v 0.045765 0.123546 -0.008794 +v 0.000000 0.097280 -0.008794 +v 0.054590 0.111319 -0.012569 +v 0.000000 0.079988 -0.012569 +v 0.089582 0.186956 0.000002 +v 0.077200 0.186956 0.012574 +v 0.064722 0.186956 0.008799 +v 0.064722 0.186956 -0.008794 +v 0.077200 0.186956 -0.012569 +v 0.061672 0.271728 0.000002 +v 0.054590 0.262594 0.012574 +v 0.045765 0.250367 0.008799 +v 0.045765 0.250367 -0.008794 +v 0.054590 0.262594 -0.012569 +v 0.000000 0.300597 0.000002 +v 0.000000 0.293923 0.012574 +v 0.000000 0.276631 0.008799 +v 0.000000 0.276631 -0.008794 +v 0.000000 0.293923 -0.012569 +v -0.061672 0.271728 0.000002 +v -0.054590 0.262594 0.012574 +v -0.045765 0.250367 0.008799 +v -0.045765 0.250367 -0.008794 +v -0.054590 0.262594 -0.012569 +v -0.089582 0.186956 0.000002 +v -0.077200 0.186956 0.012574 +v -0.064722 0.186956 0.008799 +v -0.064722 0.186956 -0.008794 +v -0.077200 0.186956 -0.012569 +v -0.061672 0.102931 0.000002 +v -0.054590 0.111319 0.012574 +v -0.045765 0.123546 0.008799 +v -0.045765 0.123546 -0.008794 +v -0.054590 0.111319 -0.012569 +v 0.000000 -0.095037 0.000002 +v 0.000000 -0.066168 -0.055206 +v 0.014044 -0.057034 -0.048868 +v 0.014044 -0.088363 0.000002 +v 0.009826 -0.044807 -0.040967 +v 0.009826 -0.071071 0.000002 +v -0.009826 -0.044807 -0.040967 +v -0.009826 -0.071071 0.000002 +v -0.014044 -0.057034 -0.048868 +v -0.014044 -0.088363 0.000002 +v 0.000000 0.018605 -0.080190 +v 0.014044 0.018605 -0.069108 +v 0.009826 0.018605 -0.057936 +v -0.009826 0.018605 -0.057936 +v -0.014044 0.018605 -0.069108 +v 0.000000 0.103377 -0.055206 +v 0.014044 0.094243 -0.048868 +v 0.009826 0.082016 -0.040967 +v -0.009826 0.082016 -0.040967 +v -0.014044 0.094243 -0.048868 +v 0.000000 0.132246 0.000002 +v 0.014044 0.125572 0.000002 +v 0.009826 0.108280 0.000002 +v -0.009826 0.108280 0.000002 +v -0.014044 0.125572 0.000002 +v 0.000000 0.103377 0.055211 +v 0.014044 0.094243 0.048870 +v 0.009826 0.082016 0.040970 +v -0.009826 0.082016 0.040970 +v -0.014044 0.094243 0.048870 +v 0.000000 0.018605 0.080195 +v 0.014044 0.018605 0.069112 +v 0.009826 0.018605 0.057941 +v -0.009826 0.018605 0.057941 +v -0.014044 0.018605 0.069112 +v 0.000000 -0.065420 0.055211 +v 0.014044 -0.057032 0.048870 +v 0.009826 -0.044807 0.040970 +v -0.009826 -0.044807 0.040970 +v -0.014044 -0.057032 0.048870 +v 0.000000 -0.598329 0.000002 +v 0.061672 -0.569460 0.000002 +v 0.054590 -0.560326 0.012574 +v 0.000000 -0.591655 0.012574 +v 0.045765 -0.548099 0.008798 +v 0.000000 -0.574363 0.008798 +v 0.045765 -0.548099 -0.008794 +v 0.000000 -0.574363 -0.008794 +v 0.054590 -0.560326 -0.012569 +v 0.000000 -0.591655 -0.012569 +v 0.089582 -0.484687 0.000002 +v 0.077200 -0.484687 0.012574 +v 0.064722 -0.484687 0.008798 +v 0.064722 -0.484687 -0.008794 +v 0.077200 -0.484687 -0.012569 +v 0.061672 -0.399915 0.000002 +v 0.054590 -0.409051 0.012574 +v 0.045765 -0.421278 0.008798 +v 0.045765 -0.421278 -0.008794 +v 0.054590 -0.409051 -0.012569 +v 0.000000 -0.371048 0.000002 +v 0.000000 -0.377719 0.012574 +v 0.000000 -0.395012 0.008798 +v 0.000000 -0.395012 -0.008794 +v 0.000000 -0.377719 -0.012569 +v -0.061672 -0.399915 0.000002 +v -0.054590 -0.409051 0.012574 +v -0.045765 -0.421278 0.008798 +v -0.045765 -0.421278 -0.008794 +v -0.054590 -0.409051 -0.012569 +v -0.089582 -0.484687 0.000002 +v -0.077200 -0.484687 0.012574 +v -0.064722 -0.484687 0.008798 +v -0.064722 -0.484687 -0.008794 +v -0.077200 -0.484687 -0.012569 +v -0.061672 -0.568712 0.000002 +v -0.054590 -0.560326 0.012574 +v -0.045765 -0.548099 0.008798 +v -0.045765 -0.548099 -0.008794 +v -0.054590 -0.560326 -0.012569 +v 0.000000 0.241043 0.000002 +v 0.000000 0.269910 0.055211 +v -0.014044 0.279047 0.048870 +v -0.014044 0.247717 0.000002 +v -0.009826 0.291274 0.040970 +v -0.009826 0.265007 0.000002 +v 0.009826 0.291274 0.040970 +v 0.009826 0.265007 0.000002 +v 0.014044 0.279047 0.048870 +v 0.014044 0.247717 0.000002 +v 0.000000 0.354683 0.080195 +v -0.014044 0.354683 0.069112 +v -0.009826 0.354683 0.057941 +v 0.009826 0.354683 0.057941 +v 0.014044 0.354683 0.069112 +v 0.000000 0.354683 -0.080190 +v -0.014044 0.354683 -0.069108 +v -0.009826 0.354683 -0.057936 +v 0.009826 0.354683 -0.057936 +v 0.014044 0.354683 -0.069108 +v 0.000000 0.270661 -0.055206 +v -0.014044 0.279047 -0.048868 +v -0.009826 0.291274 -0.040967 +v 0.009826 0.291274 -0.040967 +v 0.014044 0.279047 -0.048868 +v -0.000000 0.343750 -0.116420 +v 0.000000 0.500000 -0.250000 +v 0.082321 0.343750 -0.082321 +v 0.176777 0.500000 -0.176777 +v 0.116420 0.343750 0.000000 +v 0.250000 0.500000 0.000000 +v 0.082321 0.343750 0.082321 +v 0.176777 0.500000 0.176777 +v -0.000000 0.343750 0.116420 +v -0.000000 0.500000 0.250000 +v -0.082321 0.343750 0.082321 +v -0.176777 0.500000 0.176777 +v -0.116420 0.343750 -0.000000 +v -0.250000 0.500000 -0.000000 +v -0.082321 0.343750 -0.082321 +v -0.176777 0.500000 -0.176777 +v 0.068265 0.433424 -0.164807 +v 0.164807 0.433424 -0.068265 +v 0.164807 0.433424 0.068265 +v 0.068265 0.433424 0.164807 +v -0.068265 0.433424 0.164807 +v -0.164807 0.433424 0.068265 +v -0.068265 0.433424 -0.164807 +v -0.164807 0.433424 -0.068265 +vt 0.187500 0.125000 +vt 0.250000 0.125000 +vt 0.250000 0.187500 +vt 0.187500 0.187500 +vt 0.250000 0.250000 +vt 0.187500 0.250000 +vt 0.250000 0.312500 +vt 0.187500 0.312500 +vt 0.250000 0.375000 +vt 0.187500 0.375000 +vt 0.187500 0.062500 +vt 0.250000 0.062500 +vt 0.312500 0.125000 +vt 0.312500 0.187500 +vt 0.312500 0.250000 +vt 0.312500 0.312500 +vt 0.312500 0.375000 +vt 0.312500 0.062500 +vt 0.375000 0.125000 +vt 0.375000 0.187500 +vt 0.375000 0.250000 +vt 0.375000 0.312500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.437500 0.125000 +vt 0.437500 0.187500 +vt 0.437500 0.250000 +vt 0.437500 0.312500 +vt 0.437500 0.375000 +vt 0.437500 0.062500 +vt 0.500000 0.125000 +vt 0.500000 0.187500 +vt 0.500000 0.250000 +vt 0.500000 0.312500 +vt 0.500000 0.375000 +vt 0.500000 0.062500 +vt -0.000000 0.125000 +vt 0.062500 0.125000 +vt 0.062500 0.187500 +vt -0.000000 0.187500 +vt 0.062500 0.250000 +vt -0.000000 0.250000 +vt 0.062500 0.312500 +vt -0.000000 0.312500 +vt 0.062500 0.375000 +vt -0.000000 0.375000 +vt -0.000000 0.062500 +vt 0.062500 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.187500 +vt 0.125000 0.250000 +vt 0.125000 0.312500 +vt 0.125000 0.375000 +vt 0.125000 0.062500 +vt 0.750000 0.625000 +vt 0.812500 0.625000 +vt 0.812500 0.687500 +vt 0.750000 0.687500 +vt 0.750000 0.375000 +vt 0.812500 0.375000 +vt 0.812500 0.437500 +vt 0.750000 0.437500 +vt 0.812500 0.500000 +vt 0.750000 0.500000 +vt 0.812500 0.562500 +vt 0.750000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.687500 +vt 0.875000 0.375000 +vt 0.875000 0.437500 +vt 0.875000 0.500000 +vt 0.875000 0.562500 +vt 0.937500 0.625000 +vt 0.937500 0.687500 +vt 0.937500 0.375000 +vt 0.937500 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.562500 +vt 1.000000 0.625000 +vt 1.000000 0.687500 +vt 1.000000 0.375000 +vt 1.000000 0.437500 +vt 1.000000 0.500000 +vt 1.000000 0.562500 +vt 0.500000 0.625000 +vt 0.562500 0.625000 +vt 0.562500 0.687500 +vt 0.500000 0.687500 +vt 0.562500 0.375000 +vt 0.562500 0.437500 +vt 0.500000 0.437500 +vt 0.562500 0.500000 +vt 0.500000 0.500000 +vt 0.562500 0.562500 +vt 0.500000 0.562500 +vt 0.625000 0.625000 +vt 0.625000 0.687500 +vt 0.625000 0.375000 +vt 0.625000 0.437500 +vt 0.625000 0.500000 +vt 0.625000 0.562500 +vt 0.687500 0.625000 +vt 0.687500 0.687500 +vt 0.687500 0.375000 +vt 0.687500 0.437500 +vt 0.687500 0.500000 +vt 0.687500 0.562500 +vt 0.250000 0.625000 +vt 0.312500 0.625000 +vt 0.312500 0.687500 +vt 0.250000 0.687500 +vt 0.312500 0.437500 +vt 0.250000 0.437500 +vt 0.312500 0.500000 +vt 0.250000 0.500000 +vt 0.312500 0.562500 +vt 0.250000 0.562500 +vt 0.375000 0.625000 +vt 0.375000 0.687500 +vt 0.375000 0.437500 +vt 0.375000 0.500000 +vt 0.375000 0.562500 +vt 0.437500 0.625000 +vt 0.437500 0.687500 +vt 0.437500 0.437500 +vt 0.437500 0.500000 +vt 0.437500 0.562500 +vt -0.000000 0.625000 +vt 0.062500 0.625000 +vt 0.062500 0.687500 +vt -0.000000 0.687500 +vt 0.062500 0.437500 +vt -0.000000 0.437500 +vt 0.062500 0.500000 +vt -0.000000 0.500000 +vt 0.062500 0.562500 +vt -0.000000 0.562500 +vt 0.125000 0.625000 +vt 0.125000 0.687500 +vt 0.125000 0.437500 +vt 0.125000 0.500000 +vt 0.125000 0.562500 +vt 0.187500 0.625000 +vt 0.187500 0.687500 +vt 0.187500 0.437500 +vt 0.187500 0.500000 +vt 0.187500 0.562500 +vt 0.687500 0.750000 +vt 0.750000 0.750000 +vt 0.750000 0.812500 +vt 0.687500 0.812500 +vt 0.750000 0.875000 +vt 0.687500 0.875000 +vt 0.750000 0.937500 +vt 0.687500 0.937500 +vt 0.750000 1.000000 +vt 0.687500 1.000000 +vt 0.812500 0.750000 +vt 0.812500 0.812500 +vt 0.812500 0.875000 +vt 0.812500 0.937500 +vt 0.812500 1.000000 +vt 0.875000 0.750000 +vt 0.875000 0.812500 +vt 0.875000 0.875000 +vt 0.875000 0.937500 +vt 0.875000 1.000000 +vt 0.937500 0.750000 +vt 0.937500 0.812500 +vt 0.937500 0.875000 +vt 0.937500 0.937500 +vt 0.937500 1.000000 +vt 1.000000 0.750000 +vt 1.000000 0.812500 +vt 1.000000 0.875000 +vt 1.000000 0.937500 +vt 1.000000 1.000000 +vt 0.500000 0.750000 +vt 0.562500 0.750000 +vt 0.562500 0.812500 +vt 0.500000 0.812500 +vt 0.562500 0.875000 +vt 0.500000 0.875000 +vt 0.562500 0.937500 +vt 0.500000 0.937500 +vt 0.562500 1.000000 +vt 0.500000 1.000000 +vt 0.625000 0.750000 +vt 0.625000 0.812500 +vt 0.625000 0.875000 +vt 0.625000 0.937500 +vt 0.625000 1.000000 +vt 0.750000 0.312500 +vt 0.812500 0.312500 +vt 0.750000 0.062500 +vt 0.812500 0.062500 +vt 0.812500 0.125000 +vt 0.750000 0.125000 +vt 0.812500 0.187500 +vt 0.750000 0.187500 +vt 0.812500 0.250000 +vt 0.750000 0.250000 +vt 0.875000 0.312500 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt 0.875000 0.187500 +vt 0.875000 0.250000 +vt 0.937500 0.312500 +vt 0.937500 0.062500 +vt 0.937500 0.125000 +vt 0.937500 0.187500 +vt 0.937500 0.250000 +vt 1.000000 0.312500 +vt 1.000000 0.062500 +vt 1.000000 0.125000 +vt 1.000000 0.187500 +vt 1.000000 0.250000 +vt 0.562500 0.312500 +vt 0.562500 0.062500 +vt 0.562500 0.125000 +vt 0.562500 0.187500 +vt 0.562500 0.250000 +vt 0.625000 0.312500 +vt 0.625000 0.062500 +vt 0.625000 0.125000 +vt 0.625000 0.187500 +vt 0.625000 0.250000 +vt 0.687500 0.312500 +vt 0.687500 0.062500 +vt 0.687500 0.125000 +vt 0.687500 0.187500 +vt 0.687500 0.250000 +vt 0.250000 0.937500 +vt 0.312500 0.937500 +vt 0.312500 1.000000 +vt 0.250000 1.000000 +vt 0.312500 0.750000 +vt 0.250000 0.750000 +vt 0.312500 0.812500 +vt 0.250000 0.812500 +vt 0.312500 0.875000 +vt 0.250000 0.875000 +vt 0.375000 0.937500 +vt 0.375000 1.000000 +vt 0.375000 0.750000 +vt 0.375000 0.812500 +vt 0.375000 0.875000 +vt 0.125000 0.937500 +vt 0.187500 0.937500 +vt 0.187500 1.000000 +vt 0.125000 1.000000 +vt 0.187500 0.750000 +vt 0.125000 0.750000 +vt 0.187500 0.812500 +vt 0.125000 0.812500 +vt 0.187500 0.875000 +vt 0.125000 0.875000 +vt 0.687500 0.821740 +vt 0.562500 0.821739 +vt 0.437500 0.821739 +vt 0.312500 0.821739 +vt 0.187500 0.821740 +vt 0.937500 0.821739 +vt 0.676786 0.676786 +vt 0.323214 0.676786 +vt 0.323214 0.323214 +vt 0.676786 0.323214 +vt 0.062500 0.821740 +vt 0.500000 0.616426 +vt 0.582326 0.582326 +vt 0.616426 0.500000 +vt 0.582326 0.417674 +vt 0.500000 0.383574 +vt 0.417674 0.417674 +vt 0.383574 0.500000 +vt 0.417674 0.582326 +vt 0.812500 0.821739 +vt 0.000000 0.875000 +vt 0.000000 0.750000 +vn 0.000000 -1.000000 -0.004800 +vn 0.000000 -0.657400 0.753500 +vn -0.898300 -0.248500 0.362300 +vn -0.863600 -0.504100 -0.003400 +vn -0.661500 0.421500 -0.620200 +vn -0.746000 0.665900 0.000000 +vn 0.661500 0.421500 -0.620200 +vn 0.746000 0.665900 0.000000 +vn 0.898300 -0.248500 0.362300 +vn 0.863600 -0.504100 -0.003400 +vn 0.000000 0.000000 1.000000 +vn -0.925200 0.000000 0.379500 +vn -0.617100 0.000000 -0.786900 +vn 0.617100 0.000000 -0.786900 +vn 0.925200 0.000000 0.379500 +vn 0.000000 0.657400 0.753500 +vn -0.898300 0.248400 0.362300 +vn -0.661500 -0.421500 -0.620200 +vn 0.661500 -0.421500 -0.620200 +vn 0.898300 0.248400 0.362300 +vn 0.000000 1.000000 0.000000 +vn -0.866100 0.499800 0.000000 +vn -0.746000 -0.665900 0.000000 +vn 0.746000 -0.665900 0.000000 +vn 0.866100 0.499800 0.000000 +vn 0.000000 0.657400 -0.753500 +vn -0.898300 0.248400 -0.362400 +vn -0.661600 -0.421500 0.620200 +vn 0.661500 -0.421500 0.620200 +vn 0.898300 0.248400 -0.362300 +vn 0.000000 -0.000900 -1.000000 +vn -0.924600 -0.000600 -0.380700 +vn -0.617100 0.000000 0.786900 +vn 0.617100 0.000000 0.786900 +vn 0.924700 -0.000600 -0.380700 +vn 0.000000 -0.650300 -0.759600 +vn -0.895600 -0.254600 -0.364800 +vn -0.661600 0.421500 0.620200 +vn 0.661600 0.421500 0.620200 +vn 0.895600 -0.254600 -0.364800 +vn 0.004900 -1.000000 0.000000 +vn -0.729700 -0.683800 0.000000 +vn -0.324500 -0.256300 -0.910500 +vn 0.003300 -0.475500 -0.879700 +vn 0.578700 0.436200 -0.689100 +vn 0.000000 0.666600 -0.745400 +vn 0.578700 0.436200 0.689100 +vn 0.000000 0.666600 0.745400 +vn -0.324500 -0.256300 0.910500 +vn 0.003300 -0.475500 0.879700 +vn -1.000000 0.000000 0.000000 +vn -0.359600 0.000000 -0.933100 +vn 0.756400 0.000000 -0.654100 +vn 0.756400 0.000000 0.654100 +vn -0.359600 0.000000 0.933100 +vn -0.729700 0.683700 0.000000 +vn -0.324500 0.256300 -0.910500 +vn 0.578700 -0.436200 -0.689100 +vn 0.578700 -0.436200 0.689100 +vn -0.324500 0.256300 0.910500 +vn 0.000000 0.470900 -0.882200 +vn 0.000000 -0.666600 -0.745400 +vn 0.000000 -0.666600 0.745400 +vn 0.000000 0.470900 0.882200 +vn 0.729700 0.683700 0.000000 +vn 0.324500 0.256300 -0.910500 +vn -0.578700 -0.436200 -0.689100 +vn -0.578700 -0.436200 0.689100 +vn 0.324500 0.256300 0.910500 +vn 1.000000 -0.001100 0.000000 +vn 0.361000 -0.000700 -0.932600 +vn -0.756400 0.000000 -0.654100 +vn -0.756400 0.000000 0.654100 +vn 0.361000 -0.000700 0.932600 +vn 0.736100 -0.676800 0.000000 +vn 0.327100 -0.263100 -0.907600 +vn -0.578700 0.436200 -0.689100 +vn -0.578700 0.436200 0.689100 +vn 0.327100 -0.263100 0.907600 +vn -0.004900 -1.000000 0.000000 +vn 0.729700 -0.683800 0.000000 +vn 0.324500 -0.256300 0.910500 +vn -0.003300 -0.475400 0.879700 +vn 0.324500 -0.256300 -0.910500 +vn -0.003300 -0.475400 -0.879700 +vn 1.000000 0.000000 0.000000 +vn 0.359600 0.000000 0.933100 +vn 0.359600 0.000000 -0.933100 +vn -1.000000 -0.001100 0.000000 +vn -0.361000 -0.000700 0.932600 +vn -0.361000 -0.000700 -0.932600 +vn -0.736100 -0.676800 0.000000 +vn -0.327100 -0.263100 0.907600 +vn -0.327100 -0.263100 -0.907600 +vn 0.000000 -1.000000 0.004800 +vn 0.000000 -0.657400 -0.753500 +vn 0.898300 -0.248500 -0.362400 +vn 0.863600 -0.504100 0.003400 +vn -0.898300 -0.248500 -0.362400 +vn -0.863600 -0.504100 0.003400 +vn 0.000000 0.000000 -1.000000 +vn 0.925200 0.000000 -0.379500 +vn -0.925200 0.000000 -0.379500 +vn 0.898300 0.248500 -0.362400 +vn 0.661600 -0.421500 0.620200 +vn -0.898300 0.248500 -0.362400 +vn 0.898300 0.248500 0.362300 +vn -0.898300 0.248500 0.362300 +vn 0.000000 -0.000900 1.000000 +vn 0.924700 -0.000600 0.380700 +vn -0.924700 -0.000600 0.380700 +vn 0.000000 -0.650300 0.759600 +vn 0.895600 -0.254600 0.364700 +vn -0.895600 -0.254600 0.364700 +vn 0.729700 -0.683700 0.000000 +vn 0.729700 0.683800 0.000000 +vn -0.729700 0.683800 0.000000 +vn -0.898300 -0.248400 0.362300 +vn -0.863600 -0.504100 -0.003500 +vn 0.898300 -0.248400 0.362300 +vn 0.863600 -0.504100 -0.003500 +vn 0.000000 -0.271400 0.962500 +vn -0.919700 -0.109100 0.377200 +vn -0.603800 0.206100 -0.770000 +vn 0.603800 0.206100 -0.770000 +vn 0.919700 -0.109100 0.377200 +vn 0.000000 -0.272500 -0.962100 +vn -0.918500 -0.110600 -0.379700 +vn -0.661500 0.421500 0.620200 +vn -0.603800 0.206100 0.770000 +vn 0.661500 0.421500 0.620200 +vn 0.603800 0.206100 0.770000 +vn 0.918500 -0.110600 -0.379700 +vn 0.351300 -0.867800 -0.351300 +vn 0.661700 0.352400 -0.661700 +vn 0.725000 -0.619800 -0.300300 +vn 0.496800 -0.867800 0.000000 +vn 0.935800 0.352400 0.000000 +vn 0.725000 -0.619800 0.300300 +vn 0.351300 -0.867800 0.351300 +vn 0.661700 0.352400 0.661700 +vn 0.300300 -0.619800 0.725000 +vn 0.000000 -0.867800 0.496800 +vn 0.000000 0.352400 0.935800 +vn -0.300300 -0.619800 0.725000 +vn -0.351300 -0.867800 0.351300 +vn -0.661700 0.352400 0.661700 +vn -0.725000 -0.619800 0.300300 +vn -0.351300 -0.867800 -0.351300 +vn -0.661700 0.352400 -0.661700 +vn -0.300300 -0.619800 -0.725000 +vn 0.000000 0.352400 -0.935800 +vn -0.935800 0.352400 0.000000 +vn -0.496800 -0.867800 0.000000 +vn -0.725000 -0.619800 -0.300300 +vn 0.000000 -0.867800 -0.496800 +vn 0.300300 -0.619800 -0.725000 +s 1 +f 1/1/1 2/2/2 3/3/3 4/4/4 +f 4/4/4 3/3/3 5/5/5 6/6/6 +f 6/6/6 5/5/5 7/7/7 8/8/8 +f 8/8/8 7/7/7 9/9/9 10/10/10 +f 1/1/1 10/11/10 9/12/9 2/2/2 +f 2/2/2 11/13/11 12/14/12 3/3/3 +f 3/3/3 12/14/12 13/15/13 5/5/5 +f 5/5/5 13/15/13 14/16/14 7/7/7 +f 7/7/7 14/16/14 15/17/15 9/9/9 +f 9/12/9 15/18/15 11/13/11 2/2/2 +f 11/13/11 16/19/16 17/20/17 12/14/12 +f 12/14/12 17/20/17 18/21/18 13/15/13 +f 13/15/13 18/21/18 19/22/19 14/16/14 +f 14/16/14 19/22/19 20/23/20 15/17/15 +f 15/18/15 20/24/20 16/19/16 11/13/11 +f 16/19/16 21/25/21 22/26/22 17/20/17 +f 17/20/17 22/26/22 23/27/23 18/21/18 +f 18/21/18 23/27/23 24/28/24 19/22/19 +f 19/22/19 24/28/24 25/29/25 20/23/20 +f 20/24/20 25/30/25 21/25/21 16/19/16 +f 21/25/21 26/31/26 27/32/27 22/26/22 +f 22/26/22 27/32/27 28/33/28 23/27/23 +f 23/27/23 28/33/28 29/34/29 24/28/24 +f 24/28/24 29/34/29 30/35/30 25/29/25 +f 25/30/25 30/36/30 26/31/26 21/25/21 +f 26/37/26 31/38/31 32/39/32 27/40/27 +f 27/40/27 32/39/32 33/41/33 28/42/28 +f 28/42/28 33/41/33 34/43/34 29/44/29 +f 29/44/29 34/43/34 35/45/35 30/46/30 +f 30/47/30 35/48/35 31/38/31 26/37/26 +f 31/38/31 36/49/36 37/50/37 32/39/32 +f 32/39/32 37/50/37 38/51/38 33/41/33 +f 33/41/33 38/51/38 39/52/39 34/43/34 +f 34/43/34 39/52/39 40/53/40 35/45/35 +f 35/48/35 40/54/40 36/49/36 31/38/31 +f 36/49/36 1/1/1 4/4/4 37/50/37 +f 37/50/37 4/4/4 6/6/6 38/51/38 +f 38/51/38 6/6/6 8/8/8 39/52/39 +f 39/52/39 8/8/8 10/10/10 40/53/40 +f 1/1/1 36/49/36 40/54/40 10/11/10 +f 41/55/41 42/56/42 43/57/43 44/58/44 +f 44/59/44 43/60/43 45/61/45 46/62/46 +f 46/62/46 45/61/45 47/63/47 48/64/48 +f 48/64/48 47/63/47 49/65/49 50/66/50 +f 41/55/41 50/66/50 49/65/49 42/56/42 +f 42/56/42 51/67/51 52/68/52 43/57/43 +f 43/60/43 52/69/52 53/70/53 45/61/45 +f 45/61/45 53/70/53 54/71/54 47/63/47 +f 47/63/47 54/71/54 55/72/55 49/65/49 +f 49/65/49 55/72/55 51/67/51 42/56/42 +f 51/67/51 56/73/56 57/74/57 52/68/52 +f 52/69/52 57/75/57 58/76/58 53/70/53 +f 53/70/53 58/76/58 59/77/59 54/71/54 +f 54/71/54 59/77/59 60/78/60 55/72/55 +f 55/72/55 60/78/60 56/73/56 51/67/51 +f 56/73/56 61/79/21 62/80/61 57/74/57 +f 57/75/57 62/81/61 63/82/62 58/76/58 +f 58/76/58 63/82/62 64/83/63 59/77/59 +f 59/77/59 64/83/63 65/84/64 60/78/60 +f 60/78/60 65/84/64 61/79/21 56/73/56 +f 61/85/21 66/86/65 67/87/66 62/88/61 +f 62/35/61 67/89/66 68/90/67 63/91/62 +f 63/91/62 68/90/67 69/92/68 64/93/63 +f 64/93/63 69/92/68 70/94/69 65/95/64 +f 65/95/64 70/94/69 66/86/65 61/85/21 +f 66/86/65 71/96/70 72/97/71 67/87/66 +f 67/89/66 72/98/71 73/99/72 68/90/67 +f 68/90/67 73/99/72 74/100/73 69/92/68 +f 69/92/68 74/100/73 75/101/74 70/94/69 +f 70/94/69 75/101/74 71/96/70 66/86/65 +f 71/96/70 76/102/75 77/103/76 72/97/71 +f 72/98/71 77/104/76 78/105/77 73/99/72 +f 73/99/72 78/105/77 79/106/78 74/100/73 +f 74/100/73 79/106/78 80/107/79 75/101/74 +f 75/101/74 80/107/79 76/102/75 71/96/70 +f 76/102/75 41/55/41 44/58/44 77/103/76 +f 77/104/76 44/59/44 46/62/46 78/105/77 +f 78/105/77 46/62/46 48/64/48 79/106/78 +f 79/106/78 48/64/48 50/66/50 80/107/79 +f 41/55/41 76/102/75 80/107/79 50/66/50 +f 81/108/80 82/109/81 83/110/82 84/111/83 +f 84/9/83 83/17/82 85/112/78 86/113/48 +f 86/113/48 85/112/78 87/114/77 88/115/46 +f 88/115/46 87/114/77 89/116/84 90/117/85 +f 81/108/80 90/117/85 89/116/84 82/109/81 +f 82/109/81 91/118/86 92/119/87 83/110/82 +f 83/17/82 92/23/87 93/120/73 85/112/78 +f 85/112/78 93/120/73 94/121/72 87/114/77 +f 87/114/77 94/121/72 95/122/88 89/116/84 +f 89/116/84 95/122/88 91/118/86 82/109/81 +f 91/118/86 96/123/65 97/124/69 92/119/87 +f 92/23/87 97/29/69 98/125/68 93/120/73 +f 93/120/73 98/125/68 99/126/67 94/121/72 +f 94/121/72 99/126/67 100/127/66 95/122/88 +f 95/122/88 100/127/66 96/123/65 91/118/86 +f 96/123/65 101/85/21 102/88/64 97/124/69 +f 97/29/69 102/35/64 103/91/63 98/125/68 +f 98/125/68 103/91/63 104/93/62 99/126/67 +f 99/126/67 104/93/62 105/95/61 100/127/66 +f 100/127/66 105/95/61 101/85/21 96/123/65 +f 101/128/21 106/129/56 107/130/60 102/131/64 +f 102/46/64 107/45/60 108/132/59 103/133/63 +f 103/133/63 108/132/59 109/134/58 104/135/62 +f 104/135/62 109/134/58 110/136/57 105/137/61 +f 105/137/61 110/136/57 106/129/56 101/128/21 +f 106/129/56 111/138/89 112/139/90 107/130/60 +f 107/45/60 112/53/90 113/140/54 108/132/59 +f 108/132/59 113/140/54 114/141/53 109/134/58 +f 109/134/58 114/141/53 115/142/91 110/136/57 +f 110/136/57 115/142/91 111/138/89 106/129/56 +f 111/138/89 116/143/92 117/144/93 112/139/90 +f 112/53/90 117/10/93 118/145/47 113/140/54 +f 113/140/54 118/145/47 119/146/45 114/141/53 +f 114/141/53 119/146/45 120/147/94 115/142/91 +f 115/142/91 120/147/94 116/143/92 111/138/89 +f 116/143/92 81/108/80 84/111/83 117/144/93 +f 117/10/93 84/9/83 86/113/48 118/145/47 +f 118/145/47 86/113/48 88/115/46 119/146/45 +f 119/146/45 88/115/46 90/117/85 120/147/94 +f 81/108/80 116/143/92 120/147/94 90/117/85 +f 121/148/95 122/149/96 123/150/97 124/151/98 +f 124/151/98 123/150/97 125/152/39 126/153/8 +f 126/153/8 125/152/39 127/154/38 128/155/6 +f 128/155/6 127/154/38 129/156/99 130/157/100 +f 121/148/95 130/103/100 129/58/99 122/149/96 +f 122/149/96 131/158/101 132/159/102 123/150/97 +f 123/150/97 132/159/102 133/160/34 125/152/39 +f 125/152/39 133/160/34 134/161/33 127/154/38 +f 127/154/38 134/161/33 135/162/103 129/156/99 +f 129/58/99 135/57/103 131/158/101 122/149/96 +f 131/158/101 136/163/26 137/164/104 132/159/102 +f 132/159/102 137/164/104 138/165/105 133/160/34 +f 133/160/34 138/165/105 139/166/28 134/161/33 +f 134/161/33 139/166/28 140/167/106 135/162/103 +f 135/57/103 140/68/106 136/163/26 131/158/101 +f 136/163/26 141/168/21 142/169/25 137/164/104 +f 137/164/104 142/169/25 143/170/24 138/165/105 +f 138/165/105 143/170/24 144/171/23 139/166/28 +f 139/166/28 144/171/23 145/172/22 140/167/106 +f 140/68/106 145/74/22 141/168/21 136/163/26 +f 141/168/21 146/173/16 147/174/107 142/169/25 +f 142/169/25 147/174/107 148/175/19 143/170/24 +f 143/170/24 148/175/19 149/176/18 144/171/23 +f 144/171/23 149/176/18 150/177/108 145/172/22 +f 145/74/22 150/80/108 146/173/16 141/168/21 +f 146/178/16 151/179/109 152/180/110 147/181/107 +f 147/181/107 152/180/110 153/182/14 148/183/19 +f 148/183/19 153/182/14 154/184/13 149/185/18 +f 149/185/18 154/184/13 155/186/111 150/187/108 +f 150/88/108 155/87/111 151/179/109 146/178/16 +f 151/179/109 156/188/112 157/189/113 152/180/110 +f 152/180/110 157/189/113 158/190/7 153/182/14 +f 153/182/14 158/190/7 159/191/5 154/184/13 +f 154/184/13 159/191/5 160/192/114 155/186/111 +f 155/87/111 160/97/114 156/188/112 151/179/109 +f 156/188/112 121/148/95 124/151/98 157/189/113 +f 157/189/113 124/151/98 126/153/8 158/190/7 +f 158/190/7 126/153/8 128/155/6 159/191/5 +f 159/191/5 128/155/6 130/157/100 160/192/114 +f 121/148/95 156/188/112 160/97/114 130/103/100 +f 161/193/80 162/194/115 163/60/82 164/59/83 +f 164/195/83 163/196/82 165/197/78 166/198/48 +f 166/198/48 165/197/78 167/199/77 168/200/46 +f 168/200/46 167/199/77 169/201/84 170/202/85 +f 161/193/80 170/202/85 169/201/84 162/194/115 +f 162/194/115 171/203/86 172/69/87 163/60/82 +f 163/196/82 172/204/87 173/205/73 165/197/78 +f 165/197/78 173/205/73 174/206/72 167/199/77 +f 167/199/77 174/206/72 175/207/88 169/201/84 +f 169/201/84 175/207/88 171/203/86 162/194/115 +f 171/203/86 176/208/116 177/75/69 172/69/87 +f 172/204/87 177/209/69 178/210/68 173/205/73 +f 173/205/73 178/210/68 179/211/67 174/206/72 +f 174/206/72 179/211/67 180/212/66 175/207/88 +f 175/207/88 180/212/66 176/208/116 171/203/86 +f 176/208/116 181/213/21 182/81/64 177/75/69 +f 177/209/69 182/214/64 183/215/63 178/210/68 +f 178/210/68 183/215/63 184/216/62 179/211/67 +f 179/211/67 184/216/62 185/217/61 180/212/66 +f 180/212/66 185/217/61 181/213/21 176/208/116 +f 181/34/21 186/218/117 187/89/60 182/35/64 +f 182/36/64 187/219/60 188/220/59 183/31/63 +f 183/31/63 188/220/59 189/221/58 184/32/62 +f 184/32/62 189/221/58 190/222/57 185/33/61 +f 185/33/61 190/222/57 186/218/117 181/34/21 +f 186/218/117 191/223/89 192/98/90 187/89/60 +f 187/219/60 192/224/90 193/225/54 188/220/59 +f 188/220/59 193/225/54 194/226/53 189/221/58 +f 189/221/58 194/226/53 195/227/91 190/222/57 +f 190/222/57 195/227/91 191/223/89 186/218/117 +f 191/223/89 196/228/92 197/104/93 192/98/90 +f 192/224/90 197/229/93 198/230/47 193/225/54 +f 193/225/54 198/230/47 199/231/45 194/226/53 +f 194/226/53 199/231/45 200/232/94 195/227/91 +f 195/227/91 200/232/94 196/228/92 191/223/89 +f 196/228/92 161/193/80 164/59/83 197/104/93 +f 197/229/93 164/195/83 166/198/48 198/230/47 +f 198/230/47 166/198/48 168/200/46 199/231/45 +f 199/231/45 168/200/46 170/202/85 200/232/94 +f 161/193/80 196/228/92 200/232/94 170/202/85 +f 201/233/1 202/234/2 203/235/118 204/236/119 +f 204/111/119 203/110/118 205/237/5 206/238/6 +f 206/238/6 205/237/5 207/239/7 208/240/8 +f 208/240/8 207/239/7 209/241/120 210/242/121 +f 201/233/1 210/242/121 209/241/120 202/234/2 +f 202/234/2 211/243/122 212/244/123 203/235/118 +f 203/110/118 212/119/123 213/245/124 205/237/5 +f 205/237/5 213/245/124 214/246/125 207/239/7 +f 207/239/7 214/246/125 215/247/126 209/241/120 +f 209/241/120 215/247/126 211/243/122 202/234/2 +f 216/248/127 221/249/36 222/250/37 217/251/128 +f 217/139/128 222/144/37 223/252/129 218/253/130 +f 218/253/130 223/252/129 224/254/131 219/255/132 +f 219/255/132 224/254/131 225/256/40 220/257/133 +f 220/257/133 225/256/40 221/249/36 216/248/127 +f 221/249/36 201/233/1 204/236/119 222/250/37 +f 222/144/37 204/111/119 206/238/6 223/252/129 +f 223/252/129 206/238/6 208/240/8 224/254/131 +f 224/254/131 208/240/8 210/242/121 225/256/40 +f 201/233/1 221/249/36 225/256/40 210/242/121 +f 228/149/134 229/152/135 243/258/136 +f 230/188/137 231/190/138 244/259/139 +f 232/178/140 233/183/141 245/260/142 +f 234/245/143 235/247/144 246/261/145 +f 236/238/146 237/242/147 247/262/148 +f 240/173/149 241/175/150 248/263/151 +f 229/264/135 227/178/152 241/265/150 239/115/153 237/266/147 235/33/144 233/267/141 231/64/138 +f 238/253/154 239/257/153 249/268/155 +f 226/269/156 228/270/134 230/271/137 232/272/140 234/273/143 236/274/146 238/275/154 240/276/149 +f 226/163/156 227/165/152 242/277/157 +f 227/165/152 229/152/135 242/277/157 +f 229/152/135 228/149/134 242/277/157 +f 228/149/134 226/163/156 242/277/157 +f 229/152/135 231/190/138 243/258/136 +f 231/190/138 230/188/137 243/258/136 +f 230/188/137 228/149/134 243/258/136 +f 231/190/138 233/183/141 244/259/139 +f 233/183/141 232/178/140 244/259/139 +f 232/178/140 230/188/137 244/259/139 +f 233/183/141 235/247/144 245/260/142 +f 235/247/144 234/245/143 245/260/142 +f 234/245/143 232/178/140 245/260/142 +f 235/247/144 237/242/147 246/261/145 +f 237/242/147 236/238/146 246/261/145 +f 236/238/146 234/245/143 246/261/145 +f 237/242/147 239/257/153 247/262/148 +f 239/257/153 238/253/154 247/262/148 +f 238/253/154 236/238/146 247/262/148 +f 241/175/150 227/165/152 248/263/151 +f 227/165/152 226/163/156 248/263/151 +f 226/163/156 240/173/149 248/263/151 +f 239/257/153 241/278/150 249/268/155 +f 241/278/150 240/279/149 249/268/155 +f 240/279/149 238/253/154 249/268/155 diff --git a/homedecor/models/homedecor_chandelier.obj b/homedecor/models/homedecor_chandelier.obj new file mode 100644 index 0000000..83c609d --- /dev/null +++ b/homedecor/models/homedecor_chandelier.obj @@ -0,0 +1,1621 @@ +# Blender v2.73 (sub 0) OBJ File: 'chandelier.blend' +# www.blender.org +o Cylinder_Cylinder_candle +v -0.295811 0.120775 -0.377471 +v -0.295811 -0.066725 -0.377471 +v -0.295811 0.120775 -0.329636 +v -0.295811 -0.066725 -0.329636 +v -0.329636 0.120775 -0.295811 +v -0.329636 -0.066725 -0.295811 +v -0.377471 0.120775 -0.295811 +v -0.377471 -0.066725 -0.295811 +v -0.411296 0.120775 -0.329636 +v -0.411296 -0.066725 -0.329636 +v -0.411296 0.120775 -0.377471 +v -0.411296 -0.066725 -0.377471 +v -0.377471 0.120775 -0.411296 +v -0.377470 -0.066725 -0.411296 +v -0.329636 0.120775 -0.411296 +v -0.329636 -0.066725 -0.411296 +v -0.300709 0.120777 -0.300709 +v -0.300709 0.314857 -0.300709 +v -0.406398 0.314857 -0.406398 +v -0.406398 0.120777 -0.406398 +v -0.406398 0.120777 -0.300709 +v -0.406398 0.314857 -0.300709 +v -0.300709 0.314857 -0.406398 +v -0.300709 0.120777 -0.406398 +v -0.300709 0.120777 -0.300709 +v -0.406398 0.120777 -0.406398 +v -0.406398 0.314857 -0.406398 +v -0.300709 0.314857 -0.300709 +v -0.406398 0.120777 -0.300709 +v -0.300709 0.120777 -0.406398 +v -0.300709 0.314857 -0.406398 +v -0.406398 0.314857 -0.300709 +v 0.383845 -0.242188 0.383845 +v 0.368699 -0.205088 0.368699 +v 0.338408 -0.205088 0.338408 +v 0.323262 -0.242188 0.323262 +v 0.338408 -0.279287 0.338408 +v 0.368699 -0.279287 0.368699 +v 0.501517 -0.242188 0.207735 +v 0.481728 -0.205088 0.199539 +v 0.442151 -0.205088 0.183145 +v 0.422362 -0.242188 0.174948 +v 0.442151 -0.279287 0.183145 +v 0.481728 -0.279287 0.199539 +v 0.542838 -0.242188 0.000000 +v 0.521419 -0.205088 0.000000 +v 0.478581 -0.205088 0.000000 +v 0.457162 -0.242188 0.000000 +v 0.478581 -0.279287 0.000000 +v 0.521419 -0.279287 0.000000 +v 0.501517 -0.242188 -0.207735 +v 0.481729 -0.205088 -0.199538 +v 0.442151 -0.205088 -0.183145 +v 0.422362 -0.242188 -0.174948 +v 0.442151 -0.279287 -0.183145 +v 0.481729 -0.279287 -0.199538 +v 0.383845 -0.242188 -0.383845 +v 0.368699 -0.205088 -0.368699 +v 0.338408 -0.205088 -0.338408 +v 0.323262 -0.242188 -0.323262 +v 0.338408 -0.279287 -0.338408 +v 0.368699 -0.279287 -0.368699 +v 0.207735 -0.242188 -0.501517 +v 0.199538 -0.205088 -0.481728 +v 0.183145 -0.205088 -0.442151 +v 0.174948 -0.242188 -0.422362 +v 0.183145 -0.279287 -0.442151 +v 0.199538 -0.279287 -0.481728 +v -0.000000 -0.242188 -0.542838 +v -0.000000 -0.205088 -0.521419 +v -0.000000 -0.205088 -0.478581 +v -0.000000 -0.242188 -0.457162 +v -0.000000 -0.279287 -0.478581 +v -0.000000 -0.279287 -0.521419 +v -0.207735 -0.242188 -0.501517 +v -0.199538 -0.205088 -0.481728 +v -0.183145 -0.205088 -0.442151 +v -0.174948 -0.242188 -0.422362 +v -0.183145 -0.279287 -0.442151 +v -0.199538 -0.279287 -0.481728 +v -0.383845 -0.242188 -0.383845 +v -0.368699 -0.205088 -0.368699 +v -0.338408 -0.205088 -0.338408 +v -0.323262 -0.242188 -0.323262 +v -0.338408 -0.279287 -0.338408 +v -0.368699 -0.279287 -0.368699 +v -0.501517 -0.242188 -0.207735 +v -0.481728 -0.205088 -0.199539 +v -0.442151 -0.205088 -0.183145 +v -0.422362 -0.242188 -0.174948 +v -0.442151 -0.279287 -0.183145 +v -0.481728 -0.279287 -0.199539 +v -0.542838 -0.242188 -0.000000 +v -0.521419 -0.205088 -0.000000 +v -0.478581 -0.205088 -0.000000 +v -0.457162 -0.242188 -0.000000 +v -0.478581 -0.279287 -0.000000 +v -0.521419 -0.279287 -0.000000 +v -0.501517 -0.242188 0.207735 +v -0.481729 -0.205088 0.199538 +v -0.442151 -0.205088 0.183145 +v -0.422362 -0.242188 0.174948 +v -0.442151 -0.279287 0.183145 +v -0.481729 -0.279287 0.199538 +v -0.383845 -0.242188 0.383845 +v -0.368699 -0.205088 0.368699 +v -0.338408 -0.205088 0.338408 +v -0.323262 -0.242188 0.323262 +v -0.338408 -0.279287 0.338408 +v -0.368699 -0.279287 0.368699 +v -0.207735 -0.242188 0.501517 +v -0.199538 -0.205088 0.481729 +v -0.183145 -0.205088 0.442151 +v -0.174948 -0.242188 0.422362 +v -0.183145 -0.279287 0.442151 +v -0.199538 -0.279287 0.481729 +v -0.000000 -0.242188 0.542838 +v -0.000000 -0.205088 0.521419 +v -0.000000 -0.205088 0.478581 +v -0.000000 -0.242188 0.457162 +v -0.000000 -0.279287 0.478581 +v -0.000000 -0.279287 0.521419 +v 0.207735 -0.242188 0.501517 +v 0.199538 -0.205088 0.481729 +v 0.183145 -0.205088 0.442151 +v 0.174948 -0.242188 0.422362 +v 0.183145 -0.279287 0.442151 +v 0.199538 -0.279287 0.481729 +v 0.000000 0.354683 0.080195 +v -0.014044 0.354683 0.069112 +v -0.009826 0.354683 0.057941 +v 0.009826 0.354683 0.057941 +v 0.014044 0.354683 0.069112 +v 0.000000 0.439455 0.055211 +v -0.014044 0.430321 0.048870 +v -0.009826 0.418094 0.040970 +v 0.009826 0.418094 0.040970 +v 0.014044 0.430321 0.048870 +v 0.000000 0.468325 0.000002 +v -0.014044 0.461651 0.000002 +v -0.009826 0.444361 0.000002 +v 0.009826 0.444361 0.000002 +v 0.014044 0.461651 0.000002 +v 0.000000 0.439455 -0.055206 +v -0.014044 0.430321 -0.048868 +v -0.009826 0.418094 -0.040967 +v 0.009826 0.418094 -0.040967 +v 0.014044 0.430321 -0.048868 +v 0.000000 0.354683 -0.080190 +v -0.014044 0.354683 -0.069108 +v -0.009826 0.354683 -0.057936 +v 0.009826 0.354683 -0.057936 +v 0.014044 0.354683 -0.069108 +v 0.021213 -0.492188 -0.021213 +v 0.057910 0.355469 -0.057910 +v 0.030000 -0.492188 -0.000000 +v 0.081897 0.355469 -0.000000 +v 0.021213 -0.492188 0.021213 +v 0.057910 0.355469 0.057910 +v -0.000000 -0.492188 0.030000 +v -0.000000 0.355469 0.081897 +v -0.021213 -0.492188 0.021213 +v -0.057910 0.355469 0.057910 +v -0.030000 -0.492188 -0.000000 +v -0.081897 0.355469 -0.000000 +v -0.021213 -0.492188 -0.021213 +v -0.057910 0.355469 -0.057910 +v 0.000000 -0.492188 -0.030000 +v 0.000000 0.355469 -0.081897 +v 0.021213 0.248535 -0.021213 +v 0.000000 0.248535 -0.030000 +v -0.021213 0.248535 -0.021213 +v -0.030000 0.248535 -0.000000 +v -0.021213 0.248535 0.021213 +v -0.000000 0.248535 0.030000 +v 0.021213 0.248535 0.021213 +v 0.030000 0.248535 -0.000000 +v 0.063770 0.337158 -0.063770 +v 0.000000 0.337158 -0.090184 +v -0.063770 0.337158 -0.063770 +v -0.090184 0.337158 -0.000000 +v -0.063770 0.337158 0.063770 +v -0.000000 0.337158 0.090184 +v 0.063770 0.337158 0.063770 +v 0.090184 0.337158 -0.000000 +v -0.142765 -0.489924 -0.142764 +v -0.158080 -0.477606 -0.127449 +v -0.158080 -0.452969 -0.127449 +v -0.142765 -0.440650 -0.142764 +v -0.127449 -0.452969 -0.158080 +v -0.127449 -0.477606 -0.158080 +v -0.372981 -0.265266 -0.372980 +v -0.380054 -0.265266 -0.348286 +v -0.362433 -0.265266 -0.330665 +v -0.337738 -0.265266 -0.337738 +v -0.330665 -0.265266 -0.362432 +v -0.348286 -0.265266 -0.380054 +v -0.348363 -0.353916 -0.348362 +v -0.355819 -0.349148 -0.325231 +v -0.340144 -0.339611 -0.309556 +v -0.317013 -0.334843 -0.317012 +v -0.309556 -0.339611 -0.340143 +v -0.325232 -0.349148 -0.355818 +v -0.291164 -0.429409 -0.291164 +v -0.300968 -0.420598 -0.270366 +v -0.289974 -0.402977 -0.259372 +v -0.269176 -0.394166 -0.269176 +v -0.259372 -0.402977 -0.289974 +v -0.270366 -0.420598 -0.300968 +v -0.220433 -0.474407 -0.220433 +v -0.233205 -0.462895 -0.202396 +v -0.227941 -0.439872 -0.197132 +v -0.209904 -0.428360 -0.209904 +v -0.197132 -0.439872 -0.227941 +v -0.202396 -0.462895 -0.233205 +v -0.010263 -0.490208 -0.010263 +v -0.025524 -0.477748 0.004998 +v -0.025524 -0.452827 0.004998 +v -0.010263 -0.440367 -0.010263 +v 0.004997 -0.452827 -0.025524 +v 0.004997 -0.477748 -0.025524 +v 0.000000 -0.500000 -0.000000 +v -0.332137 -0.135637 -0.344683 +v -0.332137 -0.135637 -0.362424 +v -0.332137 -0.209329 -0.362424 +v -0.285471 -0.061946 -0.381754 +v -0.332137 -0.209329 -0.344683 +v -0.285471 -0.061946 -0.325353 +v -0.344682 -0.209329 -0.332137 +v -0.325353 -0.061946 -0.285472 +v -0.362424 -0.209329 -0.332137 +v -0.381754 -0.061946 -0.285472 +v -0.374969 -0.209329 -0.344683 +v -0.421635 -0.061946 -0.325353 +v -0.374969 -0.209329 -0.362424 +v -0.421635 -0.061946 -0.381754 +v -0.362424 -0.209329 -0.374970 +v -0.381754 -0.061946 -0.421635 +v -0.344682 -0.209329 -0.374970 +v -0.325353 -0.061946 -0.421635 +v -0.344682 -0.135637 -0.332137 +v -0.362424 -0.135637 -0.332137 +v -0.374969 -0.135637 -0.344683 +v -0.374969 -0.135637 -0.362424 +v -0.362424 -0.135637 -0.374970 +v -0.344682 -0.135637 -0.374970 +v -0.328258 -0.098792 -0.414622 +v -0.378849 -0.098792 -0.414622 +v -0.292484 -0.098792 -0.378849 +v -0.332137 -0.172483 -0.344683 +v -0.414622 -0.098792 -0.378849 +v -0.344682 -0.172483 -0.332137 +v -0.414622 -0.098792 -0.328258 +v -0.362424 -0.172483 -0.332137 +v -0.378849 -0.098792 -0.292484 +v -0.374969 -0.172483 -0.344683 +v -0.328258 -0.098792 -0.292484 +v -0.374969 -0.172483 -0.362424 +v -0.292484 -0.098792 -0.328258 +v -0.362424 -0.172483 -0.374970 +v -0.332137 -0.172483 -0.362424 +v -0.344682 -0.172483 -0.374970 +v 0.377471 0.120775 -0.295811 +v 0.377471 -0.066725 -0.295811 +v 0.329636 0.120775 -0.295811 +v 0.329636 -0.066725 -0.295811 +v 0.295811 0.120775 -0.329636 +v 0.295811 -0.066725 -0.329636 +v 0.295811 0.120775 -0.377471 +v 0.295811 -0.066725 -0.377471 +v 0.329636 0.120775 -0.411296 +v 0.329636 -0.066725 -0.411296 +v 0.377471 0.120775 -0.411296 +v 0.377471 -0.066725 -0.411296 +v 0.411296 0.120775 -0.377471 +v 0.411296 -0.066725 -0.377471 +v 0.411296 0.120775 -0.329636 +v 0.411296 -0.066725 -0.329636 +v 0.300709 0.120777 -0.300709 +v 0.300709 0.314857 -0.300709 +v 0.406398 0.314857 -0.406398 +v 0.406398 0.120777 -0.406398 +v 0.300709 0.120777 -0.406398 +v 0.300709 0.314857 -0.406398 +v 0.406398 0.314857 -0.300709 +v 0.406398 0.120777 -0.300709 +v 0.300709 0.120777 -0.300709 +v 0.406398 0.120777 -0.406398 +v 0.406398 0.314857 -0.406398 +v 0.300709 0.314857 -0.300709 +v 0.300709 0.120777 -0.406398 +v 0.406398 0.120777 -0.300709 +v 0.406398 0.314857 -0.300709 +v 0.300709 0.314857 -0.406398 +v 0.142764 -0.489924 -0.142765 +v 0.127448 -0.477606 -0.158080 +v 0.127448 -0.452969 -0.158080 +v 0.142764 -0.440650 -0.142765 +v 0.158080 -0.452969 -0.127449 +v 0.158080 -0.477606 -0.127449 +v 0.372980 -0.265266 -0.372981 +v 0.348286 -0.265266 -0.380054 +v 0.330665 -0.265266 -0.362433 +v 0.337738 -0.265266 -0.337738 +v 0.362432 -0.265266 -0.330665 +v 0.380054 -0.265266 -0.348286 +v 0.348362 -0.353916 -0.348363 +v 0.325231 -0.349148 -0.355819 +v 0.309556 -0.339611 -0.340144 +v 0.317012 -0.334843 -0.317013 +v 0.340143 -0.339611 -0.309556 +v 0.355818 -0.349148 -0.325232 +v 0.291164 -0.429409 -0.291164 +v 0.270366 -0.420598 -0.300968 +v 0.259372 -0.402977 -0.289974 +v 0.269176 -0.394166 -0.269176 +v 0.289974 -0.402977 -0.259372 +v 0.300968 -0.420598 -0.270366 +v 0.220433 -0.474407 -0.220433 +v 0.202396 -0.462895 -0.233205 +v 0.197132 -0.439872 -0.227941 +v 0.209904 -0.428360 -0.209904 +v 0.227941 -0.439872 -0.197132 +v 0.233205 -0.462895 -0.202396 +v 0.010263 -0.490208 -0.010263 +v -0.004998 -0.477748 -0.025524 +v -0.004998 -0.452827 -0.025524 +v 0.010263 -0.440367 -0.010263 +v 0.025524 -0.452827 0.004997 +v 0.025524 -0.477748 0.004997 +v 0.344683 -0.135637 -0.332137 +v 0.362424 -0.135637 -0.332137 +v 0.362424 -0.209329 -0.332137 +v 0.381754 -0.061946 -0.285471 +v 0.344683 -0.209329 -0.332137 +v 0.325353 -0.061946 -0.285471 +v 0.332137 -0.209329 -0.344683 +v 0.285472 -0.061946 -0.325353 +v 0.332137 -0.209329 -0.362424 +v 0.285472 -0.061946 -0.381754 +v 0.344683 -0.209329 -0.374969 +v 0.325353 -0.061946 -0.421635 +v 0.362424 -0.209329 -0.374969 +v 0.381754 -0.061946 -0.421635 +v 0.374970 -0.209329 -0.362424 +v 0.421635 -0.061946 -0.381754 +v 0.374970 -0.209329 -0.344683 +v 0.421635 -0.061946 -0.325353 +v 0.332137 -0.135637 -0.344683 +v 0.332137 -0.135637 -0.362424 +v 0.344683 -0.135637 -0.374969 +v 0.362424 -0.135637 -0.374969 +v 0.374970 -0.135637 -0.362424 +v 0.374970 -0.135637 -0.344683 +v 0.414623 -0.098792 -0.328258 +v 0.414622 -0.098792 -0.378849 +v 0.378849 -0.098792 -0.292484 +v 0.344683 -0.172483 -0.332137 +v 0.378849 -0.098792 -0.414622 +v 0.332137 -0.172483 -0.344683 +v 0.328258 -0.098792 -0.414622 +v 0.332137 -0.172483 -0.362424 +v 0.292484 -0.098792 -0.378849 +v 0.344683 -0.172483 -0.374969 +v 0.292484 -0.098792 -0.328258 +v 0.362424 -0.172483 -0.374969 +v 0.328258 -0.098792 -0.292484 +v 0.374970 -0.172483 -0.362424 +v 0.362424 -0.172483 -0.332137 +v 0.374970 -0.172483 -0.344683 +v 0.295811 0.120775 0.377471 +v 0.295811 -0.066725 0.377471 +v 0.295811 0.120775 0.329636 +v 0.295811 -0.066725 0.329636 +v 0.329636 0.120775 0.295811 +v 0.329636 -0.066725 0.295811 +v 0.377471 0.120775 0.295811 +v 0.377471 -0.066725 0.295811 +v 0.411296 0.120775 0.329636 +v 0.411296 -0.066725 0.329636 +v 0.411296 0.120775 0.377471 +v 0.411296 -0.066725 0.377471 +v 0.377471 0.120775 0.411296 +v 0.377471 -0.066725 0.411296 +v 0.329636 0.120775 0.411296 +v 0.329636 -0.066725 0.411296 +v 0.300709 0.120776 0.300709 +v 0.300709 0.314857 0.300709 +v 0.406398 0.314857 0.406398 +v 0.406398 0.120776 0.406398 +v 0.406398 0.120776 0.300709 +v 0.406398 0.314857 0.300709 +v 0.300709 0.314857 0.406398 +v 0.300709 0.120776 0.406398 +v 0.300709 0.120776 0.300709 +v 0.406398 0.120776 0.406398 +v 0.406398 0.314857 0.406398 +v 0.300709 0.314857 0.300709 +v 0.406398 0.120776 0.300709 +v 0.300709 0.120776 0.406398 +v 0.300709 0.314857 0.406398 +v 0.406398 0.314857 0.300709 +v 0.142765 -0.489924 0.142764 +v 0.158080 -0.477606 0.127448 +v 0.158080 -0.452969 0.127449 +v 0.142765 -0.440650 0.142764 +v 0.127449 -0.452969 0.158080 +v 0.127449 -0.477606 0.158080 +v 0.372981 -0.265266 0.372980 +v 0.380054 -0.265266 0.348286 +v 0.362433 -0.265266 0.330665 +v 0.337738 -0.265266 0.337738 +v 0.330665 -0.265266 0.362432 +v 0.348286 -0.265266 0.380054 +v 0.348363 -0.353916 0.348362 +v 0.355819 -0.349148 0.325231 +v 0.340144 -0.339611 0.309556 +v 0.317013 -0.334843 0.317012 +v 0.309556 -0.339611 0.340143 +v 0.325232 -0.349148 0.355818 +v 0.291164 -0.429409 0.291164 +v 0.300968 -0.420598 0.270366 +v 0.289974 -0.402977 0.259372 +v 0.269176 -0.394166 0.269176 +v 0.259372 -0.402977 0.289974 +v 0.270366 -0.420598 0.300968 +v 0.220433 -0.474407 0.220433 +v 0.233205 -0.462895 0.202396 +v 0.227941 -0.439872 0.197132 +v 0.209904 -0.428360 0.209904 +v 0.197132 -0.439872 0.227941 +v 0.202396 -0.462895 0.233205 +v 0.010263 -0.490208 0.010263 +v 0.025524 -0.477748 -0.004998 +v 0.025524 -0.452827 -0.004998 +v 0.010263 -0.440367 0.010263 +v -0.004997 -0.452827 0.025524 +v -0.004997 -0.477748 0.025524 +v 0.332137 -0.135637 0.344683 +v 0.332137 -0.135637 0.362424 +v 0.332137 -0.209329 0.362424 +v 0.285472 -0.061946 0.381754 +v 0.332137 -0.209329 0.344683 +v 0.285471 -0.061946 0.325353 +v 0.344683 -0.209329 0.332137 +v 0.325353 -0.061946 0.285472 +v 0.362424 -0.209329 0.332137 +v 0.381754 -0.061946 0.285472 +v 0.374969 -0.209329 0.344683 +v 0.421635 -0.061946 0.325353 +v 0.374970 -0.209329 0.362424 +v 0.421635 -0.061946 0.381754 +v 0.362424 -0.209329 0.374970 +v 0.381754 -0.061946 0.421635 +v 0.344683 -0.209329 0.374970 +v 0.325353 -0.061946 0.421635 +v 0.344683 -0.135637 0.332137 +v 0.362424 -0.135637 0.332137 +v 0.374969 -0.135637 0.344683 +v 0.374970 -0.135637 0.362424 +v 0.362424 -0.135637 0.374970 +v 0.344683 -0.135637 0.374970 +v 0.328258 -0.098792 0.414622 +v 0.378849 -0.098792 0.414622 +v 0.292484 -0.098792 0.378849 +v 0.332137 -0.172483 0.344683 +v 0.414622 -0.098792 0.378849 +v 0.344683 -0.172483 0.332137 +v 0.414622 -0.098792 0.328258 +v 0.362424 -0.172483 0.332137 +v 0.378849 -0.098792 0.292484 +v 0.374969 -0.172483 0.344683 +v 0.328258 -0.098792 0.292484 +v 0.374970 -0.172483 0.362424 +v 0.292484 -0.098792 0.328258 +v 0.362424 -0.172483 0.374970 +v 0.332137 -0.172483 0.362424 +v 0.344683 -0.172483 0.374970 +v -0.377471 0.120775 0.295811 +v -0.377471 -0.066725 0.295811 +v -0.329636 0.120775 0.295811 +v -0.329636 -0.066725 0.295811 +v -0.295811 0.120775 0.329636 +v -0.295811 -0.066725 0.329636 +v -0.295811 0.120775 0.377471 +v -0.295811 -0.066725 0.377471 +v -0.329636 0.120775 0.411296 +v -0.329636 -0.066725 0.411296 +v -0.377470 0.120775 0.411296 +v -0.377471 -0.066725 0.411296 +v -0.411296 0.120775 0.377471 +v -0.411296 -0.066725 0.377471 +v -0.411296 0.120775 0.329636 +v -0.411296 -0.066725 0.329636 +v -0.300709 0.120777 0.300709 +v -0.300709 0.314857 0.300709 +v -0.406398 0.314857 0.406398 +v -0.406398 0.120777 0.406398 +v -0.300709 0.120777 0.406398 +v -0.300709 0.314857 0.406398 +v -0.406398 0.314857 0.300709 +v -0.406398 0.120777 0.300709 +v -0.300709 0.120777 0.300709 +v -0.406398 0.120777 0.406398 +v -0.406398 0.314857 0.406398 +v -0.300709 0.314857 0.300709 +v -0.300709 0.120777 0.406398 +v -0.406398 0.120777 0.300709 +v -0.406398 0.314857 0.300709 +v -0.300709 0.314857 0.406398 +v -0.142764 -0.489924 0.142765 +v -0.127448 -0.477606 0.158080 +v -0.127448 -0.452969 0.158080 +v -0.142764 -0.440650 0.142765 +v -0.158080 -0.452969 0.127449 +v -0.158080 -0.477606 0.127449 +v -0.372980 -0.265266 0.372981 +v -0.348286 -0.265266 0.380054 +v -0.330665 -0.265266 0.362433 +v -0.337738 -0.265266 0.337738 +v -0.362432 -0.265266 0.330665 +v -0.380054 -0.265266 0.348286 +v -0.348362 -0.353916 0.348363 +v -0.325231 -0.349148 0.355819 +v -0.309556 -0.339611 0.340144 +v -0.317012 -0.334843 0.317013 +v -0.340143 -0.339611 0.309557 +v -0.355818 -0.349148 0.325232 +v -0.291164 -0.429409 0.291165 +v -0.270366 -0.420598 0.300968 +v -0.259372 -0.402977 0.289974 +v -0.269176 -0.394166 0.269176 +v -0.289974 -0.402977 0.259372 +v -0.300968 -0.420598 0.270366 +v -0.220433 -0.474407 0.220433 +v -0.202396 -0.462895 0.233205 +v -0.197132 -0.439872 0.227941 +v -0.209904 -0.428360 0.209904 +v -0.227941 -0.439872 0.197132 +v -0.233205 -0.462895 0.202396 +v -0.010263 -0.490208 0.010263 +v 0.004998 -0.477748 0.025524 +v 0.004998 -0.452827 0.025524 +v -0.010263 -0.440367 0.010263 +v -0.025524 -0.452827 -0.004997 +v -0.025524 -0.477748 -0.004997 +v -0.344683 -0.135637 0.332137 +v -0.362424 -0.135637 0.332137 +v -0.362424 -0.209329 0.332137 +v -0.381754 -0.061946 0.285472 +v -0.344683 -0.209329 0.332137 +v -0.325353 -0.061946 0.285472 +v -0.332137 -0.209329 0.344683 +v -0.285472 -0.061946 0.325353 +v -0.332137 -0.209329 0.362424 +v -0.285472 -0.061946 0.381754 +v -0.344683 -0.209329 0.374970 +v -0.325353 -0.061946 0.421635 +v -0.362424 -0.209329 0.374970 +v -0.381754 -0.061946 0.421635 +v -0.374970 -0.209329 0.362424 +v -0.421635 -0.061946 0.381754 +v -0.374969 -0.209329 0.344683 +v -0.421635 -0.061946 0.325353 +v -0.332137 -0.135637 0.344683 +v -0.332137 -0.135637 0.362424 +v -0.344682 -0.135637 0.374970 +v -0.362424 -0.135637 0.374970 +v -0.374970 -0.135637 0.362424 +v -0.374970 -0.135637 0.344683 +v -0.414622 -0.098792 0.328258 +v -0.414622 -0.098792 0.378849 +v -0.378849 -0.098792 0.292484 +v -0.344683 -0.172483 0.332137 +v -0.378849 -0.098792 0.414622 +v -0.332137 -0.172483 0.344683 +v -0.328258 -0.098792 0.414622 +v -0.332137 -0.172483 0.362424 +v -0.292484 -0.098792 0.378849 +v -0.344683 -0.172483 0.374970 +v -0.292484 -0.098792 0.328258 +v -0.362424 -0.172483 0.374970 +v -0.328258 -0.098792 0.292484 +v -0.374970 -0.172483 0.362424 +v -0.362424 -0.172483 0.332137 +v -0.374970 -0.172483 0.344683 +vt 0.687500 0.812500 +vt 0.750000 0.812500 +vt 0.750000 0.875000 +vt 0.687500 0.875000 +vt 0.750000 0.937500 +vt 0.687500 0.937500 +vt 0.750000 1.000000 +vt 0.687500 1.000000 +vt 0.687500 0.625000 +vt 0.750000 0.625000 +vt 0.750000 0.687500 +vt 0.687500 0.687500 +vt 0.750000 0.750000 +vt 0.687500 0.750000 +vt 0.812500 0.812500 +vt 0.812500 0.875000 +vt 0.812500 0.937500 +vt 0.812500 1.000000 +vt 0.812500 0.625000 +vt 0.812500 0.687500 +vt 0.812500 0.750000 +vt 0.875000 0.812500 +vt 0.875000 0.875000 +vt 0.875000 0.937500 +vt 0.875000 1.000000 +vt 0.875000 0.625000 +vt 0.875000 0.687500 +vt 0.875000 0.750000 +vt 0.937500 0.812500 +vt 0.937500 0.875000 +vt 0.937500 0.937500 +vt 0.937500 1.000000 +vt 0.937500 0.625000 +vt 0.937500 0.687500 +vt 0.937500 0.750000 +vt 1.000000 0.812500 +vt 1.000000 0.875000 +vt 1.000000 0.937500 +vt 1.000000 1.000000 +vt 1.000000 0.625000 +vt 1.000000 0.687500 +vt 1.000000 0.750000 +vt 0.000000 0.812500 +vt 0.062500 0.812500 +vt 0.062500 0.875000 +vt 0.000000 0.875000 +vt 0.062500 0.937500 +vt 0.000000 0.937500 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.625000 +vt 0.062500 0.625000 +vt 0.062500 0.687500 +vt 0.000000 0.687500 +vt 0.062500 0.750000 +vt 0.000000 0.750000 +vt 0.125000 0.812500 +vt 0.125000 0.875000 +vt 0.125000 0.937500 +vt 0.125000 1.000000 +vt 0.125000 0.625000 +vt 0.125000 0.687500 +vt 0.125000 0.750000 +vt 0.187500 0.812500 +vt 0.187500 0.875000 +vt 0.187500 0.937500 +vt 0.187500 1.000000 +vt 0.187500 0.625000 +vt 0.187500 0.687500 +vt 0.187500 0.750000 +vt 0.250000 0.812500 +vt 0.250000 0.875000 +vt 0.250000 0.937500 +vt 0.250000 1.000000 +vt 0.250000 0.625000 +vt 0.250000 0.687500 +vt 0.250000 0.750000 +vt 0.312500 0.812500 +vt 0.312500 0.875000 +vt 0.312500 0.937500 +vt 0.312500 1.000000 +vt 0.312500 0.625000 +vt 0.312500 0.687500 +vt 0.312500 0.750000 +vt 0.375000 0.812500 +vt 0.375000 0.875000 +vt 0.375000 0.937500 +vt 0.375000 1.000000 +vt 0.375000 0.625000 +vt 0.375000 0.687500 +vt 0.375000 0.750000 +vt 0.437500 0.812500 +vt 0.437500 0.875000 +vt 0.437500 0.937500 +vt 0.437500 1.000000 +vt 0.437500 0.625000 +vt 0.437500 0.687500 +vt 0.437500 0.750000 +vt 0.500000 0.812500 +vt 0.500000 0.875000 +vt 0.500000 0.937500 +vt 0.500000 1.000000 +vt 0.500000 0.625000 +vt 0.500000 0.687500 +vt 0.500000 0.750000 +vt 0.562500 0.812500 +vt 0.562500 0.875000 +vt 0.562500 0.937500 +vt 0.562500 1.000000 +vt 0.562500 0.625000 +vt 0.562500 0.687500 +vt 0.562500 0.750000 +vt 0.625000 0.812500 +vt 0.625000 0.875000 +vt 0.625000 0.937500 +vt 0.625000 1.000000 +vt 0.625000 0.625000 +vt 0.625000 0.687500 +vt 0.625000 0.750000 +vt 0.750000 0.500000 +vt 0.812500 0.500000 +vt 0.812500 0.562500 +vt 0.750000 0.562500 +vt 0.750000 0.312500 +vt 0.812500 0.312500 +vt 0.812500 0.375000 +vt 0.750000 0.375000 +vt 0.812500 0.437500 +vt 0.750000 0.437500 +vt 0.875000 0.500000 +vt 0.875000 0.562500 +vt 0.875000 0.312500 +vt 0.875000 0.375000 +vt 0.875000 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.562500 +vt 0.937500 0.312500 +vt 0.937500 0.375000 +vt 0.937500 0.437500 +vt 1.000000 0.500000 +vt 1.000000 0.562500 +vt 1.000000 0.312500 +vt 1.000000 0.375000 +vt 1.000000 0.437500 +vt 0.750000 0.062500 +vt 0.687500 0.062500 +vt 0.625000 0.062500 +vt 0.562500 0.062500 +vt 0.812500 0.062500 +vt 1.000000 0.062500 +vt 0.937500 0.062500 +vt 0.433478 0.933478 +vt 0.375000 0.957700 +vt 0.316522 0.933478 +vt 0.292299 0.875000 +vt 0.316522 0.816522 +vt 0.375000 0.792300 +vt 0.433478 0.816522 +vt 0.457700 0.875000 +vt 0.875000 0.062500 +vt 0.500000 0.062500 +vt 0.250000 0.125000 +vt 0.375000 0.125000 +vt 0.375000 0.187500 +vt 0.250000 0.187500 +vt 0.375000 0.250000 +vt 0.250000 0.250000 +vt 0.375000 0.312500 +vt 0.250000 0.312500 +vt 0.375000 0.375000 +vt 0.250000 0.375000 +vt 0.375000 0.437500 +vt 0.250000 0.437500 +vt 0.375000 0.500000 +vt 0.250000 0.500000 +vt 0.500000 0.125000 +vt 0.500000 0.187500 +vt 0.500000 0.250000 +vt 0.500000 0.312500 +vt 0.500000 0.375000 +vt 0.500000 0.437500 +vt 0.500000 0.500000 +vt 0.625000 0.125000 +vt 0.625000 0.187500 +vt 0.625000 0.250000 +vt 0.625000 0.312500 +vt 0.625000 0.375000 +vt 0.625000 0.437500 +vt 0.625000 0.500000 +vt 0.750000 0.125000 +vt 0.750000 0.187500 +vt 0.750000 0.250000 +vt 1.000000 0.187500 +vt 1.000000 0.250000 +vt 1.000000 0.125000 +vt 0.562500 0.905294 +vt 0.583921 0.896421 +vt 0.592794 0.875000 +vt 0.583921 0.853579 +vt 0.562500 0.844706 +vt 0.541079 0.853579 +vt 0.532206 0.875000 +vt 0.541079 0.896421 +vt 0.250000 0.562500 +vt 0.187500 0.562500 +vt 0.187500 0.500000 +vt 0.187500 0.312500 +vt 0.125000 0.312500 +vt 0.125000 0.250000 +vt 0.187500 0.250000 +vt 0.062500 0.437500 +vt 0.000000 0.437500 +vt 0.000000 0.375000 +vt 0.062500 0.375000 +vt 0.187500 0.437500 +vt 0.187500 0.375000 +vt 0.125000 0.187500 +vt 0.187500 0.187500 +vt 0.000000 0.312500 +vt 0.062500 0.312500 +vt 0.125000 0.500000 +vt 0.062500 0.500000 +vt 0.125000 0.437500 +vt 0.125000 0.125000 +vt 0.187500 0.125000 +vt 0.000000 0.250000 +vt 0.062500 0.250000 +vt 0.125000 0.562500 +vt 0.062500 0.562500 +vt 0.125000 0.062500 +vt 0.187500 0.062500 +vt 0.000000 0.187500 +vt 0.062500 0.187500 +vt 0.000000 0.125000 +vt 0.062500 0.125000 +vt 0.125000 0.375000 +vt 0.000000 0.062500 +vt 0.062500 0.062500 +vt 0.193749 0.903477 +vt 0.153477 0.943749 +vt 0.096523 0.943749 +vt 0.056250 0.903477 +vt 0.056250 0.846523 +vt 0.096523 0.806251 +vt 0.153477 0.806251 +vt 0.193749 0.846523 +vt 0.000000 0.500000 +vt 0.000000 0.562500 +vt 0.250000 0.062500 +vt 0.875000 0.250000 +vt 0.454164 0.776526 +vt 0.476190 0.785650 +vt 0.498216 0.776526 +vt 0.507340 0.754500 +vt 0.498216 0.732474 +vt 0.476190 0.723350 +vt 0.454164 0.732474 +vt 0.445040 0.754500 +vt 1.000000 -0.000000 +vt -0.000000 -0.000000 +vn 0.707100 0.000000 0.707100 +vn 0.923900 0.000000 0.382700 +vn 0.502500 0.839100 0.208200 +vn 0.384600 0.839100 0.384600 +vn -0.416000 0.892900 -0.172300 +vn -0.318400 0.892900 -0.318400 +vn -0.923900 0.000000 -0.382700 +vn -0.707100 0.000000 -0.707100 +vn -0.416000 -0.892900 -0.172300 +vn -0.318400 -0.892900 -0.318400 +vn 0.502500 -0.839100 0.208200 +vn 0.384600 -0.839100 0.384600 +vn 1.000000 0.000000 0.000000 +vn 0.544000 0.839100 0.000000 +vn -0.450300 0.892900 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.450300 -0.892900 0.000000 +vn 0.544000 -0.839100 0.000000 +vn 0.923900 0.000000 -0.382700 +vn 0.502500 0.839100 -0.208200 +vn -0.416000 0.892900 0.172300 +vn -0.923900 0.000000 0.382700 +vn -0.416000 -0.892900 0.172300 +vn 0.502500 -0.839100 -0.208200 +vn 0.707100 0.000000 -0.707100 +vn 0.384600 0.839100 -0.384600 +vn -0.318400 0.892900 0.318400 +vn -0.707100 0.000000 0.707100 +vn -0.318400 -0.892900 0.318400 +vn 0.384600 -0.839100 -0.384600 +vn 0.382700 0.000000 -0.923900 +vn 0.208200 0.839100 -0.502500 +vn -0.172300 0.892900 0.416000 +vn -0.382700 0.000000 0.923900 +vn -0.172300 -0.892900 0.416000 +vn 0.208200 -0.839100 -0.502500 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.839100 -0.544000 +vn 0.000000 0.892900 0.450300 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.892900 0.450300 +vn 0.000000 -0.839100 -0.544000 +vn -0.382700 0.000000 -0.923900 +vn -0.208200 0.839100 -0.502500 +vn 0.172300 0.892900 0.416000 +vn 0.382700 0.000000 0.923900 +vn 0.172300 -0.892900 0.416000 +vn -0.208200 -0.839100 -0.502500 +vn -0.384600 0.839100 -0.384600 +vn 0.318400 0.892900 0.318400 +vn 0.318400 -0.892900 0.318400 +vn -0.384600 -0.839100 -0.384600 +vn -0.502500 0.839100 -0.208200 +vn 0.416000 0.892900 0.172300 +vn 0.416000 -0.892900 0.172300 +vn -0.502500 -0.839100 -0.208200 +vn -0.544000 0.839100 0.000000 +vn 0.450300 0.892900 0.000000 +vn 0.450300 -0.892900 0.000000 +vn -0.544000 -0.839100 0.000000 +vn -0.502500 0.839100 0.208200 +vn 0.416000 0.892900 -0.172300 +vn 0.416000 -0.892900 -0.172300 +vn -0.502500 -0.839100 0.208200 +vn -0.384600 0.839100 0.384600 +vn 0.318400 0.892900 -0.318400 +vn 0.318400 -0.892900 -0.318400 +vn -0.384600 -0.839100 0.384600 +vn -0.208200 0.839100 0.502500 +vn 0.172300 0.892900 -0.416000 +vn 0.172300 -0.892900 -0.416000 +vn -0.208200 -0.839100 0.502500 +vn 0.000000 0.839100 0.544000 +vn 0.000000 0.892900 -0.450300 +vn 0.000000 -0.892900 -0.450300 +vn 0.000000 -0.839100 0.544000 +vn 0.208200 0.839100 0.502500 +vn -0.172300 0.892900 -0.416000 +vn -0.172300 -0.892900 -0.416000 +vn 0.208200 -0.839100 0.502500 +vn 0.000000 0.271400 0.962500 +vn 0.000000 0.657400 0.753500 +vn -0.898300 0.248500 0.362300 +vn -0.919700 0.109100 0.377200 +vn -0.661500 -0.421500 -0.620200 +vn -0.603800 -0.206100 -0.770000 +vn 0.661500 -0.421500 -0.620200 +vn 0.603800 -0.206100 -0.770000 +vn 0.898300 0.248500 0.362300 +vn 0.919700 0.109100 0.377200 +vn 0.000000 1.000000 0.000000 +vn -0.866100 0.499800 0.000000 +vn -0.746000 -0.665900 0.000000 +vn 0.746000 -0.665900 0.000000 +vn 0.866100 0.499800 0.000000 +vn 0.000000 0.657400 -0.753500 +vn -0.898300 0.248500 -0.362400 +vn -0.661500 -0.421500 0.620200 +vn 0.661500 -0.421500 0.620200 +vn 0.898300 0.248500 -0.362400 +vn 0.000000 0.271300 -0.962500 +vn -0.919700 0.109100 -0.377300 +vn -0.603800 -0.206100 0.770000 +vn 0.603800 -0.206100 0.770000 +vn 0.919700 0.109100 -0.377300 +vn 0.705000 -0.077000 -0.705000 +vn 0.441300 0.781300 -0.441300 +vn 0.624100 0.781300 0.000000 +vn 0.997000 -0.077000 0.000000 +vn 0.441300 0.781300 0.441300 +vn 0.705000 -0.077000 0.705000 +vn 0.000000 0.781300 0.624100 +vn 0.000000 -0.077000 0.997000 +vn 0.000000 -0.316200 0.948700 +vn -0.670800 -0.316200 0.670800 +vn -0.591400 -0.548100 0.591400 +vn 0.000000 -0.548100 0.836400 +vn 0.948700 -0.316200 0.000000 +vn 0.670800 -0.316200 0.670800 +vn 0.591400 -0.548100 0.591400 +vn 0.836400 -0.548100 0.000000 +vn -0.441300 0.781300 0.441300 +vn -0.705000 -0.077000 0.705000 +vn -0.948700 -0.316200 0.000000 +vn -0.836400 -0.548100 0.000000 +vn -0.624100 0.781300 0.000000 +vn -0.997000 -0.077000 0.000000 +vn 0.000000 -0.316200 -0.948700 +vn 0.670800 -0.316200 -0.670800 +vn 0.591400 -0.548100 -0.591400 +vn 0.000000 -0.548100 -0.836400 +vn -0.441300 0.781300 -0.441300 +vn -0.705000 -0.077000 -0.705000 +vn 0.000000 0.781300 -0.624100 +vn 0.000000 -0.077000 -0.997000 +vn -0.670800 -0.316200 -0.670800 +vn -0.591400 -0.548100 -0.591400 +vn -0.656900 -0.370100 -0.656900 +vn -0.588500 -0.554300 -0.588500 +vn -0.908700 -0.325900 0.260900 +vn -0.959400 -0.228900 0.164600 +vn -0.365700 0.254800 0.895100 +vn -0.365200 0.154400 0.918000 +vn 0.569700 0.592400 0.569700 +vn 0.653400 0.382100 0.653400 +vn 0.895100 0.254800 -0.365700 +vn 0.918000 0.154400 -0.365200 +vn 0.260900 -0.325900 -0.908700 +vn 0.164600 -0.228900 -0.959400 +vn -0.393900 -0.830400 -0.393900 +vn -0.802900 -0.461100 0.377800 +vn -0.444700 0.398100 0.802300 +vn 0.369900 0.852200 0.369900 +vn 0.802300 0.398100 -0.444700 +vn 0.377800 -0.461100 -0.802900 +vn -0.196100 -0.960800 -0.196100 +vn -0.699900 -0.519500 0.490100 +vn -0.534000 0.459500 0.709600 +vn 0.181700 0.966400 0.181700 +vn 0.709600 0.459500 -0.534000 +vn 0.490100 -0.519500 -0.699900 +vn -0.048400 -0.997600 -0.048400 +vn -0.630000 -0.518800 0.577900 +vn -0.595000 0.486700 0.639600 +vn 0.046900 0.997800 0.046900 +vn 0.639600 0.486700 -0.595000 +vn 0.577900 -0.518800 -0.630000 +vn -0.611900 -0.501600 0.611500 +vn -0.611900 0.501600 0.611500 +vn -0.000700 1.000000 -0.000700 +vn 0.611500 0.501600 -0.611900 +vn -0.000700 -1.000000 -0.000700 +vn 0.611500 -0.501600 -0.611900 +vn 0.000000 -1.000000 0.000000 +vn 0.339400 -0.461800 0.819400 +vn -0.339400 -0.461800 0.819400 +vn 0.812600 -0.475700 -0.336600 +vn 0.770000 0.552600 -0.318900 +vn 0.770000 0.552600 0.318900 +vn 0.812600 -0.475700 0.336600 +vn -0.819400 -0.461800 0.339400 +vn 0.318900 0.552600 0.770000 +vn 0.336600 -0.475700 0.812600 +vn 0.339400 -0.461800 -0.819400 +vn 0.336600 -0.475700 -0.812600 +vn 0.819400 -0.461800 -0.339400 +vn -0.819400 -0.461800 -0.339400 +vn -0.318900 0.552600 0.770000 +vn -0.336600 -0.475700 0.812600 +vn -0.339400 -0.461800 -0.819400 +vn -0.336600 -0.475700 -0.812600 +vn -0.770000 0.552600 0.318900 +vn -0.812600 -0.475700 0.336600 +vn -0.770000 0.552600 -0.318900 +vn -0.812600 -0.475700 -0.336600 +vn 0.819400 -0.461800 0.339400 +vn -0.318900 0.552600 -0.770000 +vn 0.318900 0.552600 -0.770000 +vn 0.656900 -0.370100 -0.656900 +vn 0.588500 -0.554300 -0.588500 +vn -0.260900 -0.325900 -0.908700 +vn -0.164600 -0.228900 -0.959400 +vn -0.895100 0.254800 -0.365700 +vn -0.918000 0.154400 -0.365200 +vn -0.569700 0.592400 0.569700 +vn -0.653400 0.382100 0.653400 +vn 0.365700 0.254800 0.895100 +vn 0.365200 0.154400 0.918000 +vn 0.908700 -0.325900 0.260900 +vn 0.959400 -0.228900 0.164600 +vn 0.393900 -0.830400 -0.393900 +vn -0.377800 -0.461100 -0.802900 +vn -0.802300 0.398100 -0.444700 +vn -0.369900 0.852200 0.369900 +vn 0.444700 0.398100 0.802300 +vn 0.802900 -0.461100 0.377800 +vn 0.196100 -0.960800 -0.196100 +vn -0.490100 -0.519500 -0.699900 +vn -0.709600 0.459500 -0.534000 +vn -0.181700 0.966400 0.181700 +vn 0.534000 0.459500 0.709600 +vn 0.699900 -0.519500 0.490100 +vn 0.048400 -0.997600 -0.048400 +vn -0.577900 -0.518800 -0.630000 +vn -0.639600 0.486700 -0.595000 +vn -0.046900 0.997800 0.046900 +vn 0.595000 0.486700 0.639600 +vn 0.630000 -0.518800 0.577900 +vn -0.611500 -0.501600 -0.611900 +vn -0.611500 0.501600 -0.611900 +vn 0.000700 1.000000 -0.000700 +vn 0.611900 0.501600 0.611500 +vn 0.000700 -1.000000 -0.000700 +vn 0.611900 -0.501600 0.611500 +vn 0.656900 -0.370100 0.656900 +vn 0.588500 -0.554300 0.588500 +vn 0.908700 -0.325900 -0.260900 +vn 0.959400 -0.228900 -0.164600 +vn 0.365700 0.254800 -0.895100 +vn 0.365200 0.154400 -0.918000 +vn -0.569700 0.592400 -0.569700 +vn -0.653400 0.382100 -0.653400 +vn -0.895100 0.254800 0.365700 +vn -0.918000 0.154400 0.365200 +vn -0.260900 -0.325900 0.908700 +vn -0.164600 -0.228900 0.959400 +vn 0.393900 -0.830400 0.393900 +vn 0.802900 -0.461100 -0.377800 +vn 0.444700 0.398100 -0.802300 +vn -0.369900 0.852200 -0.369900 +vn -0.802300 0.398100 0.444700 +vn -0.377800 -0.461100 0.802900 +vn 0.196100 -0.960800 0.196100 +vn 0.699900 -0.519500 -0.490100 +vn 0.534000 0.459500 -0.709600 +vn -0.181700 0.966400 -0.181700 +vn -0.709600 0.459500 0.534000 +vn -0.490100 -0.519500 0.699900 +vn 0.048400 -0.997600 0.048400 +vn 0.630000 -0.518800 -0.577900 +vn 0.595000 0.486700 -0.639600 +vn -0.046900 0.997800 -0.046900 +vn -0.639600 0.486700 0.595000 +vn -0.577900 -0.518800 0.630000 +vn 0.611900 -0.501600 -0.611500 +vn 0.611900 0.501600 -0.611500 +vn 0.000700 1.000000 0.000700 +vn -0.611500 0.501600 0.611900 +vn 0.000700 -1.000000 0.000700 +vn -0.611500 -0.501600 0.611900 +vn -0.656900 -0.370100 0.656900 +vn -0.588500 -0.554300 0.588500 +vn 0.260900 -0.325900 0.908700 +vn 0.164600 -0.228900 0.959400 +vn 0.895100 0.254800 0.365700 +vn 0.918000 0.154400 0.365200 +vn 0.569700 0.592400 -0.569700 +vn 0.653400 0.382100 -0.653400 +vn -0.365700 0.254800 -0.895100 +vn -0.365200 0.154400 -0.918000 +vn -0.908700 -0.325900 -0.260800 +vn -0.959400 -0.228900 -0.164600 +vn -0.393900 -0.830400 0.393900 +vn 0.377800 -0.461100 0.802900 +vn 0.802300 0.398100 0.444700 +vn 0.369900 0.852200 -0.369900 +vn -0.444700 0.398100 -0.802300 +vn -0.802900 -0.461100 -0.377800 +vn -0.196100 -0.960800 0.196100 +vn 0.490100 -0.519500 0.699900 +vn 0.709600 0.459500 0.534000 +vn 0.181700 0.966400 -0.181700 +vn -0.534000 0.459500 -0.709600 +vn -0.699900 -0.519500 -0.490100 +vn -0.048400 -0.997600 0.048400 +vn 0.577900 -0.518800 0.630000 +vn 0.639600 0.486700 0.595000 +vn 0.046900 0.997800 -0.046900 +vn -0.595000 0.486700 -0.639600 +vn -0.630000 -0.518800 -0.577900 +vn 0.611500 -0.501600 0.611900 +vn 0.611500 0.501600 0.611900 +vn -0.000700 1.000000 0.000700 +vn -0.611900 0.501600 -0.611500 +vn -0.000700 -1.000000 0.000700 +vn -0.611900 -0.501600 -0.611500 +vn -0.297100 0.630200 -0.717300 +vn 0.297100 0.630200 -0.717300 +vn -0.717300 0.630200 0.297100 +vn -0.297100 0.630200 0.717300 +vn -0.717300 0.630200 -0.297100 +vn 0.717300 0.630200 0.297100 +vn 0.717300 0.630200 -0.297100 +vn 0.297100 0.630200 0.717300 +g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_metal +s 1 +f 33/1/1 39/2/2 40/3/3 34/4/4 +f 34/4/4 40/3/3 41/5/5 35/6/6 +f 35/6/6 41/5/5 42/7/7 36/8/8 +f 36/9/8 42/10/7 43/11/9 37/12/10 +f 37/12/10 43/11/9 44/13/11 38/14/12 +f 33/1/1 38/14/12 44/13/11 39/2/2 +f 39/2/2 45/15/13 46/16/14 40/3/3 +f 40/3/3 46/16/14 47/17/15 41/5/5 +f 41/5/5 47/17/15 48/18/16 42/7/7 +f 42/10/7 48/19/16 49/20/17 43/11/9 +f 43/11/9 49/20/17 50/21/18 44/13/11 +f 44/13/11 50/21/18 45/15/13 39/2/2 +f 45/15/13 51/22/19 52/23/20 46/16/14 +f 46/16/14 52/23/20 53/24/21 47/17/15 +f 47/17/15 53/24/21 54/25/22 48/18/16 +f 48/19/16 54/26/22 55/27/23 49/20/17 +f 49/20/17 55/27/23 56/28/24 50/21/18 +f 50/21/18 56/28/24 51/22/19 45/15/13 +f 51/22/19 57/29/25 58/30/26 52/23/20 +f 52/23/20 58/30/26 59/31/27 53/24/21 +f 53/24/21 59/31/27 60/32/28 54/25/22 +f 54/26/22 60/33/28 61/34/29 55/27/23 +f 55/27/23 61/34/29 62/35/30 56/28/24 +f 56/28/24 62/35/30 57/29/25 51/22/19 +f 57/29/25 63/36/31 64/37/32 58/30/26 +f 58/30/26 64/37/32 65/38/33 59/31/27 +f 59/31/27 65/38/33 66/39/34 60/32/28 +f 60/33/28 66/40/34 67/41/35 61/34/29 +f 61/34/29 67/41/35 68/42/36 62/35/30 +f 62/35/30 68/42/36 63/36/31 57/29/25 +f 63/43/31 69/44/37 70/45/38 64/46/32 +f 64/46/32 70/45/38 71/47/39 65/48/33 +f 65/48/33 71/47/39 72/49/40 66/50/34 +f 66/51/34 72/52/40 73/53/41 67/54/35 +f 67/54/35 73/53/41 74/55/42 68/56/36 +f 68/56/36 74/55/42 69/44/37 63/43/31 +f 69/44/37 75/57/43 76/58/44 70/45/38 +f 70/45/38 76/58/44 77/59/45 71/47/39 +f 71/47/39 77/59/45 78/60/46 72/49/40 +f 72/52/40 78/61/46 79/62/47 73/53/41 +f 73/53/41 79/62/47 80/63/48 74/55/42 +f 74/55/42 80/63/48 75/57/43 69/44/37 +f 75/57/43 81/64/8 82/65/49 76/58/44 +f 76/58/44 82/65/49 83/66/50 77/59/45 +f 77/59/45 83/66/50 84/67/1 78/60/46 +f 78/61/46 84/68/1 85/69/51 79/62/47 +f 79/62/47 85/69/51 86/70/52 80/63/48 +f 80/63/48 86/70/52 81/64/8 75/57/43 +f 81/64/8 87/71/7 88/72/53 82/65/49 +f 82/65/49 88/72/53 89/73/54 83/66/50 +f 83/66/50 89/73/54 90/74/2 84/67/1 +f 84/68/1 90/75/2 91/76/55 85/69/51 +f 85/69/51 91/76/55 92/77/56 86/70/52 +f 86/70/52 92/77/56 87/71/7 81/64/8 +f 87/71/7 93/78/16 94/79/57 88/72/53 +f 88/72/53 94/79/57 95/80/58 89/73/54 +f 89/73/54 95/80/58 96/81/13 90/74/2 +f 90/75/2 96/82/13 97/83/59 91/76/55 +f 91/76/55 97/83/59 98/84/60 92/77/56 +f 92/77/56 98/84/60 93/78/16 87/71/7 +f 93/78/16 99/85/22 100/86/61 94/79/57 +f 94/79/57 100/86/61 101/87/62 95/80/58 +f 95/80/58 101/87/62 102/88/19 96/81/13 +f 96/82/13 102/89/19 103/90/63 97/83/59 +f 97/83/59 103/90/63 104/91/64 98/84/60 +f 98/84/60 104/91/64 99/85/22 93/78/16 +f 99/85/22 105/92/28 106/93/65 100/86/61 +f 100/86/61 106/93/65 107/94/66 101/87/62 +f 101/87/62 107/94/66 108/95/25 102/88/19 +f 102/89/19 108/96/25 109/97/67 103/90/63 +f 103/90/63 109/97/67 110/98/68 104/91/64 +f 104/91/64 110/98/68 105/92/28 99/85/22 +f 105/92/28 111/99/34 112/100/69 106/93/65 +f 106/93/65 112/100/69 113/101/70 107/94/66 +f 107/94/66 113/101/70 114/102/31 108/95/25 +f 108/96/25 114/103/31 115/104/71 109/97/67 +f 109/97/67 115/104/71 116/105/72 110/98/68 +f 110/98/68 116/105/72 111/99/34 105/92/28 +f 111/99/34 117/106/40 118/107/73 112/100/69 +f 112/100/69 118/107/73 119/108/74 113/101/70 +f 113/101/70 119/108/74 120/109/37 114/102/31 +f 114/103/31 120/110/37 121/111/75 115/104/71 +f 115/104/71 121/111/75 122/112/76 116/105/72 +f 116/105/72 122/112/76 117/106/40 111/99/34 +f 117/106/40 123/113/46 124/114/77 118/107/73 +f 118/107/73 124/114/77 125/115/78 119/108/74 +f 119/108/74 125/115/78 126/116/43 120/109/37 +f 120/110/37 126/117/43 127/118/79 121/111/75 +f 121/111/75 127/118/79 128/119/80 122/112/76 +f 122/112/76 128/119/80 123/113/46 117/106/40 +f 123/113/46 33/1/1 34/4/4 124/114/77 +f 124/114/77 34/4/4 35/6/6 125/115/78 +f 125/115/78 35/6/6 36/8/8 126/116/43 +f 126/117/43 36/9/8 37/12/10 127/118/79 +f 127/118/79 37/12/10 38/14/12 128/119/80 +f 128/119/80 38/14/12 33/1/1 123/113/46 +f 129/120/81 134/121/82 135/122/83 130/123/84 +f 130/123/84 135/122/83 136/19/85 131/10/86 +f 131/124/86 136/125/85 137/126/87 132/127/88 +f 132/127/88 137/126/87 138/128/89 133/129/90 +f 133/129/90 138/128/89 134/121/82 129/120/81 +f 134/121/82 139/130/91 140/131/92 135/122/83 +f 135/122/83 140/131/92 141/26/93 136/19/85 +f 136/125/85 141/132/93 142/133/94 137/126/87 +f 137/126/87 142/133/94 143/134/95 138/128/89 +f 138/128/89 143/134/95 139/130/91 134/121/82 +f 139/130/91 144/135/96 145/136/97 140/131/92 +f 140/131/92 145/136/97 146/33/98 141/26/93 +f 141/132/93 146/137/98 147/138/99 142/133/94 +f 142/133/94 147/138/99 148/139/100 143/134/95 +f 143/134/95 148/139/100 144/135/96 139/130/91 +f 144/135/96 149/140/101 150/141/102 145/136/97 +f 145/136/97 150/141/102 151/40/103 146/33/98 +f 146/137/98 151/142/103 152/143/104 147/138/99 +f 147/138/99 152/143/104 153/144/105 148/139/100 +f 148/139/100 153/144/105 149/140/101 144/135/96 +f 178/30/106 155/31/107 157/24/108 185/23/109 +f 185/23/109 157/24/108 159/17/110 184/16/111 +f 184/16/111 159/17/110 161/5/112 183/3/113 +f 175/1/114 174/2/115 162/145/116 160/146/117 +f 177/106/118 176/113/119 158/147/120 156/148/121 +f 183/3/113 161/5/112 163/6/122 182/4/123 +f 174/2/115 173/15/124 164/149/125 162/145/116 +f 182/4/123 163/6/122 165/115/126 181/114/127 +f 171/29/128 170/36/129 154/150/130 168/151/131 +f 181/114/127 165/115/126 167/108/132 180/107/133 +f 157/152/108 155/153/107 169/154/134 167/155/132 165/156/126 163/157/122 161/158/112 159/159/110 +f 179/37/135 169/38/134 155/31/107 178/30/106 +f 180/107/133 167/108/132 169/101/134 179/100/135 +f 172/22/136 171/29/128 168/151/131 166/160/137 +f 173/15/124 172/22/136 166/160/137 164/149/125 +f 176/113/119 175/1/114 160/146/117 158/147/120 +f 154/161/130 170/99/129 177/106/118 156/148/121 +f 172/106/136 180/107/133 179/100/135 171/99/128 +f 171/36/128 179/37/135 178/30/106 170/29/129 +f 173/113/124 181/114/127 180/107/133 172/106/136 +f 174/1/115 182/4/123 181/114/127 173/113/124 +f 175/2/114 183/3/113 182/4/123 174/1/115 +f 176/15/119 184/16/111 183/3/113 175/2/114 +f 177/22/118 185/23/109 184/16/111 176/15/119 +f 170/29/129 178/30/106 185/23/109 177/22/118 +f 192/162/138 198/163/139 199/164/140 193/165/141 +f 193/165/141 199/164/140 200/166/142 194/167/143 +f 194/167/143 200/166/142 201/168/144 195/169/145 +f 195/169/145 201/168/144 202/170/146 196/171/147 +f 196/171/147 202/170/146 203/172/148 197/173/149 +f 197/173/149 203/172/148 198/174/139 192/175/138 +f 198/163/139 204/176/150 205/177/151 199/164/140 +f 199/164/140 205/177/151 206/178/152 200/166/142 +f 200/166/142 206/178/152 207/179/153 201/168/144 +f 201/168/144 207/179/153 208/180/154 202/170/146 +f 202/170/146 208/180/154 209/181/155 203/172/148 +f 203/172/148 209/181/155 204/182/150 198/174/139 +f 204/176/150 210/183/156 211/184/157 205/177/151 +f 205/177/151 211/184/157 212/185/158 206/178/152 +f 206/178/152 212/185/158 213/186/159 207/179/153 +f 207/179/153 213/186/159 214/187/160 208/180/154 +f 208/180/154 214/187/160 215/188/161 209/181/155 +f 209/181/155 215/188/161 210/189/156 204/182/150 +f 210/183/156 186/190/162 187/191/163 211/184/157 +f 211/184/157 187/191/163 188/192/164 212/185/158 +f 212/185/158 188/192/164 189/124/165 213/186/159 +f 213/186/159 189/124/165 190/127/166 214/187/160 +f 214/187/160 190/127/166 191/129/167 215/188/161 +f 215/188/161 191/129/167 186/120/162 210/189/156 +f 188/192/164 187/191/163 217/193/168 218/194/169 +f 190/127/166 189/124/165 219/142/170 220/143/171 +f 187/191/163 186/190/162 216/195/172 217/193/168 +f 189/124/165 188/192/164 218/194/169 219/142/170 +f 186/120/162 191/129/167 221/144/173 216/140/172 +f 191/129/167 190/127/166 220/143/171 221/144/173 +f 154/196/130 156/197/121 222/107/174 +f 156/197/121 158/198/120 222/107/174 +f 158/198/120 160/199/117 222/107/174 +f 160/199/117 162/200/116 222/107/174 +f 162/200/116 164/201/125 222/107/174 +f 164/201/125 166/202/137 222/107/174 +f 166/202/137 168/203/131 222/107/174 +f 168/203/131 154/196/130 222/107/174 +f 237/204/43 260/205/43 262/206/31 239/175/31 +f 252/207/46 241/208/175 242/209/176 254/210/34 +f 249/211/177 226/212/178 228/213/179 259/214/180 +f 225/173/19 261/215/19 250/216/2 227/171/2 +f 254/210/34 242/209/176 243/217/181 256/218/22 +f 259/214/180 228/213/179 230/219/182 257/220/183 +f 246/221/184 247/222/185 249/211/177 224/223/186 +f 256/218/22 243/217/181 244/224/187 258/225/7 +f 257/220/183 230/219/182 232/226/188 255/227/189 +f 245/228/190 248/229/191 247/222/185 246/221/184 +f 258/225/7 244/224/187 245/230/190 260/231/43 +f 255/227/189 232/226/188 234/232/192 253/233/193 +f 227/171/2 250/216/2 252/207/46 229/169/46 +f 262/206/31 246/221/184 224/223/186 261/215/19 +f 253/233/193 234/232/192 236/234/194 251/235/195 +f 261/215/19 224/223/186 223/236/196 250/216/2 +f 260/205/43 245/228/190 246/221/184 262/206/31 +f 251/235/195 236/234/194 238/237/197 248/238/191 +f 228/239/179 226/240/178 240/241/198 238/242/197 236/243/194 234/244/192 232/245/188 230/246/182 +f 247/222/185 240/247/198 226/212/178 249/211/177 +f 248/229/191 238/248/197 240/247/198 247/222/185 +f 244/224/187 251/235/195 248/238/191 245/230/190 +f 250/216/2 223/236/196 241/208/175 252/207/46 +f 243/217/181 253/233/193 251/235/195 244/224/187 +f 239/175/31 262/206/31 261/215/19 225/173/19 +f 242/209/176 255/227/189 253/233/193 243/217/181 +f 235/162/7 258/225/7 260/231/43 237/249/43 +f 241/208/175 257/220/183 255/227/189 242/209/176 +f 233/165/22 256/218/22 258/225/7 235/162/7 +f 223/236/196 259/214/180 257/220/183 241/208/175 +f 231/167/34 254/210/34 256/218/22 233/165/22 +f 224/223/186 249/211/177 259/214/180 223/236/196 +f 229/169/46 252/207/46 254/210/34 231/167/34 +f 301/162/199 307/163/200 308/164/201 302/165/202 +f 302/165/202 308/164/201 309/166/203 303/167/204 +f 303/167/204 309/166/203 310/168/205 304/169/206 +f 304/169/206 310/168/205 311/170/207 305/171/208 +f 305/171/208 311/170/207 312/172/209 306/173/210 +f 306/173/210 312/172/209 307/174/200 301/175/199 +f 307/163/200 313/176/211 314/177/212 308/164/201 +f 308/164/201 314/177/212 315/178/213 309/166/203 +f 309/166/203 315/178/213 316/179/214 310/168/205 +f 310/168/205 316/179/214 317/180/215 311/170/207 +f 311/170/207 317/180/215 318/181/216 312/172/209 +f 312/172/209 318/181/216 313/182/211 307/174/200 +f 313/176/211 319/183/217 320/184/218 314/177/212 +f 314/177/212 320/184/218 321/185/219 315/178/213 +f 315/178/213 321/185/219 322/186/220 316/179/214 +f 316/179/214 322/186/220 323/187/221 317/180/215 +f 317/180/215 323/187/221 324/188/222 318/181/216 +f 318/181/216 324/188/222 319/189/217 313/182/211 +f 319/183/217 295/190/223 296/191/224 320/184/218 +f 320/184/218 296/191/224 297/192/225 321/185/219 +f 321/185/219 297/192/225 298/124/226 322/186/220 +f 322/186/220 298/124/226 299/127/227 323/187/221 +f 323/187/221 299/127/227 300/129/228 324/188/222 +f 324/188/222 300/129/228 295/120/223 319/189/217 +f 297/192/225 296/191/224 326/193/229 327/194/230 +f 299/127/227 298/124/226 328/142/231 329/143/232 +f 296/191/224 295/190/223 325/195/233 326/193/229 +f 298/124/226 297/192/225 327/194/230 328/142/231 +f 295/120/223 300/129/228 330/144/234 325/140/233 +f 300/129/228 299/127/227 329/143/232 330/144/234 +f 345/204/19 368/205/19 370/206/2 347/175/2 +f 360/207/22 349/208/181 350/209/187 362/210/7 +f 357/211/183 334/212/182 336/213/188 367/214/189 +f 333/173/46 369/215/46 358/216/34 335/171/34 +f 362/210/7 350/209/187 351/217/190 364/218/43 +f 367/214/189 336/213/188 338/219/192 365/220/193 +f 354/221/196 355/222/180 357/211/183 332/223/175 +f 364/218/43 351/217/190 352/224/184 366/225/31 +f 365/220/193 338/219/192 340/226/194 363/227/195 +f 353/228/186 356/229/177 355/222/180 354/221/196 +f 366/225/31 352/224/184 353/230/186 368/231/19 +f 363/227/195 340/226/194 342/232/197 361/233/191 +f 335/171/34 358/216/34 360/207/22 337/169/22 +f 370/206/2 354/221/196 332/223/175 369/215/46 +f 361/233/191 342/232/197 344/234/198 359/235/185 +f 369/215/46 332/223/175 331/236/176 358/216/34 +f 368/205/19 353/228/186 354/221/196 370/206/2 +f 359/235/185 344/234/198 346/237/178 356/238/177 +f 336/239/188 334/240/182 348/241/179 346/242/178 344/243/198 342/244/197 340/245/194 338/246/192 +f 355/222/180 348/247/179 334/212/182 357/211/183 +f 356/229/177 346/248/178 348/247/179 355/222/180 +f 352/224/184 359/235/185 356/238/177 353/230/186 +f 358/216/34 331/236/176 349/208/181 360/207/22 +f 351/217/190 361/233/191 359/235/185 352/224/184 +f 347/175/2 370/206/2 369/215/46 333/173/46 +f 350/209/187 363/227/195 361/233/191 351/217/190 +f 343/162/31 366/225/31 368/231/19 345/249/19 +f 349/208/181 365/220/193 363/227/195 350/209/187 +f 341/165/43 364/218/43 366/225/31 343/162/31 +f 331/236/176 367/214/189 365/220/193 349/208/181 +f 339/167/7 362/210/7 364/218/43 341/165/43 +f 332/223/175 357/211/183 367/214/189 331/236/176 +f 337/169/22 360/207/22 362/210/7 339/167/7 +f 409/162/235 415/163/236 416/164/237 410/165/238 +f 410/165/238 416/164/237 417/166/239 411/167/240 +f 411/167/240 417/166/239 418/168/241 412/169/242 +f 412/169/242 418/168/241 419/170/243 413/171/244 +f 413/171/244 419/170/243 420/172/245 414/173/246 +f 414/173/246 420/172/245 415/174/236 409/175/235 +f 415/163/236 421/176/247 422/177/248 416/164/237 +f 416/164/237 422/177/248 423/178/249 417/166/239 +f 417/166/239 423/178/249 424/179/250 418/168/241 +f 418/168/241 424/179/250 425/180/251 419/170/243 +f 419/170/243 425/180/251 426/181/252 420/172/245 +f 420/172/245 426/181/252 421/182/247 415/174/236 +f 421/176/247 427/183/253 428/184/254 422/177/248 +f 422/177/248 428/184/254 429/185/255 423/178/249 +f 423/178/249 429/185/255 430/186/256 424/179/250 +f 424/179/250 430/186/256 431/187/257 425/180/251 +f 425/180/251 431/187/257 432/188/258 426/181/252 +f 426/181/252 432/188/258 427/189/253 421/182/247 +f 427/183/253 403/190/259 404/191/260 428/184/254 +f 428/184/254 404/191/260 405/192/261 429/185/255 +f 429/185/255 405/192/261 406/124/262 430/186/256 +f 430/186/256 406/124/262 407/127/263 431/187/257 +f 431/187/257 407/127/263 408/129/264 432/188/258 +f 432/188/258 408/129/264 403/120/259 427/189/253 +f 405/192/261 404/191/260 434/193/265 435/194/266 +f 407/127/263 406/124/262 436/142/267 437/143/268 +f 404/191/260 403/190/259 433/195/269 434/193/265 +f 406/124/262 405/192/261 435/194/266 436/142/267 +f 403/120/259 408/129/264 438/144/270 433/140/269 +f 408/129/264 407/127/263 437/143/268 438/144/270 +f 453/204/46 476/205/46 478/206/34 455/175/34 +f 468/207/43 457/208/190 458/209/184 470/210/31 +f 465/211/193 442/212/192 444/213/194 475/214/195 +f 441/173/22 477/215/22 466/216/7 443/171/7 +f 470/210/31 458/209/184 459/217/186 472/218/19 +f 475/214/195 444/213/194 446/219/197 473/220/191 +f 462/221/176 463/222/189 465/211/193 440/223/181 +f 472/218/19 459/217/186 460/224/196 474/225/2 +f 473/220/191 446/219/197 448/226/198 471/227/185 +f 461/228/175 464/229/183 463/222/189 462/221/176 +f 474/225/2 460/224/196 461/230/175 476/231/46 +f 471/227/185 448/226/198 450/232/178 469/233/177 +f 443/171/7 466/216/7 468/207/43 445/169/43 +f 478/206/34 462/221/176 440/223/181 477/215/22 +f 469/233/177 450/232/178 452/234/179 467/235/180 +f 477/215/22 440/223/181 439/236/187 466/216/7 +f 476/205/46 461/228/175 462/221/176 478/206/34 +f 467/235/180 452/234/179 454/237/182 464/238/183 +f 444/239/194 442/240/192 456/241/188 454/242/182 452/243/179 450/244/178 448/245/198 446/246/197 +f 463/222/189 456/247/188 442/212/192 465/211/193 +f 464/229/183 454/248/182 456/247/188 463/222/189 +f 460/224/196 467/235/180 464/238/183 461/230/175 +f 466/216/7 439/236/187 457/208/190 468/207/43 +f 459/217/186 469/233/177 467/235/180 460/224/196 +f 455/175/34 478/206/34 477/215/22 441/173/22 +f 458/209/184 471/227/185 469/233/177 459/217/186 +f 451/162/2 474/225/2 476/231/46 453/249/46 +f 457/208/190 473/220/191 471/227/185 458/209/184 +f 449/165/19 472/218/19 474/225/2 451/162/2 +f 439/236/187 475/214/195 473/220/191 457/208/190 +f 447/167/31 470/210/31 472/218/19 449/165/19 +f 440/223/181 465/211/193 475/214/195 439/236/187 +f 445/169/43 468/207/43 470/210/31 447/167/31 +f 517/162/271 523/163/272 524/164/273 518/165/274 +f 518/165/274 524/164/273 525/166/275 519/167/276 +f 519/167/276 525/166/275 526/168/277 520/169/278 +f 520/169/278 526/168/277 527/170/279 521/171/280 +f 521/171/280 527/170/279 528/172/281 522/173/282 +f 522/173/282 528/172/281 523/174/272 517/175/271 +f 523/163/272 529/176/283 530/177/284 524/164/273 +f 524/164/273 530/177/284 531/178/285 525/166/275 +f 525/166/275 531/178/285 532/179/286 526/168/277 +f 526/168/277 532/179/286 533/180/287 527/170/279 +f 527/170/279 533/180/287 534/181/288 528/172/281 +f 528/172/281 534/181/288 529/182/283 523/174/272 +f 529/176/283 535/183/289 536/184/290 530/177/284 +f 530/177/284 536/184/290 537/185/291 531/178/285 +f 531/178/285 537/185/291 538/186/292 532/179/286 +f 532/179/286 538/186/292 539/187/293 533/180/287 +f 533/180/287 539/187/293 540/188/294 534/181/288 +f 534/181/288 540/188/294 535/189/289 529/182/283 +f 535/183/289 511/190/295 512/191/296 536/184/290 +f 536/184/290 512/191/296 513/192/297 537/185/291 +f 537/185/291 513/192/297 514/124/298 538/186/292 +f 538/186/292 514/124/298 515/127/299 539/187/293 +f 539/187/293 515/127/299 516/129/300 540/188/294 +f 540/188/294 516/129/300 511/120/295 535/189/289 +f 513/192/297 512/191/296 542/193/301 543/194/302 +f 515/127/299 514/124/298 544/142/303 545/143/304 +f 512/191/296 511/190/295 541/195/305 542/193/301 +f 514/124/298 513/192/297 543/194/302 544/142/303 +f 511/120/295 516/129/300 546/144/306 541/140/305 +f 516/129/300 515/127/299 545/143/304 546/144/306 +f 561/204/22 584/205/22 586/206/7 563/175/7 +f 576/207/19 565/208/186 566/209/196 578/210/2 +f 573/211/191 550/212/197 552/213/198 583/214/185 +f 549/173/43 585/215/43 574/216/31 551/171/31 +f 578/210/2 566/209/196 567/217/175 580/218/46 +f 583/214/185 552/213/198 554/219/178 581/220/177 +f 570/221/187 571/222/195 573/211/191 548/223/190 +f 580/218/46 567/217/175 568/224/176 582/225/34 +f 581/220/177 554/219/178 556/226/179 579/227/180 +f 569/228/181 572/229/193 571/222/195 570/221/187 +f 582/225/34 568/224/176 569/230/181 584/231/22 +f 579/227/180 556/226/179 558/232/182 577/233/183 +f 551/171/31 574/216/31 576/207/19 553/169/19 +f 586/206/7 570/221/187 548/223/190 585/215/43 +f 577/233/183 558/232/182 560/234/188 575/235/189 +f 585/215/43 548/223/190 547/236/184 574/216/31 +f 584/205/22 569/228/181 570/221/187 586/206/7 +f 575/235/189 560/234/188 562/237/192 572/238/193 +f 552/239/198 550/240/197 564/241/194 562/242/192 560/243/188 558/244/182 556/245/179 554/246/178 +f 571/222/195 564/247/194 550/212/197 573/211/191 +f 572/229/193 562/248/192 564/247/194 571/222/195 +f 568/224/176 575/235/189 572/238/193 569/230/181 +f 574/216/31 547/236/184 565/208/186 576/207/19 +f 567/217/175 577/233/183 575/235/189 568/224/176 +f 563/175/7 586/206/7 585/215/43 549/173/43 +f 566/209/196 579/227/180 577/233/183 567/217/175 +f 559/162/34 582/225/34 584/231/22 561/249/22 +f 565/208/186 581/220/177 579/227/180 566/209/196 +f 557/165/46 580/218/46 582/225/34 559/162/34 +f 547/236/184 583/214/185 581/220/177 565/208/186 +f 555/167/2 578/210/2 580/218/46 557/165/46 +f 548/223/190 573/211/191 583/214/185 547/236/184 +f 553/169/19 576/207/19 578/210/2 555/167/2 +g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_candle +f 13/130/307 15/120/308 16/192/31 14/250/43 +f 9/221/309 10/209/22 8/167/34 7/175/310 +f 9/221/309 11/247/311 12/226/7 10/209/22 +f 3/182/312 4/178/2 2/185/19 1/189/313 +f 13/130/307 14/250/43 12/194/7 11/140/311 +f 2/185/19 16/192/31 15/120/308 1/189/313 +f 3/182/312 5/174/314 6/166/46 4/178/2 +f 3/251/312 1/252/313 15/253/308 13/254/307 11/255/311 9/256/309 7/257/310 5/258/314 +f 5/174/314 7/175/310 8/167/34 6/166/46 +f 275/130/313 277/120/312 278/192/2 276/250/19 +f 271/221/307 272/209/43 270/167/7 269/175/311 +f 271/221/307 273/247/308 274/226/31 272/209/43 +f 265/182/310 266/178/34 264/185/46 263/189/314 +f 275/130/313 276/250/19 274/194/31 273/140/308 +f 264/185/46 278/192/2 277/120/312 263/189/314 +f 265/182/310 267/174/309 268/166/22 266/178/34 +f 265/251/310 263/252/314 277/253/312 275/254/313 273/255/308 271/256/307 269/257/311 267/258/309 +f 267/174/309 269/175/311 270/167/7 268/166/22 +f 383/130/314 385/120/310 386/192/34 384/250/46 +f 379/221/313 380/209/19 378/167/31 377/175/308 +f 379/221/313 381/247/312 382/226/2 380/209/19 +f 373/182/311 374/178/7 372/185/22 371/189/309 +f 383/130/314 384/250/46 382/194/2 381/140/312 +f 372/185/22 386/192/34 385/120/310 371/189/309 +f 373/182/311 375/174/307 376/166/43 374/178/7 +f 373/251/311 371/252/309 385/253/310 383/254/314 381/255/312 379/256/313 377/257/308 375/258/307 +f 375/174/307 377/175/308 378/167/31 376/166/43 +f 491/130/309 493/120/311 494/192/7 492/250/22 +f 487/221/314 488/209/46 486/167/2 485/175/312 +f 487/221/314 489/247/310 490/226/34 488/209/46 +f 481/182/308 482/178/31 480/185/43 479/189/307 +f 491/130/309 492/250/22 490/194/34 489/140/310 +f 480/185/43 494/192/7 493/120/311 479/189/307 +f 481/182/308 483/174/313 484/166/19 482/178/31 +f 481/251/308 479/252/307 493/253/311 491/254/309 489/255/310 487/256/314 485/257/312 483/258/313 +f 483/174/313 485/175/312 486/167/2 484/166/19 +g Cylinder_Cylinder_candle_Cylinder_Cylinder_candle_flame +s off +f 17/259/25 20/260/25 19/50/25 18/39/25 +f 21/259/1 24/260/1 23/50/1 22/39/1 +f 25/259/25 26/260/25 27/50/25 28/39/25 +f 29/259/8 32/39/8 31/50/8 30/260/8 +f 279/259/1 282/260/1 281/50/1 280/39/1 +f 283/259/28 286/260/28 285/50/28 284/39/28 +f 287/259/1 288/260/1 289/50/1 290/39/1 +f 291/259/25 294/39/25 293/50/25 292/260/25 +f 387/259/28 390/260/28 389/50/28 388/39/28 +f 391/259/8 394/260/8 393/50/8 392/39/8 +f 395/259/28 396/260/28 397/50/28 398/39/28 +f 399/259/1 402/39/1 401/50/1 400/260/1 +f 495/259/8 498/260/8 497/50/8 496/39/8 +f 499/259/25 502/260/25 501/50/25 500/39/25 +f 503/259/8 504/260/8 505/50/8 506/39/8 +f 507/259/28 510/39/28 509/50/28 508/260/28 diff --git a/homedecor/sounds/homedecor_telephone_ringing.ogg b/homedecor/sounds/homedecor_telephone_ringing.ogg deleted file mode 100644 index 8272ab1..0000000 Binary files a/homedecor/sounds/homedecor_telephone_ringing.ogg and /dev/null differ diff --git a/homedecor/textures/homedecor_brass_ingot.png b/homedecor/textures/homedecor_brass_ingot.png deleted file mode 100644 index c2e06ff..0000000 Binary files a/homedecor/textures/homedecor_brass_ingot.png and /dev/null differ diff --git a/homedecor/textures/homedecor_candle_flat.png b/homedecor/textures/homedecor_candle_flat.png new file mode 100644 index 0000000..d709a8c Binary files /dev/null and b/homedecor/textures/homedecor_candle_flat.png differ diff --git a/homedecor/textures/homedecor_chainlink_brass.png b/homedecor/textures/homedecor_chainlink_brass.png deleted file mode 100644 index 9a1ad87..0000000 Binary files a/homedecor/textures/homedecor_chainlink_brass.png and /dev/null differ diff --git a/homedecor/textures/homedecor_chainlink_steel.png b/homedecor/textures/homedecor_chainlink_steel.png deleted file mode 100644 index d7132c3..0000000 Binary files a/homedecor/textures/homedecor_chainlink_steel.png and /dev/null differ diff --git a/homedecor/textures/homedecor_copper_strip.png b/homedecor/textures/homedecor_copper_strip.png deleted file mode 100644 index 22e572a..0000000 Binary files a/homedecor/textures/homedecor_copper_strip.png and /dev/null differ diff --git a/homedecor/textures/homedecor_copper_wire.png b/homedecor/textures/homedecor_copper_wire.png deleted file mode 100644 index 676e98f..0000000 Binary files a/homedecor/textures/homedecor_copper_wire.png and /dev/null differ diff --git a/homedecor/textures/homedecor_empty_spool.png b/homedecor/textures/homedecor_empty_spool.png deleted file mode 100644 index 017a94f..0000000 Binary files a/homedecor/textures/homedecor_empty_spool.png and /dev/null differ diff --git a/homedecor/textures/homedecor_heating_element.png b/homedecor/textures/homedecor_heating_element.png deleted file mode 100644 index 42e00b7..0000000 Binary files a/homedecor/textures/homedecor_heating_element.png and /dev/null differ diff --git a/homedecor/textures/homedecor_ic.png b/homedecor/textures/homedecor_ic.png deleted file mode 100644 index 4c88894..0000000 Binary files a/homedecor/textures/homedecor_ic.png and /dev/null differ diff --git a/homedecor/textures/homedecor_motor.png b/homedecor/textures/homedecor_motor.png deleted file mode 100644 index f19ec0a..0000000 Binary files a/homedecor/textures/homedecor_motor.png and /dev/null differ diff --git a/homedecor/textures/homedecor_oil_extract.png b/homedecor/textures/homedecor_oil_extract.png deleted file mode 100644 index e34623d..0000000 Binary files a/homedecor/textures/homedecor_oil_extract.png and /dev/null differ diff --git a/homedecor/textures/homedecor_paraffin.png b/homedecor/textures/homedecor_paraffin.png deleted file mode 100644 index 77d2bbd..0000000 Binary files a/homedecor/textures/homedecor_paraffin.png and /dev/null differ diff --git a/homedecor/textures/homedecor_plastic_sheeting.png b/homedecor/textures/homedecor_plastic_sheeting.png deleted file mode 100644 index 034dcc2..0000000 Binary files a/homedecor/textures/homedecor_plastic_sheeting.png and /dev/null differ diff --git a/homedecor/textures/homedecor_plastic_strips.png b/homedecor/textures/homedecor_plastic_strips.png deleted file mode 100644 index 6ec83a8..0000000 Binary files a/homedecor/textures/homedecor_plastic_strips.png and /dev/null differ diff --git a/homedecor/textures/homedecor_power_crystal.png b/homedecor/textures/homedecor_power_crystal.png deleted file mode 100644 index f1c28e8..0000000 Binary files a/homedecor/textures/homedecor_power_crystal.png and /dev/null differ diff --git a/homedecor/textures/homedecor_silicon.png b/homedecor/textures/homedecor_silicon.png deleted file mode 100644 index 847b366..0000000 Binary files a/homedecor/textures/homedecor_silicon.png and /dev/null differ diff --git a/homedecor/textures/homedecor_steel_strip.png b/homedecor/textures/homedecor_steel_strip.png deleted file mode 100644 index 6384dc8..0000000 Binary files a/homedecor/textures/homedecor_steel_strip.png and /dev/null differ diff --git a/homedecor/textures/homedecor_steel_wire.png b/homedecor/textures/homedecor_steel_wire.png deleted file mode 100644 index 44f8240..0000000 Binary files a/homedecor/textures/homedecor_steel_wire.png and /dev/null differ diff --git a/homedecor/textures/homedecor_terracotta_base.png b/homedecor/textures/homedecor_terracotta_base.png deleted file mode 100644 index 9f04aad..0000000 Binary files a/homedecor/textures/homedecor_terracotta_base.png and /dev/null differ diff --git a/homedecor/textures/top_chain_brass_inv.png b/homedecor/textures/top_chain_brass_inv.png new file mode 100644 index 0000000..dc8183c Binary files /dev/null and b/homedecor/textures/top_chain_brass_inv.png differ diff --git a/homedecor/textures/top_chain_wrought_iron_inv.png b/homedecor/textures/top_chain_wrought_iron_inv.png new file mode 100644 index 0000000..cddf6c9 Binary files /dev/null and b/homedecor/textures/top_chain_wrought_iron_inv.png differ diff --git a/labels/init.lua b/labels/init.lua index 29e12a7..e8d0624 100644 --- a/labels/init.lua +++ b/labels/init.lua @@ -188,7 +188,7 @@ minetest.register_craft({ minetest.register_craft({ output = "streets:printer", - recipe = {{"","homedecor:plastic_sheeting","homedecor:power_crystal"}, + recipe = {{"","homedecor:plastic_sheeting","basic_materials:energy_crystal_simple"}, {"homedecor:motor","default:steel_ingot","group:wool"}, {"","homedecor:plastic_sheeting","homedecor:motor"}} }) diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index f9246b8..827657a 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -47,6 +47,15 @@ minetest.register_node("lrfurn:coffeetable", { end, }) +minetest.register_craft({ + output = "lrfurn:coffeetable", + type = "shapeless", + recipe = { + "lrfurn:endtable", + "lrfurn:endtable" + } +}) + minetest.register_craft({ output = "lrfurn:coffeetable", recipe = { diff --git a/pipeworks/autocrafter.lua b/pipeworks/autocrafter.lua index 7ddc312..5d554c1 100644 --- a/pipeworks/autocrafter.lua +++ b/pipeworks/autocrafter.lua @@ -407,7 +407,7 @@ minetest.register_craft( { output = "pipeworks:autocrafter 2", recipe = { { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheeting", "default:steel_ingot", "basic_materials:plastic_sheeting" }, { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" } }, }) diff --git a/pipeworks/crafts.lua b/pipeworks/crafts.lua index 2ee5710..9c02da8 100644 --- a/pipeworks/crafts.lua +++ b/pipeworks/crafts.lua @@ -85,88 +85,3 @@ minetest.register_craft( { { "pipeworks:pipe_1_empty" } }, }) - - --- Crafting recipes for pneumatic tubes - --- If homedecor is not installed, we need to register its crafting chain for --- plastic sheeting so that pipeworks remains compatible with it. - -if minetest.get_modpath("homedecor") == nil then - - minetest.register_craftitem(":homedecor:oil_extract", { - description = "Oil extract", - inventory_image = "homedecor_oil_extract.png", - }) - - minetest.register_craftitem(":homedecor:paraffin", { - description = "Unprocessed paraffin", - inventory_image = "homedecor_paraffin.png", - }) - - minetest.register_alias("homedecor:plastic_base", "homedecor:paraffin") - - minetest.register_craftitem(":homedecor:plastic_sheeting", { - description = "Plastic sheet", - inventory_image = "homedecor_plastic_sheeting.png", - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:oil_extract 4", - recipe = { - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves" - } - }) - - minetest.register_craft({ - type = "cooking", - output = "homedecor:paraffin", - recipe = "homedecor:oil_extract", - }) - - minetest.register_craft({ - type = "cooking", - output = "homedecor:plastic_sheeting", - recipe = "homedecor:paraffin", - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:oil_extract", - burntime = 30, - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:paraffin", - burntime = 30, - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:plastic_sheeting", - burntime = 30, - }) -end - --- crafting items for creating node breakers -minetest.register_craftitem("pipeworks:gear", { - description = "Gear", - inventory_image = "pipeworks_gear.png", -}) - -minetest.register_craft( { - output = "pipeworks:gear 6", - recipe = { - { "", "default:steel_ingot", "" }, - { "default:steel_ingot","default:stone", "default:steel_ingot" }, - { "", "default:steel_ingot", "" } - }, -}) - diff --git a/pipeworks/depends.txt b/pipeworks/depends.txt index 0cb7406..97c9e30 100644 --- a/pipeworks/depends.txt +++ b/pipeworks/depends.txt @@ -1,4 +1,5 @@ default +basic_materials mesecons mesecons_mvps digilines? diff --git a/pipeworks/filter-injector.lua b/pipeworks/filter-injector.lua index cf1fc74..29fc1d3 100644 --- a/pipeworks/filter-injector.lua +++ b/pipeworks/filter-injector.lua @@ -473,18 +473,18 @@ end minetest.register_craft( { output = "pipeworks:filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) minetest.register_craft( { output = "pipeworks:mese_filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) @@ -492,9 +492,9 @@ if minetest.get_modpath("digilines") then minetest.register_craft( { output = "pipeworks:digiline_filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "digilines:wire_std_00000000", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "digilines:wire_std_00000000", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/routing_tubes.lua b/pipeworks/routing_tubes.lua index e2f1af4..45fcea8 100644 --- a/pipeworks/routing_tubes.lua +++ b/pipeworks/routing_tubes.lua @@ -4,9 +4,9 @@ pipeworks.register_tube("pipeworks:tube", "Pneumatic tube segment") minetest.register_craft( { output = "pipeworks:tube_1 6", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) @@ -82,9 +82,9 @@ if pipeworks.enable_priority_tube then minetest.register_craft( { output = "pipeworks:priority_tube_1 6", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:gold_ingot", "", "default:gold_ingot" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -107,9 +107,9 @@ if pipeworks.enable_accelerator_tube then minetest.register_craft( { output = "pipeworks:accelerator_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -166,9 +166,9 @@ if pipeworks.enable_one_way_tube then minetest.register_craft({ output = "pipeworks:one_way_tube 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/signal_tubes.lua b/pipeworks/signal_tubes.lua index b955a16..7048ebb 100644 --- a/pipeworks/signal_tubes.lua +++ b/pipeworks/signal_tubes.lua @@ -60,9 +60,9 @@ if pipeworks.enable_detector_tube then minetest.register_craft( { output = "pipeworks:detector_tube_off_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "mesecons:mesecon", "mesecons_materials:silicon", "mesecons:mesecon" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -110,9 +110,9 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then minetest.register_craft( { output = "pipeworks:digiline_detector_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "digilines:wire_std_00000000", "mesecons_materials:silicon", "digilines:wire_std_00000000" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/sorting_tubes.lua b/pipeworks/sorting_tubes.lua index e7e918d..76eec32 100644 --- a/pipeworks/sorting_tubes.lua +++ b/pipeworks/sorting_tubes.lua @@ -153,9 +153,9 @@ if pipeworks.enable_mese_tube then minetest.register_craft( { output = "pipeworks:mese_tube_000000 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "", "default:mese_crystal", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/pipeworks/teleport_tube.lua b/pipeworks/teleport_tube.lua index d707717..f4bad74 100644 --- a/pipeworks/teleport_tube.lua +++ b/pipeworks/teleport_tube.lua @@ -242,9 +242,9 @@ pipeworks.register_tube("pipeworks:teleport_tube", { minetest.register_craft( { output = "pipeworks:teleport_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:desert_stone", "default:mese", "default:desert_stone" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/pipeworks/textures/pipeworks_gear.png b/pipeworks/textures/pipeworks_gear.png deleted file mode 100644 index 584f9a5..0000000 Binary files a/pipeworks/textures/pipeworks_gear.png and /dev/null differ diff --git a/pipeworks/trashcan.lua b/pipeworks/trashcan.lua index 8db9edf..f6dff50 100644 --- a/pipeworks/trashcan.lua +++ b/pipeworks/trashcan.lua @@ -43,7 +43,7 @@ minetest.register_node("pipeworks:trashcan", { minetest.register_craft({ output = "pipeworks:trashcan", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "", "default:steel_ingot" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, }, diff --git a/pipeworks/vacuum_tubes.lua b/pipeworks/vacuum_tubes.lua index d616835..c1e9fe0 100644 --- a/pipeworks/vacuum_tubes.lua +++ b/pipeworks/vacuum_tubes.lua @@ -12,9 +12,9 @@ if pipeworks.enable_sand_tube then minetest.register_craft( { output = "pipeworks:sand_tube_1 2", recipe = { - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, {"group:sand", "group:sand", "group:sand"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"} }, }) @@ -63,9 +63,9 @@ if pipeworks.enable_mese_sand_tube then minetest.register_craft( { output = "pipeworks:mese_sand_tube_1 2", recipe = { - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, {"group:sand", "default:mese_crystal", "group:sand" }, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/signs_lib/depends.txt b/signs_lib/depends.txt index 7f4e061..6937007 100644 --- a/signs_lib/depends.txt +++ b/signs_lib/depends.txt @@ -1,4 +1,5 @@ default +basic_materials intllib? screwdriver? keyword_interact? diff --git a/signs_lib/init.lua b/signs_lib/init.lua index eb78b67..8e0d047 100644 --- a/signs_lib/init.lua +++ b/signs_lib/init.lua @@ -1098,7 +1098,7 @@ minetest.register_craft({ output = "locked_sign:sign_wall_locked", recipe = { {default_sign}, - {"default:steel_ingot"}, + {"basic_materials:padlock"}, }, }) diff --git a/stained_glass/init.lua b/stained_glass/init.lua index 9c0f7fc..c71b651 100644 --- a/stained_glass/init.lua +++ b/stained_glass/init.lua @@ -63,6 +63,7 @@ minetest.register_node("stained_glass:stained_glass", { minetest.override_item("moreblocks:super_glow_glass", { palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "stained_glass:stained_glass", groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3, ud_param2_colorable = 1}, }) @@ -87,6 +88,7 @@ minetest.register_node("stained_glass:stained_trap_glass", { minetest.override_item("moreblocks:trap_super_glow_glass", { palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "stained_glass:stained_trap_glass", groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, }) diff --git a/technic/crafts.lua b/technic/crafts.lua index 5d3ae04..7d51f29 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -38,6 +38,12 @@ if pipeworks.enable_teleport_tube then }) end +-- basic materials' brass ingot + +minetest.clear_craft({ + output = "basic_materials:brass_ingot", +}) + -- tubes crafting recipes minetest.register_craft({ @@ -71,44 +77,17 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:silver_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'default:diamondblock', 'technic:battery'}, + {'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:silver_ingot'}, } }) -minetest.register_craft({ - output = 'technic:fine_copper_wire 2', - recipe = { - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_gold_wire 2', - recipe = { - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_silver_wire 2', - recipe = { - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - } -}) - minetest.register_craft({ output = 'technic:copper_coil 1', recipe = { - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, {'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'}, - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, } }) @@ -153,10 +132,11 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'technic:fine_gold_wire', ''}, + {'', 'basic_materials:gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, {'', 'technic:chromium_ingot', ''}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) minetest.register_craft({ @@ -179,7 +159,7 @@ minetest.register_craft({ output = "technic:machine_casing", recipe = { { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, - { "technic:cast_iron_ingot", "technic:brass_ingot", "technic:cast_iron_ingot" }, + { "technic:cast_iron_ingot", "basic_materials:brass_ingot", "technic:cast_iron_ingot" }, { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, }, }) diff --git a/technic/depends.txt b/technic/depends.txt index 6b28f9f..1b76ab3 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -1,6 +1,7 @@ default pipeworks technic_worldgen +basic_materials bucket? screwdriver? mesecons? diff --git a/technic/items.lua b/technic/items.lua index a0edb96..d527c8b 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -69,22 +69,6 @@ minetest.register_tool("technic:red_energy_crystal", { } }) - -minetest.register_craftitem("technic:fine_copper_wire", { - description = S("Fine Copper Wire"), - inventory_image = "technic_fine_copper_wire.png", -}) - -minetest.register_craftitem("technic:fine_gold_wire", { - description = S("Fine Gold Wire"), - inventory_image = "technic_fine_gold_wire.png", -}) - -minetest.register_craftitem("technic:fine_silver_wire", { - description = S("Fine Silver Wire"), - inventory_image = "technic_fine_silver_wire.png", -}) - minetest.register_craftitem("technic:copper_coil", { description = S("Copper Coil"), inventory_image = "technic_copper_coil.png", diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 67b9f79..c1a1d73 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -6,7 +6,7 @@ minetest.register_craft({ recipe = { {'default:stone', 'technic:motor', 'default:stone'}, {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'technic:fine_silver_wire'}, + {'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'}, } }) diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 27f4abc..1699a52 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -11,7 +11,7 @@ minetest.register_craft({ output = 'technic:geothermal', recipe = { {'technic:granite', 'default:diamond', 'technic:granite'}, - {'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'}, {'technic:granite', 'technic:lv_cable', 'technic:granite'}, } }) diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index c072b13..6143fa9 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -9,9 +9,9 @@ minetest.register_craft({ output = 'technic:solar_panel', recipe = { {'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, - - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, + }, + replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, }, }) diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index d5c60a3..ab07d58 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -979,7 +979,7 @@ minetest.register_craft({ output = 'technic:frame_111111', recipe = { { '', 'default:stick', '' }, - { 'default:stick', 'technic:brass_ingot', 'default:stick' }, + { 'default:stick', 'basic_materials:brass_ingot', 'default:stick' }, { '', 'default:stick', '' }, } }) @@ -996,9 +996,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:template 10', recipe = { - { '', 'technic:brass_ingot', '' }, - { 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' }, - { '', 'technic:brass_ingot', '' }, + { '', 'basic_materials:brass_ingot', '' }, + { 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' }, + { '', 'basic_materials:brass_ingot', '' }, } }) diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 3aeacd5..8731b8e 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -21,7 +21,7 @@ local recipes = { {"technic:carbon_steel_dust 3", "technic:chromium_dust", "technic:stainless_steel_dust 4"}, {"technic:carbon_steel_ingot 3", "technic:chromium_ingot", "technic:stainless_steel_ingot 4"}, {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, - {"default:copper_ingot 2", "technic:zinc_ingot", "technic:brass_ingot 3"}, + {"default:copper_ingot 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, {"default:sand 2", "technic:coal_dust 2", "technic:silicon_wafer"}, {"technic:silicon_wafer", "technic:gold_dust", "technic:doped_silicon_wafer"}, -- from https://en.wikipedia.org/wiki/Carbon_black diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 8c8e178..da90aad 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -93,7 +93,7 @@ local function register_dust(name, ingot) end -- Sorted alphibeticaly -register_dust("Brass", "technic:brass_ingot") +register_dust("Brass", "basic_materials:brass_ingot") register_dust("Bronze", "default:bronze_ingot") register_dust("Carbon Steel", "technic:carbon_steel_ingot") register_dust("Cast Iron", "technic:cast_iron_ingot") diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 9202c4a..6c520ca 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -201,7 +201,7 @@ minetest.register_node("technic:supply_converter", { minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, + {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'}, } diff --git a/technic/radiation.lua b/technic/radiation.lua index a4c49c6..6e518d8 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -146,7 +146,7 @@ local rad_resistance_node = { ["moreores:mithril_block"] = 26, ["moreores:silver_block"] = 53, ["snow:snow_brick"] = 2.8, - ["technic:brass_block"] = 43, + ["basic_materials:brass_block"] = 43, ["technic:carbon_steel_block"] = 40, ["technic:cast_iron_block"] = 40, ["technic:chernobylite_block"] = 40, diff --git a/technic/textures/technic_fine_copper_wire.png b/technic/textures/technic_fine_copper_wire.png deleted file mode 100644 index 3e663bb..0000000 Binary files a/technic/textures/technic_fine_copper_wire.png and /dev/null differ diff --git a/technic/textures/technic_fine_gold_wire.png b/technic/textures/technic_fine_gold_wire.png deleted file mode 100644 index 54a7a52..0000000 Binary files a/technic/textures/technic_fine_gold_wire.png and /dev/null differ diff --git a/technic/textures/technic_fine_silver_wire.png b/technic/textures/technic_fine_silver_wire.png deleted file mode 100644 index f40a52b..0000000 Binary files a/technic/textures/technic_fine_silver_wire.png and /dev/null differ diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 3653d2d..75e028c 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -363,7 +363,7 @@ minetest.register_craft({ output = "technic:chainsaw", recipe = { {"technic:stainless_steel_ingot", trigger, "technic:battery"}, - {"technic:fine_copper_wire", "technic:motor", "technic:battery"}, + {"basic_materials:copper_wire", "technic:motor", "technic:battery"}, {"", "", "technic:stainless_steel_ingot"}, } }) diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 6015e5a..ba5a726 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -11,8 +11,8 @@ local S = technic.getter minetest.register_craft({ output = "technic:laser_mk1", recipe = { - {"default:diamond", "technic:brass_ingot", "default:obsidian_glass"}, - {"", "technic:brass_ingot", "technic:red_energy_crystal"}, + {"default:diamond", "basic_materials:brass_ingot", "default:obsidian_glass"}, + {"", "basic_materials:brass_ingot", "technic:red_energy_crystal"}, {"", "", "default:copper_ingot"}, } }) diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index b28f1d8..9a918a2 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -122,7 +122,7 @@ minetest.register_craft({ output = "technic:prospector", recipe = { {"moreores:pick_silver", "moreores:mithril_block", "pipeworks:teleport_tube_1"}, - {"technic:brass_ingot", "technic:control_logic_unit", "technic:brass_ingot"}, + {"basic_materials:brass_ingot", "technic:control_logic_unit", "basic_materials:brass_ingot"}, {"", "technic:blue_energy_crystal", ""}, } }) diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua index d40284b..fda1db0 100644 --- a/technic_chests/copper_chest.lua +++ b/technic_chests/copper_chest.lua @@ -19,7 +19,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:copper_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:copper_chest'}, } }) diff --git a/technic_chests/depends.txt b/technic_chests/depends.txt index b9ca665..42876b0 100644 --- a/technic_chests/depends.txt +++ b/technic_chests/depends.txt @@ -1,4 +1,5 @@ default +basic_materials moreores? pipeworks? intllib? diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua index c66b2f6..7a50b70 100644 --- a/technic_chests/gold_chest.lua +++ b/technic_chests/gold_chest.lua @@ -30,7 +30,7 @@ end minetest.register_craft({ output = 'technic:gold_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:gold_chest'}, } }) diff --git a/technic_chests/iron_chest.lua b/technic_chests/iron_chest.lua index 90434bb..237067b 100644 --- a/technic_chests/iron_chest.lua +++ b/technic_chests/iron_chest.lua @@ -26,7 +26,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:iron_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:iron_chest'}, } }) diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua index 909ff9e..05cbc40 100644 --- a/technic_chests/mithril_chest.lua +++ b/technic_chests/mithril_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:mithril_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:mithril_chest'}, } }) diff --git a/technic_chests/silver_chest.lua b/technic_chests/silver_chest.lua index c615304..4de196d 100644 --- a/technic_chests/silver_chest.lua +++ b/technic_chests/silver_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:silver_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:silver_chest'}, } }) diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index fba9df9..0590e70 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -48,11 +48,6 @@ minetest.register_craftitem(":technic:sulfur_lump", { inventory_image = "technic_sulfur_lump.png", }) -minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "technic_brass_ingot.png", -}) - minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot") minetest.override_item("default:steel_ingot", { @@ -97,7 +92,6 @@ register_block("technic:uranium_block", "technic:uranium_ingot") register_block("technic:chromium_block", "technic:chromium_ingot") register_block("technic:zinc_block", "technic:zinc_ingot") register_block("technic:lead_block", "technic:lead_ingot") -register_block("technic:brass_block", "technic:brass_ingot") register_block("technic:cast_iron_block", "technic:cast_iron_ingot") register_block("technic:carbon_steel_block", "technic:carbon_steel_ingot") register_block("technic:stainless_steel_block", "technic:stainless_steel_ingot") diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index ac858d0..6a92b7d 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1,3 +1,9 @@ default +basic_materials intllib? mg? +doors? +farming? +glooptest? +mesecons_doors? +vessels? diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index f3a88e4..14b4eba 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -133,14 +133,6 @@ minetest.register_node(":technic:stainless_steel_block", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node(":technic:brass_block", { - description = S("Brass Block"), - tiles = { "technic_brass_block.png" }, - is_ground_content = true, - groups = {cracky=1, level=2}, - sounds = default.node_sound_stone_defaults() -}) - minetest.register_craft({ output = 'technic:marble_bricks 4', recipe = { diff --git a/technic_worldgen/textures/technic_brass_block.png b/technic_worldgen/textures/technic_brass_block.png deleted file mode 100644 index bc6fe78..0000000 Binary files a/technic_worldgen/textures/technic_brass_block.png and /dev/null differ diff --git a/technic_worldgen/textures/technic_brass_ingot.png b/technic_worldgen/textures/technic_brass_ingot.png deleted file mode 100644 index 06056e7..0000000 Binary files a/technic_worldgen/textures/technic_brass_ingot.png and /dev/null differ -- cgit v1.2.3