copy all standard Dreambuilder mods in from the old subgame

(exactly as last supplied there, updates to these mods will follow later)

406 files changed, 8455 insertions, 0 deletions

diff --git a/mesecons/LICENSE.txt b/mesecons/LICENSE.txt
new file mode 100644
index 0000000..0d2fd18
--- /dev/null
+++ b/mesecons/LICENSE.txt
@@ -0,0 +1,532 @@
+The LGPLv3 applies to all code in this project.
+The CC-BY-SA-3.0 license applies to textures and any other content in this project which is not source code.
+
+=================================================================
+
+GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+=================================================================
+
+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 http://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 http://creativecommons.org/.
diff --git a/mesecons/README.md b/mesecons/README.md
new file mode 100644
index 0000000..5de72c7
--- /dev/null
+++ b/mesecons/README.md
@@ -0,0 +1,78 @@
+    ########################################################################
+    ##  __    __   _____   _____   _____   _____   _____   _   _   _____  ##
+    ## |  \  /  | |  ___| |  ___| |  ___| |  ___| |  _  | | \ | | |  ___| ##
+    ## |   \/   | | |___  | |___  | |___  | |     | | | | |  \| | | |___  ##
+    ## | |\__/| | |  ___| |___  | |  ___| | |     | | | | |     | |___  | ##
+    ## | |    | | | |___   ___| | | |___  | |___  | |_| | | |\  |  ___| | ##
+    ## |_|    |_| |_____| |_____| |_____| |_____| |_____| |_| \_| |_____| ##
+    ##                                                                    ##
+    ########################################################################
+
+MESECONS by Jeija and contributors
+
+Mezzee-what?
+------------
+[Mesecons](http://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay.
+
+Mesecons is a mod for [Minetest](http://minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks.
+
+Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics.
+
+OK, I want in.
+--------------
+Go get it!
+
+[DOWNLOADS PAGE](http://mesecons.net/downloads.php)
+
+Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary:
+
+1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer.
+2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one.
+3. Open up the Minetest mods folder - usually `/mods/`. If you see the `minetest` or folder inside of that, that is your mod folder instead.
+4. Copy the Mesecons folder into the mods folder.
+
+Don't like some parts of Mesecons? Open up the Mesecons folder and delete the subfolder containing the mod you don't want. If you didn't want movestones, for example, all you have to do is delete the `mesecons_movestones` folder and they will no longer be available.
+
+There are no dependencies - it will work right after installing!
+
+How do I use this thing?
+------------------------
+How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)?
+
+Or maybe a [comprehensive reference](http://mesecons.net/items.php) is your style?
+
+An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
+
+Want to get more into building? Why not check out the [Mesecons Laboratory](http://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders?
+
+Want to contribute to Mesecons itself? Check out the [source code](https://github.com/Jeija/minetest-mod-mesecons)!
+
+Who wrote it anyways?
+---------------------
+These awesome people made Mesecons possible!
+
+| Contributor     | Contribution                     |
+| --------------- | -------------------------------- |
+| Jat15           | Various tweaks.                  |
+| Jeija           | **Main developer! Everything.**  |
+| Jordach         | Noteblock sounds.                |
+| khonkhortistan  | Code, recipes, textures.         |
+| Kotolegokot     | Nodeboxes for items.             |
+| minerd247       | Textures.                        |
+| Nore/Novatux    | Code.                            |
+| RealBadAngel    | Fixes, improvements.             |
+| sfan5           | Code, recipes, textures.         |
+| suzenako        | Piston sounds.                   |
+| Uberi/Temperest | Code, textures, documentation.   |
+| VanessaE        | Code, recipes, textures, design. |
+| Whiskers75      | Logic gates implementation.      |
+
+There are also a whole bunch of other people helping with everything from code to testing and feedback. Mesecons would also not be possible without their help!
+
+Alright, how can I use it?
+--------------------------
+All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic). That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one.
+
+All code in this project is licensed under the LGPL version 3 or later. That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license.
+
+No warranty is provided, express or implied, for any part of the project.
diff --git a/mesecons/documentation.json b/mesecons/documentation.json
new file mode 100644
index 0000000..8cc0254
--- /dev/null
+++ b/mesecons/documentation.json
@@ -0,0 +1,62 @@
+{
+	"Conductors" : {
+		"Mesecon" : "mesecons/doc/mesecon",
+		"Insulated Wire" : "mesecons_insulated/doc/insulated",
+		"T-Junction" : "mesecons_extrawires/doc/tjunction",
+		"Crossing" : "mesecons_extrawires/doc/crossing",
+		"Corner" : "mesecons_extrawires/doc/corner",
+		"Vertical Wire" : "mesecons_extrawires/doc/vertical",
+		"Mese" : "mesecons_extrawires/doc/mese"
+	},
+	"Receptors" : {
+		"Power Plant" : "mesecons_powerplant/doc/powerplant",
+		"Blinky Plant" : "mesecons_blinkyplant/doc/blinkyplant",
+		"Switch" : "mesecons_switch/doc/switch",
+		"Object Detector" : "mesecons_detector/doc/objectdetector",
+		"Node Detector" : "mesecons_detector/doc/nodedetector",
+		"Wall Lever" : "mesecons_walllever/doc/walllever",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_wood",
+		"Pressure Plate" : "mesecons_pressureplates/doc/pressureplate_stone",
+		"Water Turbine" : "mesecons_hydroturbine/doc/waterturbine",
+		"Solar Panel" : "mesecons_solarpanel/doc/solarpanel",
+		"Wall Button" : "mesecons_button/doc/button"
+	},
+	"Effectors" : {
+		"Noteblock" : "mesecons_noteblock/doc/noteblock",
+		"Lamp" : "mesecons_lamp/doc/lamp",
+		"Piston" : "mesecons_pistons/doc/piston",
+		"Sticky Piston" : "mesecons_pistons/doc/piston_sticky",
+		"Movestone" : "mesecons_movestones/doc/movestone",
+		"Sticky Movestone" : "mesecons_movestones/doc/movestone_sticky",
+		"Removestone" : "mesecons_random/doc/removestone",
+		"Ghoststone" : "mesecons_random/doc/ghoststone",
+		"Command Block" : "mesecons_commandblock/doc/commandblock",
+		"Lightstones" : {
+			"Dark Grey" : "mesecons_lightstone/doc/lightstone_darkgrey",
+			"Light Grey" : "mesecons_lightstone/doc/lightstone_lightgrey",
+			"Green" : "mesecons_lightstone/doc/lightstone_green",
+			"Red" : "mesecons_lightstone/doc/lightstone_red",
+			"Blue" : "mesecons_lightstone/doc/lightstone_blue",
+			"Yellow" : "mesecons_lightstone/doc/lightstone_yellow"
+		}
+	},
+	"Logic" : {
+		"Luacontroller" : "mesecons_luacontroller/doc/luacontroller",
+		"Torch" : "mesecons_torch/doc/torch",
+		"Delayer" : "mesecons_delayer/doc/delayer",
+		"Gates" : {
+			"Diode" : "mesecons_gates/doc/diode",
+			"NOT Gate" : "mesecons_gates/doc/not",
+			"AND Gate" : "mesecons_gates/doc/and",
+			"NAND Gate" : "mesecons_gates/doc/nand",
+			"OR Gate" : "mesecons_gates/doc/or",
+			"NOR Gate" : "mesecons_gates/doc/nor",
+			"XOR Gate" : "mesecons_gates/doc/xor"
+		}
+	},
+	"Crafts" : {
+		"Silicon" : "mesecons_materials/doc/silicon",
+		"Glue" : "mesecons_materials/doc/glue",
+		"Fiber" : "mesecons_materials/doc/fiber"
+	}
+}
diff --git a/mesecons/mesecons/VERSION b/mesecons/mesecons/VERSION
new file mode 100644
index 0000000..75b9e03
--- /dev/null
+++ b/mesecons/mesecons/VERSION
@@ -0,0 +1 @@
+0.41 DEV
diff --git a/mesecons/mesecons/actionqueue.lua b/mesecons/mesecons/actionqueue.lua
new file mode 100644
index 0000000..fa4079f
--- /dev/null
+++ b/mesecons/mesecons/actionqueue.lua
@@ -0,0 +1,118 @@
+mesecon.queue.actions={} -- contains all ActionQueue actions
+
+function mesecon.queue:add_function(name, func)
+	mesecon.queue.funcs[name] = func
+end
+
+-- If add_action with twice the same overwritecheck and same position are called, the first one is overwritten
+-- use overwritecheck nil to never overwrite, but just add the event to the queue
+-- priority specifies the order actions are executed within one globalstep, highest first
+-- should be between 0 and 1
+function mesecon.queue:add_action(pos, func, params, time, overwritecheck, priority)
+	-- Create Action Table:
+	time = time or 0 -- time <= 0 --> execute, time > 0 --> wait time until execution
+	priority = priority or 1
+	local action = {	pos=mesecon.tablecopy(pos),
+				func=func,
+				params=mesecon.tablecopy(params or {}),
+				time=time,
+				owcheck=(overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
+				priority=priority}
+
+	local toremove = nil
+	-- Otherwise, add the action to the queue
+	if overwritecheck then -- check if old action has to be overwritten / removed:
+		for i, ac in ipairs(mesecon.queue.actions) do
+			if(mesecon.cmpPos(pos, ac.pos)
+			and mesecon.cmpAny(overwritecheck, ac.owcheck)) then
+				toremove = i
+				break
+			end
+		end
+	end
+
+	if (toremove ~= nil) then
+		table.remove(mesecon.queue.actions, toremove)
+	end
+
+	table.insert(mesecon.queue.actions, action)
+end
+
+-- execute the stored functions on a globalstep
+-- if however, the pos of a function is not loaded (get_node_or_nil == nil), do NOT execute the function
+-- this makes sure that resuming mesecons circuits when restarting minetest works fine
+-- However, even that does not work in some cases, that's why we delay the time the globalsteps
+-- start to be execute by 5 seconds
+local get_highest_priority = function (actions)
+	local highestp = -1
+	local highesti
+	for i, ac in ipairs(actions) do
+		if ac.priority > highestp then
+			highestp = ac.priority
+			highesti = i
+		end
+	end
+
+	return highesti
+end
+
+local m_time = 0
+local resumetime = mesecon.setting("resumetime", 4)
+minetest.register_globalstep(function (dtime)
+	m_time = m_time + dtime
+	-- don't even try if server has not been running for XY seconds; resumetime = time to wait
+	-- after starting the server before processing the ActionQueue, don't set this too low
+	if (m_time < resumetime) then return end
+	local actions = mesecon.tablecopy(mesecon.queue.actions)
+	local actions_now={}
+
+	mesecon.queue.actions = {}
+
+	-- sort actions into two categories:
+	-- those toexecute now (actions_now) and those to execute later (mesecon.queue.actions)
+	for i, ac in ipairs(actions) do
+		if ac.time > 0 then
+			ac.time = ac.time - dtime -- executed later
+			table.insert(mesecon.queue.actions, ac)
+		else
+			table.insert(actions_now, ac)
+		end
+	end
+
+	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
+		local hp = get_highest_priority(actions_now)
+		mesecon.queue:execute(actions_now[hp])
+		table.remove(actions_now, hp)
+	end
+end)
+
+function mesecon.queue:execute(action)
+	mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
+end
+
+
+-- Store and read the ActionQueue to / from a file
+-- so that upcoming actions are remembered when the game
+-- is restarted
+
+local wpath = minetest.get_worldpath()
+local function file2table(filename)
+	local f = io.open(filename, "r")
+	if f==nil then return {} end
+	local t = f:read("*all")
+	f:close()
+	if t=="" or t==nil then return {} end
+	return minetest.deserialize(t)
+end
+
+local function table2file(filename, table)
+	local f = io.open(filename, "w")
+	f:write(minetest.serialize(table))
+	f:close()
+end
+
+mesecon.queue.actions = file2table(wpath.."/mesecon_actionqueue")
+
+minetest.register_on_shutdown(function()
+	mesecon.queue.actions = table2file(wpath.."/mesecon_actionqueue", mesecon.queue.actions)
+end)
diff --git a/mesecons/mesecons/depends.txt b/mesecons/mesecons/depends.txt
new file mode 100644
index 0000000..4ad96d5
--- /dev/null
+++ b/mesecons/mesecons/depends.txt
@@ -0,0 +1 @@
+default
diff --git a/mesecons/mesecons/doc/mesecon/description.html b/mesecons/mesecons/doc/mesecon/description.html
new file mode 100644
index 0000000..a22ec65
--- /dev/null
+++ b/mesecons/mesecons/doc/mesecon/description.html
@@ -0,0 +1 @@
+ Mesecons are the wires, use them to connect effectors with receptors.
diff --git a/mesecons/mesecons/doc/mesecon/preview.png b/mesecons/mesecons/doc/mesecon/preview.png
new file mode 100755
index 0000000..f81e5cb
--- /dev/null
+++ b/mesecons/mesecons/doc/mesecon/preview.png
diff --git a/mesecons/mesecons/doc/mesecon/recipe.png b/mesecons/mesecons/doc/mesecon/recipe.png
new file mode 100644
index 0000000..72f9210
--- /dev/null
+++ b/mesecons/mesecons/doc/mesecon/recipe.png
diff --git a/mesecons/mesecons/init.lua b/mesecons/mesecons/init.lua
new file mode 100644
index 0000000..8645f03
--- /dev/null
+++ b/mesecons/mesecons/init.lua
@@ -0,0 +1,139 @@
+-- |\    /| ____ ____  ____ _____   ____         _____
+-- | \  / | |    |     |    |      |    | |\   | |
+-- |  \/  | |___ ____  |___ |      |    | | \  | |____
+-- |      | |        | |    |      |    | |  \ |     |
+-- |      | |___ ____| |___ |____  |____| |   \| ____|
+-- by Jeija, Uberi (Temperest), sfan5, VanessaE
+--
+--
+--
+-- This mod adds mesecons[=minecraft redstone] and different receptors/effectors to minetest.
+-- See the documentation on the forum for additional information, especially about crafting
+--
+--
+-- For developer documentation see the Developers' section on mesecons.TK
+--
+--
+--
+--Quick draft for the mesecons array in the node's definition
+--mesecons =
+--{
+--	receptor =
+--	{
+--		state = mesecon.state.on/off
+--		rules = rules/get_rules
+--	},
+--	effector =
+--	{
+--		action_on = function
+--		action_off = function
+--		action_change = function
+--		rules = rules/get_rules
+--	},
+--	conductor =
+--	{
+--		state = mesecon.state.on/off
+--		offstate = opposite state (for state = on only)
+--		onstate = opposite state (for state = off only)
+--		rules = rules/get_rules
+--	}
+--}
+
+-- PUBLIC VARIABLES
+mesecon={} -- contains all functions and all global variables
+mesecon.queue={} -- contains the ActionQueue
+mesecon.queue.funcs={} -- contains all ActionQueue functions
+
+-- Settings
+dofile(minetest.get_modpath("mesecons").."/settings.lua")
+
+-- Utilities like comparing positions,
+-- adding positions and rules,
+-- mostly things that make the source look cleaner
+dofile(minetest.get_modpath("mesecons").."/util.lua");
+
+-- Presets (eg default rules)
+dofile(minetest.get_modpath("mesecons").."/presets.lua");
+
+-- The ActionQueue
+-- Saves all the actions that have to be execute in the future
+dofile(minetest.get_modpath("mesecons").."/actionqueue.lua");
+
+-- Internal stuff
+-- This is the most important file
+-- it handles signal transmission and basically everything else
+-- It is also responsible for managing the nodedef things,
+-- like calling action_on/off/change
+dofile(minetest.get_modpath("mesecons").."/internal.lua");
+
+-- API
+-- these are the only functions you need to remember
+
+mesecon.queue:add_function("receptor_on", function (pos, rules)
+	rules = rules or mesecon.rules.default
+
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		-- if area is not loaded, keep trying
+		if minetest.get_node_or_nil(np) == nil then
+			mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+			return
+		end
+	end
+
+	-- execute action
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
+		for _, rulename in ipairs(rulenames) do
+			mesecon.turnon(np, rulename)
+		end
+	end
+end)
+
+function mesecon.receptor_on(pos, rules)
+	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+end
+
+mesecon.queue:add_function("receptor_off", function (pos, rules)
+	rules = rules or mesecon.rules.default
+
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		if minetest.get_node_or_nil(np) == nil then
+			mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+			return
+		end
+	end
+
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
+		for _, rulename in ipairs(rulenames) do
+			if not mesecon.connected_to_receptor(np, mesecon.invertRule(rule)) then
+				mesecon.turnoff(np, rulename)
+			else
+				mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
+			end
+		end
+	end
+end)
+
+function mesecon.receptor_off(pos, rules)
+	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+end
+
+
+print("[OK] Mesecons")
+
+-- Deprecated stuff
+-- To be removed in future releases
+dofile(minetest.get_modpath("mesecons").."/legacy.lua");
+
+--The actual wires
+dofile(minetest.get_modpath("mesecons").."/wires.lua");
+
+--Services like turnoff receptor on dignode and so on
+dofile(minetest.get_modpath("mesecons").."/services.lua");
diff --git a/mesecons/mesecons/internal.lua b/mesecons/mesecons/internal.lua
new file mode 100644
index 0000000..741abf1
--- /dev/null
+++ b/mesecons/mesecons/internal.lua
@@ -0,0 +1,652 @@
+-- Internal.lua - The core of mesecons
+--
+-- For more practical developer resources see http://mesecons.net/developers.php
+--
+-- Function overview
+-- mesecon.get_effector(nodename)	--> Returns the mesecons.effector -specifictation in the nodedef by the nodename
+-- mesecon.get_receptor(nodename)	--> Returns the mesecons.receptor -specifictation in the nodedef by the nodename
+-- mesecon.get_conductor(nodename)	--> Returns the mesecons.conductor-specifictation in the nodedef by the nodename
+-- mesecon.get_any_inputrules (node)	--> Returns the rules of a node if it is a conductor or an effector
+-- mesecon.get_any_outputrules (node)	--> Returns the rules of a node if it is a conductor or a receptor
+
+-- RECEPTORS
+-- mesecon.is_receptor(nodename)	--> Returns true if nodename is a receptor
+-- mesecon.is_receptor_on(nodename	--> Returns true if nodename is an receptor with state = mesecon.state.on
+-- mesecon.is_receptor_off(nodename)	--> Returns true if nodename is an receptor with state = mesecon.state.off
+-- mesecon.receptor_get_rules(node)	--> Returns the rules of the receptor (mesecon.rules.default if none specified)
+
+-- EFFECTORS
+-- mesecon.is_effector(nodename)	--> Returns true if nodename is an effector
+-- mesecon.is_effector_on(nodename)	--> Returns true if nodename is an effector with nodedef.mesecons.effector.action_off
+-- mesecon.is_effector_off(nodename)	--> Returns true if nodename is an effector with nodedef.mesecons.effector.action_on
+-- mesecon.effector_get_rules(node)	--> Returns the input rules of the effector (mesecon.rules.default if none specified)
+
+-- SIGNALS
+-- mesecon.activate(pos, node, depth)				--> Activates   the effector node at the specific pos (calls nodedef.mesecons.effector.action_on), higher depths are executed later
+-- mesecon.deactivate(pos, node, depth)				--> Deactivates the effector node at the specific pos (calls nodedef.mesecons.effector.action_off), higher depths are executed later
+-- mesecon.changesignal(pos, node, rulename, newstate, depth)	--> Changes     the effector node at the specific pos (calls nodedef.mesecons.effector.action_change), higher depths are executed later
+
+-- CONDUCTORS
+-- mesecon.is_conductor(nodename)	--> Returns true if nodename is a conductor
+-- mesecon.is_conductor_on(node		--> Returns true if node is a conductor with state = mesecon.state.on
+-- mesecon.is_conductor_off(node)	--> Returns true if node is a conductor with state = mesecon.state.off
+-- mesecon.get_conductor_on(node_off)	--> Returns the onstate  nodename of the conductor
+-- mesecon.get_conductor_off(node_on)	--> Returns the offstate nodename of the conductor
+-- mesecon.conductor_get_rules(node)	--> Returns the input+output rules of a conductor (mesecon.rules.default if none specified)
+
+-- HIGH-LEVEL Internals
+-- mesecon.is_power_on(pos)				--> Returns true if pos emits power in any way
+-- mesecon.is_power_off(pos)				--> Returns true if pos does not emit power in any way
+-- mesecon.turnon(pos, link) 				--> link is the input rule that caused calling turnon, turns on every connected node, iterative
+-- mesecon.turnoff(pos, link)				--> link is the input rule that caused calling turnoff, turns off every connected node, iterative
+-- mesecon.connected_to_receptor(pos, link)		--> Returns true if pos is connected to a receptor directly or via conductors, iterative
+-- mesecon.rules_link(output, input, dug_outputrules)	--> Returns true if outputposition + outputrules = inputposition and inputposition + inputrules = outputposition (if the two positions connect)
+-- mesecon.rules_link_anydir(outp., inp., d_outpr.)	--> Same as rules mesecon.rules_link but also returns true if output and input are swapped
+-- mesecon.is_powered(pos)				--> Returns true if pos is powered by a receptor or a conductor
+
+-- RULES ROTATION helpers
+-- mesecon.rotate_rules_right(rules)
+-- mesecon.rotate_rules_left(rules)
+-- mesecon.rotate_rules_up(rules)
+-- mesecon.rotate_rules_down(rules)
+-- These functions return rules that have been rotated in the specific direction
+
+-- General
+function mesecon.get_effector(nodename)
+	if  minetest.registered_nodes[nodename]
+	and minetest.registered_nodes[nodename].mesecons
+	and minetest.registered_nodes[nodename].mesecons.effector then
+		return minetest.registered_nodes[nodename].mesecons.effector
+	end
+end
+
+function mesecon.get_receptor(nodename)
+	if  minetest.registered_nodes[nodename]
+	and minetest.registered_nodes[nodename].mesecons
+	and minetest.registered_nodes[nodename].mesecons.receptor then
+		return minetest.registered_nodes[nodename].mesecons.receptor
+	end
+end
+
+function mesecon.get_conductor(nodename)
+	if  minetest.registered_nodes[nodename]
+	and minetest.registered_nodes[nodename].mesecons
+	and minetest.registered_nodes[nodename].mesecons.conductor then
+		return minetest.registered_nodes[nodename].mesecons.conductor
+	end
+end
+
+function mesecon.get_any_outputrules (node)
+	if mesecon.is_conductor(node.name) then
+		return mesecon.conductor_get_rules(node)
+	elseif mesecon.is_receptor(node.name) then
+		return mesecon.receptor_get_rules(node)
+	end
+end
+
+function mesecon.get_any_inputrules (node)
+	if mesecon.is_conductor(node.name) then
+		return mesecon.conductor_get_rules(node)
+	elseif mesecon.is_effector(node.name) then
+		return mesecon.effector_get_rules(node)
+	end
+end
+
+function mesecon.get_any_rules (node)
+	return mesecon.mergetable(mesecon.get_any_inputrules(node) or {},
+		mesecon.get_any_outputrules(node) or {})
+end
+
+-- Receptors
+-- Nodes that can power mesecons
+function mesecon.is_receptor_on(nodename)
+	local receptor = mesecon.get_receptor(nodename)
+	if receptor and receptor.state == mesecon.state.on then
+		return true
+	end
+	return false
+end
+
+function mesecon.is_receptor_off(nodename)
+	local receptor = mesecon.get_receptor(nodename)
+	if receptor and receptor.state == mesecon.state.off then
+		return true
+	end
+	return false
+end
+
+function mesecon.is_receptor(nodename)
+	local receptor = mesecon.get_receptor(nodename)
+	if receptor then
+		return true
+	end
+	return false
+end
+
+function mesecon.receptor_get_rules(node)
+	local receptor = mesecon.get_receptor(node.name)
+	if receptor then
+		local rules = receptor.rules
+		if type(rules) == 'function' then
+			return rules(node)
+		elseif rules then
+			return rules
+		end
+	end
+
+	return mesecon.rules.default
+end
+
+-- Effectors
+-- Nodes that can be powered by mesecons
+function mesecon.is_effector_on(nodename)
+	local effector = mesecon.get_effector(nodename)
+	if effector and effector.action_off then
+		return true
+	end
+	return false
+end
+
+function mesecon.is_effector_off(nodename)
+	local effector = mesecon.get_effector(nodename)
+	if effector and effector.action_on then
+		return true
+	end
+	return false
+end
+
+function mesecon.is_effector(nodename)
+	local effector = mesecon.get_effector(nodename)
+	if effector then
+		return true
+	end
+	return false
+end
+
+function mesecon.effector_get_rules(node)
+	local effector = mesecon.get_effector(node.name)
+	if effector then
+		local rules = effector.rules
+		if type(rules) == 'function' then
+			return rules(node)
+		elseif rules then
+			return rules
+		end
+	end
+	return mesecon.rules.default
+end
+
+-- #######################
+-- # Signals (effectors) #
+-- #######################
+
+-- Activation:
+mesecon.queue:add_function("activate", function (pos, rulename)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
+
+	if effector and effector.action_on then
+		effector.action_on(pos, node, rulename)
+	end
+end)
+
+function mesecon.activate(pos, node, rulename, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.activate(pos, node, rule, depth + 1)
+		end
+		return
+	end
+	mesecon.queue:add_action(pos, "activate", {rulename}, nil, rulename, 1 / depth)
+end
+
+
+-- Deactivation
+mesecon.queue:add_function("deactivate", function (pos, rulename)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
+
+	if effector and effector.action_off then
+		effector.action_off(pos, node, rulename)
+	end
+end)
+
+function mesecon.deactivate(pos, node, rulename, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.deactivate(pos, node, rule, depth + 1)
+		end
+		return
+	end
+	mesecon.queue:add_action(pos, "deactivate", {rulename}, nil, rulename, 1 / depth)
+end
+
+
+-- Change
+mesecon.queue:add_function("change", function (pos, rulename, changetype)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
+
+	if effector and effector.action_change then
+		effector.action_change(pos, node, rulename, changetype)
+	end
+end)
+
+function mesecon.changesignal(pos, node, rulename, newstate, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.changesignal(pos, node, rule, newstate, depth + 1)
+		end
+		return
+	end
+
+	-- Include "change" in overwritecheck so that it cannot be overwritten
+	-- by "active" / "deactivate" that will be called upon the node at the same time.
+	local overwritecheck = {"change", rulename}
+	mesecon.queue:add_action(pos, "change", {rulename, newstate}, nil, overwritecheck, 1 / depth)
+end
+
+-- Conductors
+
+function mesecon.is_conductor_on(node, rulename)
+	local conductor = mesecon.get_conductor(node.name)
+	if conductor then
+		if conductor.state then
+			return conductor.state == mesecon.state.on
+		end
+		if conductor.states then
+			if not rulename then
+				return mesecon.getstate(node.name, conductor.states) ~= 1
+			end
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node))
+			local binstate = mesecon.getbinstate(node.name, conductor.states)
+			return mesecon.get_bit(binstate, bit)
+		end
+	end
+	return false
+end
+
+function mesecon.is_conductor_off(node, rulename)
+	local conductor = mesecon.get_conductor(node.name)
+	if conductor then
+		if conductor.state then
+			return conductor.state == mesecon.state.off
+		end
+		if conductor.states then
+			if not rulename then
+				return mesecon.getstate(node.name, conductor.states) == 1
+			end
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node))
+			local binstate = mesecon.getbinstate(node.name, conductor.states)
+			return not mesecon.get_bit(binstate, bit)
+		end
+	end
+	return false
+end
+
+function mesecon.is_conductor(nodename)
+	local conductor = mesecon.get_conductor(nodename)
+	if conductor then
+		return true
+	end
+	return false
+end
+
+function mesecon.get_conductor_on(node_off, rulename)
+	local conductor = mesecon.get_conductor(node_off.name)
+	if conductor then
+		if conductor.onstate then
+			return conductor.onstate
+		end
+		if conductor.states then
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node_off))
+			local binstate = mesecon.getbinstate(node_off.name, conductor.states)
+			binstate = mesecon.set_bit(binstate, bit, "1")
+			return conductor.states[tonumber(binstate,2)+1]
+		end
+	end
+	return offstate
+end
+
+function mesecon.get_conductor_off(node_on, rulename)
+	local conductor = mesecon.get_conductor(node_on.name)
+	if conductor then
+		if conductor.offstate then
+			return conductor.offstate
+		end
+		if conductor.states then
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node_on))
+			local binstate = mesecon.getbinstate(node_on.name, conductor.states)
+			binstate = mesecon.set_bit(binstate, bit, "0")
+			return conductor.states[tonumber(binstate,2)+1]
+		end
+	end
+	return onstate
+end
+
+function mesecon.conductor_get_rules(node)
+	local conductor = mesecon.get_conductor(node.name)
+	if conductor then
+		local rules = conductor.rules
+		if type(rules) == 'function' then
+			return rules(node)
+		elseif rules then
+			return rules
+		end
+	end
+	return mesecon.rules.default
+end
+
+-- some more general high-level stuff
+
+function mesecon.is_power_on(pos, rulename)
+	local node = minetest.get_node(pos)
+	if mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name) then
+		return true
+	end
+	return false
+end
+
+function mesecon.is_power_off(pos, rulename)
+	local node = minetest.get_node(pos)
+	if mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name) then
+		return true
+	end
+	return false
+end
+
+function mesecon.turnon(pos, link)
+	local frontiers = {{pos = pos, link = link}}
+
+	local depth = 1
+	while frontiers[depth] do
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
+
+		-- area not loaded, postpone action
+		if not node then
+			mesecon.queue:add_action(f.pos, "turnon", {link}, nil, true)
+		elseif mesecon.is_conductor_off(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
+
+			minetest.swap_node(f.pos, {name = mesecon.get_conductor_on(node, f.link),
+				param2 = node.param2})
+
+			-- call turnon on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = mesecon.addPosRule(f.pos, r)
+
+				-- area not loaded, postpone action
+				if not minetest.get_node_or_nil(np) then
+					mesecon.queue:add_action(np, "turnon", {rulename},
+						nil, true)
+				else
+					local links = mesecon.rules_link_rule_all(f.pos, r)
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = np, link = l})
+					end
+				end
+			end
+		elseif mesecon.is_effector(node.name) then
+			mesecon.changesignal(f.pos, node, f.link, mesecon.state.on, depth)
+			if mesecon.is_effector_off(node.name) then
+				mesecon.activate(f.pos, node, f.link, depth)
+			end
+		end
+		depth = depth + 1
+	end
+end
+
+mesecon.queue:add_function("turnon", function (pos, rulename, recdepth)
+	mesecon.turnon(pos, rulename, recdepth)
+end)
+
+function mesecon.turnoff(pos, link)
+	local frontiers = {{pos = pos, link = link}}
+
+	local depth = 1
+	while frontiers[depth] do
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
+
+		-- area not loaded, postpone action
+		if not node then
+			mesecon.queue:add_action(f.pos, "turnoff", {link}, nil, true)
+		elseif mesecon.is_conductor_on(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
+
+			minetest.swap_node(f.pos, {name = mesecon.get_conductor_off(node, f.link),
+				param2 = node.param2})
+
+			-- call turnoff on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = mesecon.addPosRule(f.pos, r)
+
+				-- area not loaded, postpone action
+				if not minetest.get_node_or_nil(np) then
+					mesecon.queue:add_action(np, "turnoff", {rulename},
+						nil, true)
+				else
+					local links = mesecon.rules_link_rule_all(f.pos, r)
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = np, link = l})
+					end
+				end
+			end
+		elseif mesecon.is_effector(node.name) then
+			mesecon.changesignal(f.pos, node, f.link, mesecon.state.off, depth)
+			if mesecon.is_effector_on(node.name) and not mesecon.is_powered(f.pos) then
+				mesecon.deactivate(f.pos, node, f.link, depth)
+			end
+		end
+		depth = depth + 1
+	end
+end
+
+mesecon.queue:add_function("turnoff", function (pos, rulename, recdepth)
+	mesecon.turnoff(pos, rulename, recdepth)
+end)
+
+
+function mesecon.connected_to_receptor(pos, link)
+	local node = minetest.get_node(pos)
+
+	-- Check if conductors around are connected
+	local rules = mesecon.get_any_inputrules(node)
+	if not rules then return false end
+
+	for _, rule in ipairs(mesecon.rule2meta(link, rules)) do
+		local links = mesecon.rules_link_rule_all_inverted(pos, rule)
+		for _, l in ipairs(links) do
+			local np = mesecon.addPosRule(pos, l)
+			if mesecon.find_receptor_on(np, mesecon.invertRule(l)) then
+				return true
+			end
+		end
+	end
+
+	return false
+end
+
+function mesecon.find_receptor_on(pos, link)
+	local frontiers = {{pos = pos, link = link}}
+	local checked = {}
+
+	-- List of positions that have been searched for onstate receptors
+	local depth = 1
+	while frontiers[depth] do
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
+
+		if not node then return false end
+		if mesecon.is_receptor_on(node.name) then return true end
+		if mesecon.is_conductor_on(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
+
+			-- call turnoff on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = mesecon.addPosRule(f.pos, r)
+
+				local links = mesecon.rules_link_rule_all_inverted(f.pos, r)
+				for _, l in ipairs(links) do
+					local checkedstring = np.x..np.y..np.z..l.x..l.y..l.z
+					if not checked[checkedstring] then
+						table.insert(frontiers, {pos = np, link = l})
+						checked[checkedstring] = true
+					end
+				end
+			end
+
+		end
+		depth = depth + 1
+	end
+end
+
+function mesecon.rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
+	local outputnode = minetest.get_node(output)
+	local inputnode = minetest.get_node(input)
+	local outputrules = dug_outputrules or mesecon.get_any_outputrules (outputnode)
+	local inputrules = mesecon.get_any_inputrules (inputnode)
+	if not outputrules or not inputrules then
+		return
+	end
+
+	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
+		-- Check if output sends to input
+		if mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
+			for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
+				-- Check if input accepts from output
+				if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
+					return true, inputrule
+				end
+			end
+		end
+	end
+	return false
+end
+
+function mesecon.rules_link_rule_all(output, rule)
+	local input = mesecon.addPosRule(output, rule)
+	local inputnode = minetest.get_node(input)
+	local inputrules = mesecon.get_any_inputrules (inputnode)
+	if not inputrules then
+		return {}
+	end
+	local rules = {}
+
+	for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
+		-- Check if input accepts from output
+		if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
+			table.insert(rules, inputrule)
+		end
+	end
+	return rules
+end
+
+function mesecon.rules_link_rule_all_inverted(input, rule)
+	--local irule = mesecon.invertRule(rule)
+	local output = mesecon.addPosRule(input, rule)
+	local outputnode = minetest.get_node(output)
+	local outputrules = mesecon.get_any_outputrules (outputnode)
+	if not outputrules then
+		return {}
+	end
+	local rules = {}
+
+	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
+		if  mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
+			table.insert(rules, mesecon.invertRule(outputrule))
+		end
+	end
+	return rules
+end
+
+function mesecon.rules_link_anydir(pos1, pos2)
+	return mesecon.rules_link(pos1, pos2) or mesecon.rules_link(pos2, pos1)
+end
+
+function mesecon.is_powered(pos, rule)
+	local node = minetest.get_node(pos)
+	local rules = mesecon.get_any_inputrules(node)
+	if not rules then return false end
+
+	-- List of nodes that send out power to pos
+	local sourcepos = {}
+
+	if not rule then
+		for _, rule in ipairs(mesecon.flattenrules(rules)) do
+			local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
+			for _, rname in ipairs(rulenames) do
+				local np = mesecon.addPosRule(pos, rname)
+				local nn = minetest.get_node(np)
+				if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname))
+				or mesecon.is_receptor_on (nn.name)) then
+					table.insert(sourcepos, np)
+				end
+			end
+		end
+	else
+		local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
+		for _, rname in ipairs(rulenames) do
+			local np = mesecon.addPosRule(pos, rname)
+			local nn = minetest.get_node(np)
+			if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname))
+			or mesecon.is_receptor_on (nn.name)) then
+				table.insert(sourcepos, np)
+			end
+		end
+	end
+
+	-- Return FALSE if not powered, return list of sources if is powered
+	if (#sourcepos == 0) then return false
+	else return sourcepos end
+end
+
+--Rules rotation Functions:
+function mesecon.rotate_rules_right(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x = -rule.z,
+			y =  rule.y,
+			z =  rule.x,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_left(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x =  rule.z,
+			y =  rule.y,
+			z = -rule.x,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_down(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x = -rule.y,
+			y =  rule.x,
+			z =  rule.z,
+			name = rule.name})
+	end
+	return nr
+end
+
+function mesecon.rotate_rules_up(rules)
+	local nr = {}
+	for i, rule in ipairs(rules) do
+		table.insert(nr, {
+			x =  rule.y,
+			y = -rule.x,
+			z =  rule.z,
+			name = rule.name})
+	end
+	return nr
+end
diff --git a/mesecons/mesecons/legacy.lua b/mesecons/mesecons/legacy.lua
new file mode 100644
index 0000000..6d8ccca
--- /dev/null
+++ b/mesecons/mesecons/legacy.lua
@@ -0,0 +1,30 @@
+-- Ugly hack to prevent breaking compatibility with other mods
+-- Just remove the following two functions to delete the hack, to be done when other mods have updated
+function mesecon.receptor_on(self, pos, rules)
+	if (self.receptor_on) then
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_on.")
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
+		print("[Mesecons]          to use mesecon.receptor_on instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
+	end
+	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+end
+
+function mesecon.receptor_off(self, pos, rules)
+	if (self.receptor_off) then
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_off.")
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
+		print("[Mesecons]          to use mesecon.receptor_off instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
+	end
+	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+end
+
diff --git a/mesecons/mesecons/oldwires.lua b/mesecons/mesecons/oldwires.lua
new file mode 100644
index 0000000..b3b09e5
--- /dev/null
+++ b/mesecons/mesecons/oldwires.lua
@@ -0,0 +1,38 @@
+minetest.register_node("mesecons:mesecon_off", {
+	drawtype = "raillike",
+	tiles = {"jeija_mesecon_off.png", "jeija_mesecon_curved_off.png", "jeija_mesecon_t_junction_off.png", "jeija_mesecon_crossing_off.png"},
+	inventory_image = "jeija_mesecon_off.png",
+	wield_image = "jeija_mesecon_off.png",
+	paramtype = "light",
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+	},
+	groups = {dig_immediate=3, mesecon=1, mesecon_conductor_craftable=1},
+    	description="Mesecons",
+	mesecons = {conductor={
+		state = mesecon.state.off,
+		onstate = "mesecons:mesecon_on"
+	}}
+})
+
+minetest.register_node("mesecons:mesecon_on", {
+	drawtype = "raillike",
+	tiles = {"jeija_mesecon_on.png", "jeija_mesecon_curved_on.png", "jeija_mesecon_t_junction_on.png", "jeija_mesecon_crossing_on.png"},
+	paramtype = "light",
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
+	},
+	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
+	drop = "mesecons:mesecon_off 1",
+	light_source = default.LIGHT_MAX-11,
+	mesecons = {conductor={
+		state = mesecon.state.on,
+		offstate = "mesecons:mesecon_off"
+	}}
+})
diff --git a/mesecons/mesecons/presets.lua b/mesecons/mesecons/presets.lua
new file mode 100644
index 0000000..2f2f643
--- /dev/null
+++ b/mesecons/mesecons/presets.lua
@@ -0,0 +1,55 @@
+mesecon.rules = {}
+mesecon.state = {}
+
+mesecon.rules.default =
+{{x=0,  y=0,  z=-1},
+ {x=1,  y=0,  z=0},
+ {x=-1, y=0,  z=0},
+ {x=0,  y=0,  z=1},
+ {x=1,  y=1,  z=0},
+ {x=1,  y=-1, z=0},
+ {x=-1, y=1,  z=0},
+ {x=-1, y=-1, z=0},
+ {x=0,  y=1,  z=1},
+ {x=0,  y=-1, z=1},
+ {x=0,  y=1,  z=-1},
+ {x=0,  y=-1, z=-1}}
+
+mesecon.rules.pplate = mesecon.mergetable(mesecon.rules.default, {{x=0, y=-2, z=0}})
+
+mesecon.rules.buttonlike =
+{{x = 1,  y = 0, z = 0},
+ {x = 1,  y = 1, z = 0},
+ {x = 1,  y =-1, z = 0},
+ {x = 1,  y =-1, z = 1},
+ {x = 1,  y =-1, z =-1},
+ {x = 2,  y = 0, z = 0}}
+
+mesecon.rules.flat =
+{{x = 1, y = 0, z = 0},
+ {x =-1, y = 0, z = 0},
+ {x = 0, y = 0, z = 1},
+ {x = 0, y = 0, z =-1}}
+
+mesecon.rules.alldirs =
+{{x= 1, y= 0,  z= 0},
+ {x=-1, y= 0,  z= 0},
+ {x= 0, y= 1,  z= 0},
+ {x= 0, y=-1,  z= 0},
+ {x= 0, y= 0,  z= 1},
+ {x= 0, y= 0,  z=-1}}
+
+mesecon.rules.buttonlike_get = function(node)
+	local rules = mesecon.rules.buttonlike
+	if node.param2 == 2 then
+		rules=mesecon.rotate_rules_left(rules)
+	elseif node.param2 == 3 then
+		rules=mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
+	elseif node.param2 == 0 then
+		rules=mesecon.rotate_rules_right(rules)
+	end
+	return rules
+end
+
+mesecon.state.on = "on"
+mesecon.state.off = "off"
diff --git a/mesecons/mesecons/services.lua b/mesecons/mesecons/services.lua
new file mode 100644
index 0000000..215fb31
--- /dev/null
+++ b/mesecons/mesecons/services.lua
@@ -0,0 +1,100 @@
+-- Dig and place services
+
+mesecon.on_placenode = function (pos, node)
+	mesecon.update_autoconnect(pos, node)
+
+	-- Receptors: Send on signal when active
+	if mesecon.is_receptor_on(node.name) then
+		mesecon.receptor_on(pos, mesecon.receptor_get_rules(node))
+	end
+
+	-- Conductors: Send turnon signal when powered or replace by respective offstate conductor
+	-- if placed conductor is an onstate one
+	if mesecon.is_conductor(node.name) then
+		local sources = mesecon.is_powered(pos)
+		if sources then
+			-- also call receptor_on if itself is powered already, so that neighboring
+			-- conductors will be activated (when pushing an on-conductor with a piston)
+			for _, s in ipairs(sources) do
+				local rule = {x = pos.x - s.x, y = pos.y - s.y, z = pos.z - s.z}
+				mesecon.turnon(pos, rule)
+			end
+			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
+		elseif mesecon.is_conductor_on(node) then
+			minetest.swap_node(pos, {name = mesecon.get_conductor_off(node)})
+		end
+	end
+
+	-- Effectors: Send changesignal and activate or deactivate
+	if mesecon.is_effector(node.name) then
+		local powered_rules = {}
+		local unpowered_rules = {}
+
+		-- for each input rule, check if powered
+		for _, r in ipairs(mesecon.effector_get_rules(node)) do
+			local powered = mesecon.is_powered(pos, r)
+			if powered then table.insert(powered_rules, r)
+			else table.insert(unpowered_rules, r) end
+
+			local state = powered and mesecon.state.on or mesecon.state.off
+			mesecon.changesignal(pos, node, r, state, 1)
+		end
+
+		if (#powered_rules > 0) then
+			for _, r in ipairs(powered_rules) do
+				mesecon.activate(pos, node, r, 1)
+			end
+		else
+			for _, r in ipairs(unpowered_rules) do
+				mesecon.deactivate(pos, node, r, 1)
+			end
+		end
+	end
+end
+
+mesecon.on_dignode = function (pos, node)
+	if mesecon.is_conductor_on(node) then
+		mesecon.receptor_off(pos, mesecon.conductor_get_rules(node))
+	elseif mesecon.is_receptor_on(node.name) then
+		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
+	end
+	mesecon.queue:add_action(pos, "update_autoconnect", {node})
+end
+
+mesecon.queue:add_function("update_autoconnect", mesecon.update_autoconnect)
+
+minetest.register_on_placenode(mesecon.on_placenode)
+minetest.register_on_dignode(mesecon.on_dignode)
+
+-- Overheating service for fast circuits
+
+-- returns true if heat is too high
+mesecon.do_overheat = function(pos)
+	local meta = minetest.get_meta(pos)
+	local heat = meta:get_int("heat") or 0
+
+	heat = heat + 1
+	meta:set_int("heat", heat)
+
+	if heat < mesecon.setting("overheat_max", 20) then
+		mesecon.queue:add_action(pos, "cooldown", {}, 1, nil, 0)
+	else
+		return true
+	end
+
+	return false
+end
+
+
+mesecon.queue:add_function("cooldown", function (pos)
+	if minetest.get_item_group(minetest.get_node(pos).name, "overheat") == 0 then
+		return -- node has been moved, this one does not use overheating - ignore
+	end
+
+	local meta = minetest.get_meta(pos)
+	local heat = meta:get_int("heat")
+
+	if (heat > 0) then
+		meta:set_int("heat", heat - 1)
+	end
+end)
diff --git a/mesecons/mesecons/settings.lua b/mesecons/mesecons/settings.lua
new file mode 100644
index 0000000..50240c3
--- /dev/null
+++ b/mesecons/mesecons/settings.lua
@@ -0,0 +1,15 @@
+-- SETTINGS

+function mesecon.setting(setting, default)

+	if type(default) == "boolean" then

+		local read = minetest.setting_getbool("mesecon."..setting)

+		if read == nil then

+			return default

+		else

+			return read

+		end

+	elseif type(default) == "string" then

+		return minetest.setting_get("mesecon."..setting) or default

+	elseif type(default) == "number" then

+		return tonumber(minetest.setting_get("mesecon."..setting) or default)

+	end

+end

diff --git a/mesecons/mesecons/textures/mesecons_wire_inv.png b/mesecons/mesecons/textures/mesecons_wire_inv.png
new file mode 100644
index 0000000..a3930cb
--- /dev/null
+++ b/mesecons/mesecons/textures/mesecons_wire_inv.png
diff --git a/mesecons/mesecons/textures/mesecons_wire_off.png b/mesecons/mesecons/textures/mesecons_wire_off.png
new file mode 100644
index 0000000..58164fa
--- /dev/null
+++ b/mesecons/mesecons/textures/mesecons_wire_off.png
diff --git a/mesecons/mesecons/textures/mesecons_wire_on.png b/mesecons/mesecons/textures/mesecons_wire_on.png
new file mode 100644
index 0000000..98a86c8
--- /dev/null
+++ b/mesecons/mesecons/textures/mesecons_wire_on.png
diff --git a/mesecons/mesecons/util.lua b/mesecons/mesecons/util.lua
new file mode 100644
index 0000000..dd33f1c
--- /dev/null
+++ b/mesecons/mesecons/util.lua
@@ -0,0 +1,211 @@
+function mesecon.move_node(pos, newpos)
+	local node = minetest.get_node(pos)
+	local meta = minetest.get_meta(pos):to_table()
+	minetest.remove_node(pos)
+	minetest.add_node(newpos, node)
+	minetest.get_meta(pos):from_table(meta)
+end
+
+function mesecon.flattenrules(allrules)
+--[[
+	{
+		{
+			{xyz},
+			{xyz},
+		},
+		{
+			{xyz},
+			{xyz},
+		},
+	}
+--]]
+	if allrules[1] and
+	   allrules[1].x then
+		return allrules
+	end
+
+	local shallowrules = {}
+	for _, metarule in ipairs( allrules) do
+	for _,     rule in ipairs(metarule ) do
+		table.insert(shallowrules, rule)
+	end
+	end
+	return shallowrules
+--[[
+	{
+		{xyz},
+		{xyz},
+		{xyz},
+		{xyz},
+	}
+--]]
+end
+
+function mesecon.rule2bit(findrule, allrules)
+	--get the bit of the metarule the rule is in, or bit 1
+	if (allrules[1] and
+	    allrules[1].x) or
+	    not findrule then
+		return 1
+	end
+	for m,metarule in ipairs( allrules) do
+	for _,    rule in ipairs(metarule ) do
+		if mesecon.cmpPos(findrule, rule) then
+			return m
+		end
+	end
+	end
+end
+
+function mesecon.rule2metaindex(findrule, allrules)
+	--get the metarule the rule is in, or allrules
+	if allrules[1].x then
+		return nil
+	end
+
+	if not(findrule) then
+		return mesecon.flattenrules(allrules)
+	end
+
+	for m, metarule in ipairs( allrules) do
+	for _,     rule in ipairs(metarule ) do
+		if mesecon.cmpPos(findrule, rule) then
+			return m
+		end
+	end
+	end
+end
+
+function mesecon.rule2meta(findrule, allrules)
+	if #allrules == 0 then return {} end
+
+	local index = mesecon.rule2metaindex(findrule, allrules)
+	if index == nil then
+		if allrules[1].x then
+			return allrules
+		else
+			return {}
+		end
+	end
+	return allrules[index]
+end
+
+function mesecon.dec2bin(n)
+	local x, y = math.floor(n / 2), n % 2
+	if (n > 1) then
+		return mesecon.dec2bin(x)..y
+	else
+		return ""..y
+	end
+end
+
+function mesecon.getstate(nodename, states)
+	for state, name in ipairs(states) do
+		if name == nodename then
+			return state
+		end
+	end
+	error(nodename.." doesn't mention itself in "..dump(states))
+end
+
+function mesecon.getbinstate(nodename, states)
+	return mesecon.dec2bin(mesecon.getstate(nodename, states)-1)
+end
+
+function mesecon.get_bit(binary,bit)
+	bit = bit or 1
+	local c = binary:len()-(bit-1)
+	return binary:sub(c,c) == "1"
+end
+
+function mesecon.set_bit(binary,bit,value)
+	if value == "1" then
+		if not mesecon.get_bit(binary,bit) then
+			return mesecon.dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
+		end
+	elseif value == "0" then
+		if mesecon.get_bit(binary,bit) then
+			return mesecon.dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
+		end
+	end
+	return binary
+
+end
+
+function mesecon.invertRule(r)
+	return {x = -r.x, y = -r.y, z = -r.z}
+end
+
+function mesecon.addPosRule(p, r)
+	return {x = p.x + r.x, y = p.y + r.y, z = p.z + r.z}
+end
+
+function mesecon.cmpPos(p1, p2)
+	return (p1.x == p2.x and p1.y == p2.y and p1.z == p2.z)
+end
+
+function mesecon.tablecopy(table) -- deep table copy
+	if type(table) ~= "table" then return table end -- no need to copy
+	local newtable = {}
+
+	for idx, item in pairs(table) do
+		if type(item) == "table" then
+			newtable[idx] = mesecon.tablecopy(item)
+		else
+			newtable[idx] = item
+		end
+	end
+
+	return newtable
+end
+
+function mesecon.cmpAny(t1, t2)
+	if type(t1) ~= type(t2) then return false end
+	if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end
+
+	for i, e in pairs(t1) do
+		if not mesecon.cmpAny(e, t2[i]) then return false end
+	end
+
+	return true
+end
+
+-- does not overwrite values; number keys (ipairs) are appended, not overwritten
+function mesecon.mergetable(source, dest)
+	local rval = mesecon.tablecopy(dest)
+
+	for k, v in pairs(source) do
+		rval[k] = dest[k] or mesecon.tablecopy(v)
+	end
+	for i, v in ipairs(source) do
+		table.insert(rval, mesecon.tablecopy(v))
+	end
+
+	return rval
+end
+
+function mesecon.register_node(name, spec_common, spec_off, spec_on)
+	spec_common.drop = spec_common.drop or name .. "_off"
+	spec_common.__mesecon_basename = name
+	spec_on.__mesecon_state = "on"
+	spec_off.__mesecon_state = "off"
+
+	spec_on = mesecon.mergetable(spec_common, spec_on);
+	spec_off = mesecon.mergetable(spec_common, spec_off);
+
+	minetest.register_node(name .. "_on", spec_on)
+	minetest.register_node(name .. "_off", spec_off)
+end
+
+-- swap onstate and offstate nodes, returns new state
+function mesecon.flipstate(pos, node)
+	local nodedef = minetest.registered_nodes[node.name]
+	local newstate
+	if (nodedef.__mesecon_state == "on") then newstate = "off" end
+	if (nodedef.__mesecon_state == "off") then newstate = "on" end
+
+	minetest.swap_node(pos, {name = nodedef.__mesecon_basename .. "_" .. newstate,
+		param2 = node.param2})
+
+	return newstate
+end
diff --git a/mesecons/mesecons/wires.lua b/mesecons/mesecons/wires.lua
new file mode 100644
index 0000000..18ae8f5
--- /dev/null
+++ b/mesecons/mesecons/wires.lua
@@ -0,0 +1,250 @@
+-- naming scheme: wire:(xp)(zp)(xm)(zm)(xpyp)(zpyp)(xmyp)(zmyp)_on/off
+-- where x= x direction, z= z direction, y= y direction, p = +1, m = -1, e.g. xpym = {x=1, y=-1, z=0}
+-- The (xp)/(zpyp)/.. statements shall be replaced by either 0 or 1
+-- Where 0 means the wire has no visual connection to that direction and
+-- 1 means that the wire visually connects to that other node.
+
+-- #######################
+-- ## Update wire looks ##
+-- #######################
+
+-- self_pos = pos of any mesecon node, from_pos = pos of conductor to getconnect for
+local wire_getconnect = function (from_pos, self_pos)
+	local node = minetest.get_node(self_pos)
+	if minetest.registered_nodes[node.name]
+	and minetest.registered_nodes[node.name].mesecons then
+		-- rules of node to possibly connect to
+		local rules = {}
+		if (minetest.registered_nodes[node.name].mesecon_wire) then
+			rules = mesecon.rules.default
+		else
+			rules = mesecon.get_any_rules(node)
+		end
+
+		for _, r in ipairs(mesecon.flattenrules(rules)) do
+			if (mesecon.cmpPos(mesecon.addPosRule(self_pos, r), from_pos)) then
+				return true
+			end
+		end
+	end
+	return false
+end
+
+-- Update this node
+local wire_updateconnect = function (pos)
+	local connections = {}
+
+	for _, r in ipairs(mesecon.rules.default) do
+		if wire_getconnect(pos, mesecon.addPosRule(pos, r)) then
+			table.insert(connections, r)
+		end
+	end
+
+	local nid = {}
+	for _, vec in ipairs(connections) do
+		-- flat component
+		if vec.x ==  1 then nid[0] = "1" end
+		if vec.z ==  1 then nid[1] = "1" end
+		if vec.x == -1 then nid[2] = "1" end
+		if vec.z == -1 then nid[3] = "1"  end
+
+		-- slopy component
+		if vec.y == 1 then
+			if vec.x ==  1 then nid[4] = "1" end
+			if vec.z ==  1 then nid[5] = "1" end
+			if vec.x == -1 then nid[6] = "1" end
+			if vec.z == -1 then nid[7] = "1" end
+		end
+	end
+
+	local nodeid = 	  (nid[0] or "0")..(nid[1] or "0")..(nid[2] or "0")..(nid[3] or "0")
+			..(nid[4] or "0")..(nid[5] or "0")..(nid[6] or "0")..(nid[7] or "0")
+
+	local state_suffix = string.find(minetest.get_node(pos).name, "_off") and "_off" or "_on"
+	minetest.set_node(pos, {name = "mesecons:wire_"..nodeid..state_suffix})
+end
+
+local update_on_place_dig = function (pos, node)
+	-- Update placed node (get_node again as it may have been dug)
+	local nn = minetest.get_node(pos)
+	if (minetest.registered_nodes[nn.name])
+	and (minetest.registered_nodes[nn.name].mesecon_wire) then
+		wire_updateconnect(pos)
+	end
+
+	-- Update nodes around it
+	local rules = {}
+	if minetest.registered_nodes[node.name]
+	and minetest.registered_nodes[node.name].mesecon_wire then
+		rules = mesecon.rules.default
+	else
+		rules = mesecon.get_any_rules(node)
+	end
+	if (not rules) then return end
+
+	for _, r in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, r)
+		if minetest.registered_nodes[minetest.get_node(np).name]
+		and minetest.registered_nodes[minetest.get_node(np).name].mesecon_wire then
+			wire_updateconnect(np)
+		end
+	end
+end
+
+function mesecon.update_autoconnect(pos, node)
+	if (not node) then node = minetest.get_node(pos) end
+	update_on_place_dig(pos, node)
+end
+
+-- ############################
+-- ## Wire node registration ##
+-- ############################
+-- Nodeboxes:
+local box_center = {-1/16, -.5, -1/16, 1/16, -.5+1/16, 1/16}
+local box_bump1 =  { -2/16, -8/16,  -2/16, 2/16, -13/32, 2/16 }
+
+local nbox_nid =
+{
+	[0] = {1/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}, -- x positive
+	[1] = {-1/16, -.5, 1/16, 1/16, -.5+1/16, 8/16}, -- z positive
+	[2] = {-8/16, -.5, -1/16, -1/16, -.5+1/16, 1/16}, -- x negative
+	[3] = {-1/16, -.5, -8/16, 1/16, -.5+1/16, -1/16}, -- z negative
+
+	[4] = {.5-1/16, -.5+1/16, -1/16, .5, .4999+1/16, 1/16}, -- x positive up
+	[5] = {-1/16, -.5+1/16, .5-1/16, 1/16, .4999+1/16, .5}, -- z positive up
+	[6] = {-.5, -.5+1/16, -1/16, -.5+1/16, .4999+1/16, 1/16}, -- x negative up
+	[7] = {-1/16, -.5+1/16, -.5, 1/16, .4999+1/16, -.5+1/16}  -- z negative up
+}
+
+local tiles_off = { "mesecons_wire_off.png" }
+local tiles_on = { "mesecons_wire_on.png" }
+
+local selectionbox =
+{
+	type = "fixed",
+	fixed = {-.5, -.5, -.5, .5, -.5+4/16, .5}
+}
+
+-- go to the next nodeid (ex.: 01000011 --> 01000100)
+local nid_inc = function() end
+nid_inc = function (nid)
+	local i = 0
+	while nid[i-1] ~= 1 do
+		nid[i] = (nid[i] ~= 1) and 1 or 0
+		i = i + 1
+	end
+
+	-- BUT: Skip impossible nodeids:
+	if ((nid[0] == 0 and nid[4] == 1) or (nid[1] == 0 and nid[5] == 1)
+	or (nid[2] == 0 and nid[6] == 1) or (nid[3] == 0 and nid[7] == 1)) then
+		return nid_inc(nid)
+	end
+
+	return i <= 8
+end
+
+register_wires = function()
+	local nid = {}
+	while true do
+		-- Create group specifiction and nodeid string (see note above for details)
+		local nodeid = 	  (nid[0] or "0")..(nid[1] or "0")..(nid[2] or "0")..(nid[3] or "0")
+				..(nid[4] or "0")..(nid[5] or "0")..(nid[6] or "0")..(nid[7] or "0")
+
+		-- Calculate nodebox
+		local nodebox = {type = "fixed", fixed={box_center}}
+		for i=0,7 do
+			if nid[i] == 1 then
+				table.insert(nodebox.fixed, nbox_nid[i])
+			end
+		end
+
+		-- Add bump to nodebox if curved
+		if (nid[0] == 1 and nid[1] == 1) or (nid[1] == 1 and nid[2] == 1)
+		or (nid[2] == 1 and nid[3] == 1) or (nid[3] == 1 and nid[0] == 1) then
+			table.insert(nodebox.fixed, box_bump1)
+		end
+
+		-- If nothing to connect to, still make a nodebox of a straight wire
+		if nodeid == "00000000" then
+			nodebox.fixed = {-8/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
+		end
+
+		local rules = {}
+		if (nid[0] == 1) then table.insert(rules, vector.new( 1,  0,  0)) end
+		if (nid[1] == 1) then table.insert(rules, vector.new( 0,  0,  1)) end
+		if (nid[2] == 1) then table.insert(rules, vector.new(-1,  0,  0)) end
+		if (nid[3] == 1) then table.insert(rules, vector.new( 0,  0, -1)) end
+
+		if (nid[0] == 1) then table.insert(rules, vector.new( 1, -1,  0)) end
+		if (nid[1] == 1) then table.insert(rules, vector.new( 0, -1,  1)) end
+		if (nid[2] == 1) then table.insert(rules, vector.new(-1, -1,  0)) end
+		if (nid[3] == 1) then table.insert(rules, vector.new( 0, -1, -1)) end
+
+		if (nid[4] == 1) then table.insert(rules, vector.new( 1,  1,  0)) end
+		if (nid[5] == 1) then table.insert(rules, vector.new( 0,  1,  1)) end
+		if (nid[6] == 1) then table.insert(rules, vector.new(-1,  1,  0)) end
+		if (nid[7] == 1) then table.insert(rules, vector.new( 0,  1, -1)) end
+
+		local meseconspec_off = { conductor = {
+			rules = rules,
+			state = mesecon.state.off,
+			onstate = "mesecons:wire_"..nodeid.."_on"
+		}}
+
+		local meseconspec_on = { conductor = {
+			rules = rules,
+			state = mesecon.state.on,
+			offstate = "mesecons:wire_"..nodeid.."_off"
+		}}
+
+		local groups_on = {dig_immediate = 3, mesecon_conductor_craftable = 1,
+			not_in_creative_inventory = 1}
+		local groups_off = {dig_immediate = 3, mesecon_conductor_craftable = 1}
+		if nodeid ~= "00000000" then
+			groups_off["not_in_creative_inventory"] = 1
+		end
+
+		mesecon.register_node("mesecons:wire_"..nodeid, {
+			description = "Mesecon",
+			drawtype = "nodebox",
+			inventory_image = "mesecons_wire_inv.png",
+			wield_image = "mesecons_wire_inv.png",
+			paramtype = "light",
+			paramtype2 = "facedir",
+			sunlight_propagates = true,
+			selection_box = selectionbox,
+			node_box = nodebox,
+			walkable = false,
+			drop = "mesecons:wire_00000000_off",
+			mesecon_wire = true
+		}, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off},
+		{tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})
+
+		if (nid_inc(nid) == false) then return end
+	end
+end
+register_wires()
+
+-- ##############
+-- ## Crafting ##
+-- ##############
+minetest.register_craft({
+	type = "cooking",
+	output = "mesecons:wire_00000000_off 2",
+	recipe = "default:mese_crystal_fragment",
+	cooktime = 3,
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "mesecons:wire_00000000_off 18",
+	recipe = "default:mese_crystal",
+	cooktime = 15,
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "mesecons:wire_00000000_off 162",
+	recipe = "default:mese",
+	cooktime = 30,
+})
diff --git a/mesecons/mesecons_alias/depends.txt b/mesecons/mesecons_alias/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_alias/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_alias/init.lua b/mesecons/mesecons_alias/init.lua
new file mode 100644
index 0000000..395c368
--- /dev/null
+++ b/mesecons/mesecons_alias/init.lua
@@ -0,0 +1,38 @@
+-- This file registers aliases for the /give /giveme commands.
+
+minetest.register_alias("mesecons:removestone", "mesecons_random:removestone")
+minetest.register_alias("mesecons:power_plant", "mesecons_powerplant:power_plant")
+minetest.register_alias("mesecons:powerplant", "mesecons_powerplant:power_plant")
+minetest.register_alias("mesecons:meselamp", "mesecons_lamp:lamp_off")
+minetest.register_alias("mesecons:mesecon", "mesecons:wire_00000000_off")
+minetest.register_alias("mesecons:object_detector", "mesecons_detector:object_detector_off")
+minetest.register_alias("mesecons:wireless_inverter", "mesecons_wireless:wireless_inverter_on")
+minetest.register_alias("mesecons:wireless_receiver", "mesecons_wireless:wireless_receiver_off")
+minetest.register_alias("mesecons:wireless_transmitter", "mesecons_wireless:wireless_transmitter_off")
+minetest.register_alias("mesecons:switch", "mesecons_switch:mesecon_switch_off")
+minetest.register_alias("mesecons:button", "mesecons_button:button_off")
+minetest.register_alias("mesecons:piston", "mesecons_pistons:piston_normal_off")
+minetest.register_alias("mesecons:blinky_plant", "mesecons_blinkyplant:blinky_plant_off")
+minetest.register_alias("mesecons:mesecon_torch", "mesecons_torch:mesecon_torch_on")
+minetest.register_alias("mesecons:torch", "mesecons_torch:mesecon_torch_on")
+minetest.register_alias("mesecons:hydro_turbine", "mesecons_hydroturbine:hydro_turbine_off")
+minetest.register_alias("mesecons:pressure_plate_stone", "mesecons_pressureplates:pressure_plate_stone_off")
+minetest.register_alias("mesecons:pressure_plate_wood", "mesecons_pressureplates:pressure_plate_wood_off")
+minetest.register_alias("mesecons:mesecon_socket", "mesecons_temperest:mesecon_socket_off")
+minetest.register_alias("mesecons:mesecon_inverter", "mesecons_temperest:mesecon_inverter_on")
+minetest.register_alias("mesecons:movestone", "mesecons_movestones:movestone")
+minetest.register_alias("mesecons:sticky_movestone", "mesecons_movestones:sticky_movestone")
+minetest.register_alias("mesecons:noteblock", "mesecons_noteblock:noteblock")
+minetest.register_alias("mesecons:microcontroller", "mesecons_microcontroller:microcontroller0000")
+minetest.register_alias("mesecons:delayer", "mesecons_delayer:delayer_off_1")
+minetest.register_alias("mesecons:solarpanel", "mesecons_solarpanel:solar_panel_off")
+
+
+--Backwards compatibility
+minetest.register_alias("mesecons:mesecon_off", "mesecons:wire_00000000_off")
+minetest.register_alias("mesecons_pistons:piston_sticky", "mesecons_pistons:piston_sticky_on")
+minetest.register_alias("mesecons_pistons:piston_normal", "mesecons_pistons:piston_normal_on")
+minetest.register_alias("mesecons_pistons:piston_up_normal", "mesecons_pistons:piston_up_normal_on")
+minetest.register_alias("mesecons_pistons:piston_down_normal", "mesecons_pistons:piston_down_normal_on")
+minetest.register_alias("mesecons_pistons:piston_up_sticky", "mesecons_pistons:piston_up_sticky_on")
+minetest.register_alias("mesecons_pistons:piston_down_sticky", "mesecons_pistons:piston_down_sticky_on")
diff --git a/mesecons/mesecons_blinkyplant/depends.txt b/mesecons/mesecons_blinkyplant/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_blinkyplant/doc/blinkyplant/description.html b/mesecons/mesecons_blinkyplant/doc/blinkyplant/description.html
new file mode 100644
index 0000000..2a7db48
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/doc/blinkyplant/description.html
@@ -0,0 +1 @@
+The blinky plants toggles between on and off state every three seconds. Can be used to make clocks. Also works after having restarted the game.
diff --git a/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png b/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png
new file mode 100755
index 0000000..40ce5b5
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/doc/blinkyplant/preview.png
diff --git a/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png b/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png
new file mode 100644
index 0000000..6f1e148
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/doc/blinkyplant/recipe.png
diff --git a/mesecons/mesecons_blinkyplant/init.lua b/mesecons/mesecons_blinkyplant/init.lua
new file mode 100644
index 0000000..8d2aa6e
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/init.lua
@@ -0,0 +1,51 @@
+-- The BLINKY_PLANT
+
+local toggle_timer = function (pos)
+	local timer = minetest.get_node_timer(pos)
+	if timer:is_started() then
+		timer:stop()
+	else
+		timer:start(mesecon.setting("blinky_plant_interval", 3))
+	end
+end
+
+local on_timer = function (pos)
+	local node = minetest.get_node(pos)
+	if(mesecon.flipstate(pos, node) == "on") then
+		mesecon.receptor_on(pos)
+	else
+		mesecon.receptor_off(pos)
+	end
+	toggle_timer(pos)
+end
+
+mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
+	description="Blinky Plant",
+	drawtype = "plantlike",
+	inventory_image = "jeija_blinky_plant_off.png",
+	paramtype = "light",
+	walkable = false,
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},
+	},
+	on_timer = on_timer,
+	on_rightclick = toggle_timer,
+	on_construct = toggle_timer
+},{
+	tiles = {"jeija_blinky_plant_off.png"},
+	groups = {dig_immediate=3},
+	mesecons = {receptor = { state = mesecon.state.off }}
+},{
+	tiles = {"jeija_blinky_plant_on.png"},
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	mesecons = {receptor = { state = mesecon.state.on }}
+})
+
+minetest.register_craft({
+	output = "mesecons_blinkyplant:blinky_plant_off 1",
+	recipe = {	{"","group:mesecon_conductor_craftable",""},
+			{"","group:mesecon_conductor_craftable",""},
+			{"group:sapling","group:sapling","group:sapling"}}
+})
diff --git a/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png b/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png
new file mode 100644
index 0000000..4f507da
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png
diff --git a/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png b/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png
new file mode 100644
index 0000000..f77a134
--- /dev/null
+++ b/mesecons/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png
diff --git a/mesecons/mesecons_button/depends.txt b/mesecons/mesecons_button/depends.txt
new file mode 100644
index 0000000..19c798c
--- /dev/null
+++ b/mesecons/mesecons_button/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_receiver
diff --git a/mesecons/mesecons_button/doc/button/description.html b/mesecons/mesecons_button/doc/button/description.html
new file mode 100644
index 0000000..ae6bf07
--- /dev/null
+++ b/mesecons/mesecons_button/doc/button/description.html
@@ -0,0 +1 @@
+This receptor can be attached to walls. It turns on for 1 second if it's punched.
diff --git a/mesecons/mesecons_button/doc/button/preview.png b/mesecons/mesecons_button/doc/button/preview.png
new file mode 100644
index 0000000..b69f8f4
--- /dev/null
+++ b/mesecons/mesecons_button/doc/button/preview.png
diff --git a/mesecons/mesecons_button/doc/button/recipe.png b/mesecons/mesecons_button/doc/button/recipe.png
new file mode 100644
index 0000000..c6232b4
--- /dev/null
+++ b/mesecons/mesecons_button/doc/button/recipe.png
diff --git a/mesecons/mesecons_button/init.lua b/mesecons/mesecons_button/init.lua
new file mode 100644
index 0000000..f287d52
--- /dev/null
+++ b/mesecons/mesecons_button/init.lua
@@ -0,0 +1,98 @@
+-- WALL BUTTON
+-- A button that when pressed emits power for 1 second
+-- and then turns off again
+
+mesecon.button_turnoff = function (pos)
+	local node = minetest.get_node(pos)
+	if node.name=="mesecons_button:button_on" then --has not been dug
+		minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
+		minetest.sound_play("mesecons_button_pop", {pos=pos})
+		local rules = mesecon.rules.buttonlike_get(node)
+		mesecon.receptor_off(pos, rules)
+	end
+end
+
+minetest.register_node("mesecons_button:button_off", {
+	drawtype = "nodebox",
+	tiles = {
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_off.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	legacy_wallmounted = true,
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+	type = "fixed",
+		fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+		{ -6/16, -6/16, 6/16, 6/16, 6/16, 8/16 },	-- the thin plate behind the button
+		{ -4/16, -2/16, 4/16, 4/16, 2/16, 6/16 }	-- the button itself
+	}
+	},
+	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
+	description = "Button",
+	on_rightclick = function (pos, node)
+		minetest.swap_node(pos, {name = "mesecons_button:button_on", param2=node.param2})
+		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
+		minetest.sound_play("mesecons_button_push", {pos=pos})
+		minetest.after(1, mesecon.button_turnoff, pos)
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.off,
+		rules = mesecon.rules.buttonlike_get
+	}}
+})
+
+minetest.register_node("mesecons_button:button_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_on.png"
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	legacy_wallmounted = true,
+	walkable = false,
+	light_source = default.LIGHT_MAX-7,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
+	},
+	node_box = {
+	type = "fixed",
+	fixed = {
+		{ -6/16, -6/16,  6/16, 6/16, 6/16, 8/16 },
+		{ -4/16, -2/16, 11/32, 4/16, 2/16, 6/16 }
+	}
+    },
+	groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
+	drop = 'mesecons_button:button_off',
+	description = "Button",
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.on,
+		rules = mesecon.rules.buttonlike_get
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_button:button_off 2",
+	recipe = {
+		{"group:mesecon_conductor_craftable","default:stone"},
+	}
+})
diff --git a/mesecons/mesecons_button/sounds/mesecons_button_pop.ogg b/mesecons/mesecons_button/sounds/mesecons_button_pop.ogg
new file mode 100644
index 0000000..9d56bb8
--- /dev/null
+++ b/mesecons/mesecons_button/sounds/mesecons_button_pop.ogg
diff --git a/mesecons/mesecons_button/sounds/mesecons_button_push.ogg b/mesecons/mesecons_button/sounds/mesecons_button_push.ogg
new file mode 100644
index 0000000..53d45c1
--- /dev/null
+++ b/mesecons/mesecons_button/sounds/mesecons_button_push.ogg
diff --git a/mesecons/mesecons_button/textures/jeija_wall_button_off.png b/mesecons/mesecons_button/textures/jeija_wall_button_off.png
new file mode 100644
index 0000000..0e3ff25
--- /dev/null
+++ b/mesecons/mesecons_button/textures/jeija_wall_button_off.png
diff --git a/mesecons/mesecons_button/textures/jeija_wall_button_on.png b/mesecons/mesecons_button/textures/jeija_wall_button_on.png
new file mode 100644
index 0000000..1d97464
--- /dev/null
+++ b/mesecons/mesecons_button/textures/jeija_wall_button_on.png
diff --git a/mesecons/mesecons_button/textures/jeija_wall_button_sides.png b/mesecons/mesecons_button/textures/jeija_wall_button_sides.png
new file mode 100644
index 0000000..9b79b57
--- /dev/null
+++ b/mesecons/mesecons_button/textures/jeija_wall_button_sides.png
diff --git a/mesecons/mesecons_commandblock/depends.txt b/mesecons/mesecons_commandblock/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_commandblock/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_commandblock/doc/commandblock/description.html b/mesecons/mesecons_commandblock/doc/commandblock/description.html
new file mode 100644
index 0000000..405b7e55
--- /dev/null
+++ b/mesecons/mesecons_commandblock/doc/commandblock/description.html
@@ -0,0 +1 @@
+There is no crafting recipe as this should only be available for server admins. Quite similar to the Minecraft counterpart. Executes server commands.
diff --git a/mesecons/mesecons_commandblock/doc/commandblock/preview.png b/mesecons/mesecons_commandblock/doc/commandblock/preview.png
new file mode 100644
index 0000000..d89cc7b
--- /dev/null
+++ b/mesecons/mesecons_commandblock/doc/commandblock/preview.png
diff --git a/mesecons/mesecons_commandblock/init.lua b/mesecons/mesecons_commandblock/init.lua
new file mode 100644
index 0000000..8fd23f6
--- /dev/null
+++ b/mesecons/mesecons_commandblock/init.lua
@@ -0,0 +1,195 @@
+minetest.register_chatcommand("say", {

+	params = "<text>",

+	description = "Say <text> as the server",

+	privs = {server=true},

+	func = function(name, param)

+		minetest.chat_send_all(name .. ": " .. param)

+	end

+})

+

+minetest.register_chatcommand("tell", {

+	params = "<name> <text>",

+	description = "Say <text> to <name> privately",

+	func = function(name, param)

+		local found, _, target, message = param:find("^([^%s]+)%s+(.*)$")

+		if found == nil then

+			minetest.chat_send_player(name, "Invalid usage: " .. param)

+			return

+		end

+		if not minetest.get_player_by_name(target) then

+			minetest.chat_send_player(name, "Invalid target: " .. target)

+		end

+		minetest.chat_send_player(target, name .. " whispers: " .. message, false)

+	end

+})

+

+minetest.register_chatcommand("hp", {

+	params = "<name> <value>",

+	description = "Set health of <name> to <value> hitpoints",

+	privs = {ban=true},

+	func = function(name, param)

+		local found, _, target, value = param:find("^([^%s]+)%s+(%d+)$")

+		if found == nil then

+			minetest.chat_send_player(name, "Invalid usage: " .. param)

+			return

+		end

+		local player = minetest.get_player_by_name(target)

+		if player then

+			player:set_hp(value)

+		else

+			minetest.chat_send_player(name, "Invalid target: " .. target)

+		end

+	end

+})

+

+local function initialize_data(meta)

+	local commands = meta:get_string("commands")

+	meta:set_string("formspec",

+		"invsize[9,5;]" ..

+		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..

+		"label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..

+		"button_exit[3.3,4.5;2,1;submit;Submit]")

+	local owner = meta:get_string("owner")

+	if owner == "" then

+		owner = "not owned"

+	else

+		owner = "owned by " .. owner

+	end

+	meta:set_string("infotext", "Command Block\n" ..

+		"(" .. owner .. ")\n" ..

+		"Commands: "..commands)

+end

+

+local function construct(pos)

+	local meta = minetest.get_meta(pos)

+

+	meta:set_string("commands", "tell @nearest Commandblock unconfigured")

+

+	meta:set_string("owner", "")

+

+	initialize_data(meta)

+end

+

+local function after_place(pos, placer)

+	if placer then

+		local meta = minetest.get_meta(pos)

+		meta:set_string("owner", placer:get_player_name())

+		initialize_data(meta)

+	end

+end

+

+local function receive_fields(pos, formname, fields, sender)

+	if not fields.submit then

+		return

+	end

+	local meta = minetest.get_meta(pos)

+	local owner = meta:get_string("owner")

+	if owner ~= "" and sender:get_player_name() ~= owner then

+		return

+	end

+	meta:set_string("commands", fields.commands)

+

+	initialize_data(meta)

+end

+

+local function resolve_commands(commands, pos)

+	local nearest, farthest = nil, nil

+	local min_distance, max_distance = math.huge, -1

+	local players = minetest.get_connected_players()

+	for index, player in pairs(players) do

+		local distance = vector.distance(pos, player:getpos())

+		if distance < min_distance then

+			min_distance = distance

+			nearest = player:get_player_name()

+		end

+		if distance > max_distance then

+			max_distance = distance

+			farthest = player:get_player_name()

+		end

+	end

+	local random = players[math.random(#players)]:get_player_name()

+	commands = commands:gsub("@nearest", nearest)

+	commands = commands:gsub("@farthest", farthest)

+	commands = commands:gsub("@random", random)

+	return commands

+end

+

+local function commandblock_action_on(pos, node)

+	if node.name ~= "mesecons_commandblock:commandblock_off" then

+		return

+	end

+

+	minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})

+

+	local meta = minetest.get_meta(pos)

+	local owner = meta:get_string("owner")

+	if owner == "" then

+		return

+	end

+

+	local commands = resolve_commands(meta:get_string("commands"), pos)

+	for _, command in pairs(commands:split("\n")) do

+		local pos = command:find(" ")

+		local cmd, param = command, ""

+		if pos then

+			cmd = command:sub(1, pos - 1)

+			param = command:sub(pos + 1)

+		end

+		local cmddef = minetest.chatcommands[cmd]

+		if not cmddef then

+			minetest.chat_send_player(owner, "The command "..cmd.." does not exist")

+			return

+		end

+		local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs)

+		if not has_privs then

+			minetest.chat_send_player(owner, "You don't have permission "

+					.."to run "..cmd

+					.." (missing privileges: "

+					..table.concat(missing_privs, ", ")..")")

+			return

+		end

+		cmddef.func(owner, param)

+	end

+end

+

+local function commandblock_action_off(pos, node)

+	if node.name == "mesecons_commandblock:commandblock_on" then

+		minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})

+	end

+end

+

+local function can_dig(pos, player)

+	local meta = minetest.get_meta(pos)

+	local owner = meta:get_string("owner")

+	return owner == "" or owner == player:get_player_name()

+end

+

+minetest.register_node("mesecons_commandblock:commandblock_off", {

+	description = "Command Block",

+	tiles = {"jeija_commandblock_off.png"},

+	inventory_image = minetest.inventorycube("jeija_commandblock_off.png"),

+	groups = {cracky=2, mesecon_effector_off=1},

+	on_construct = construct,

+	after_place_node = after_place,

+	on_receive_fields = receive_fields,

+	can_dig = can_dig,

+	sounds = default.node_sound_stone_defaults(),

+	mesecons = {effector = {

+		action_on = commandblock_action_on

+	}}

+})

+

+minetest.register_node("mesecons_commandblock:commandblock_on", {

+	tiles = {"jeija_commandblock_on.png"},

+	groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1},

+	light_source = 10,

+	drop = "mesecons_commandblock:commandblock_off",

+	on_construct = construct,

+	after_place_node = after_place,

+	on_receive_fields = receive_fields,

+	can_dig = can_dig,

+	sounds = default.node_sound_stone_defaults(),

+	mesecons = {effector = {

+		action_off = commandblock_action_off

+	}}

+})

diff --git a/mesecons/mesecons_commandblock/textures/jeija_close_window.png b/mesecons/mesecons_commandblock/textures/jeija_close_window.png
new file mode 100644
index 0000000..5c27c6c
--- /dev/null
+++ b/mesecons/mesecons_commandblock/textures/jeija_close_window.png
diff --git a/mesecons/mesecons_commandblock/textures/jeija_commandblock_off.png b/mesecons/mesecons_commandblock/textures/jeija_commandblock_off.png
new file mode 100644
index 0000000..c05b616
--- /dev/null
+++ b/mesecons/mesecons_commandblock/textures/jeija_commandblock_off.png
diff --git a/mesecons/mesecons_commandblock/textures/jeija_commandblock_on.png b/mesecons/mesecons_commandblock/textures/jeija_commandblock_on.png
new file mode 100644
index 0000000..7fc35b6
--- /dev/null
+++ b/mesecons/mesecons_commandblock/textures/jeija_commandblock_on.png
diff --git a/mesecons/mesecons_delayer/depends.txt b/mesecons/mesecons_delayer/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_delayer/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_delayer/doc/delayer/description.html b/mesecons/mesecons_delayer/doc/delayer/description.html
new file mode 100644
index 0000000..f3a5280
--- /dev/null
+++ b/mesecons/mesecons_delayer/doc/delayer/description.html
@@ -0,0 +1 @@
+The delayer delays the signal from the input for a determined time. The time can be set by punching the delayer. Possible delays are: 0.1 seconds, 0.3 seconds, 0.5 seconds and 1 second. You may try to use it for creating songs with the noteblock.
diff --git a/mesecons/mesecons_delayer/doc/delayer/preview.png b/mesecons/mesecons_delayer/doc/delayer/preview.png
new file mode 100644
index 0000000..c57c728
--- /dev/null
+++ b/mesecons/mesecons_delayer/doc/delayer/preview.png
diff --git a/mesecons/mesecons_delayer/doc/delayer/recipe.png b/mesecons/mesecons_delayer/doc/delayer/recipe.png
new file mode 100644
index 0000000..ea394aa
--- /dev/null
+++ b/mesecons/mesecons_delayer/doc/delayer/recipe.png
diff --git a/mesecons/mesecons_delayer/init.lua b/mesecons/mesecons_delayer/init.lua
new file mode 100644
index 0000000..da576ad
--- /dev/null
+++ b/mesecons/mesecons_delayer/init.lua
@@ -0,0 +1,179 @@
+-- Function that get the input/output rules of the delayer
+local delayer_get_output_rules = function(node)
+	local rules = {{x = 0, y = 0, z = 1}}
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
+
+local delayer_get_input_rules = function(node)
+	local rules = {{x = 0, y = 0, z = -1}}
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
+
+-- Functions that are called after the delay time
+
+local delayer_activate = function(pos, node)
+	local def = minetest.registered_nodes[node.name]
+	local time = def.delayer_time
+	minetest.swap_node(pos, {name = def.delayer_onstate, param2=node.param2})
+	mesecon.queue:add_action(pos, "receptor_on", {delayer_get_output_rules(node)}, time, nil)
+end
+
+local delayer_deactivate = function(pos, node)
+	local def = minetest.registered_nodes[node.name]
+	local time = def.delayer_time
+	minetest.swap_node(pos, {name = def.delayer_offstate, param2=node.param2})
+	mesecon.queue:add_action(pos, "receptor_off", {delayer_get_output_rules(node)}, time, nil)
+end
+
+-- Register the 2 (states) x 4 (delay times) delayers
+
+for i = 1, 4 do
+local groups = {}
+if i == 1 then
+	groups = {bendy=2,snappy=1,dig_immediate=2}
+else
+	groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1}
+end
+
+local delaytime
+if 		i == 1 then delaytime = 0.1
+elseif	i == 2 then delaytime = 0.3
+elseif	i == 3 then delaytime = 0.5
+elseif	i == 4 then delaytime = 1.0 end
+
+boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab
+
+	 { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 },		-- the jeweled "on" indicator
+	 { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 },
+	 { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 },
+	 { -3/16, -7/16,  2/16, 3/16, -26/64, 3/16 },
+	 { -2/16, -7/16,  3/16, 2/16, -26/64, 4/16 },
+
+	 { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 },		-- the timer indicator
+	 { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 },		-- the two wire stubs
+	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }}
+
+minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
+	description = "Delayer",
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_delayer_off_"..tostring(i)..".png",
+		"mesecons_delayer_bottom.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_ends_off.png",
+		"mesecons_delayer_sides_off.png",
+		"mesecons_delayer_sides_off.png"
+		},
+	inventory_image = "mesecons_delayer_off_1.png",
+	wield_image = "mesecons_delayer_off_1.png",
+	walkable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = boxes
+	},
+	groups = groups,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	drop = 'mesecons_delayer:delayer_off_1',
+	on_punch = function (pos, node)
+		if node.name=="mesecons_delayer:delayer_off_1" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_2", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_2" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_3", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_3" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_4", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_off_4" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_1", param2=node.param2})
+		end
+	end,
+	delayer_time = delaytime,
+	delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {
+		receptor =
+		{
+			state = mesecon.state.off,
+			rules = delayer_get_output_rules
+		},
+		effector =
+		{
+			rules = delayer_get_input_rules,
+			action_on = delayer_activate
+		}
+	}
+})
+
+
+minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
+	description = "You hacker you",
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_delayer_on_"..tostring(i)..".png",
+		"mesecons_delayer_bottom.png",
+		"mesecons_delayer_ends_on.png",
+		"mesecons_delayer_ends_on.png",
+		"mesecons_delayer_sides_on.png",
+		"mesecons_delayer_sides_on.png"
+		},
+	walkable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = boxes
+	},
+	groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	drop = 'mesecons_delayer:delayer_off_1',
+	on_punch = function (pos, node)
+		if node.name=="mesecons_delayer:delayer_on_1" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_2", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_2" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_3", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_3" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_4", param2=node.param2})
+		elseif node.name=="mesecons_delayer:delayer_on_4" then
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_1", param2=node.param2})
+		end
+	end,
+	delayer_time = delaytime,
+	delayer_offstate = "mesecons_delayer:delayer_off_"..tostring(i),
+	mesecons = {
+		receptor =
+		{
+			state = mesecon.state.on,
+			rules = delayer_get_output_rules
+		},
+		effector =
+		{
+			rules = delayer_get_input_rules,
+			action_off = delayer_deactivate
+		}
+	}
+})
+end
+
+minetest.register_craft({
+	output = "mesecons_delayer:delayer_off_1",
+	recipe = {
+		{"mesecons_torch:mesecon_torch_on", "group:mesecon_conductor_craftable", "mesecons_torch:mesecon_torch_on"},
+		{"default:cobble","default:cobble", "default:cobble"},
+	}
+})
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png
new file mode 100644
index 0000000..2e49d31
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_bottom.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png
new file mode 100644
index 0000000..0242deb
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_off.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png
new file mode 100644
index 0000000..19ae0cb
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_ends_on.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png
new file mode 100644
index 0000000..7372b37
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_1.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png
new file mode 100644
index 0000000..e34f0ac
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_2.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png
new file mode 100644
index 0000000..091adbc
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_3.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png
new file mode 100644
index 0000000..7ecc9b6
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_off_4.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png
new file mode 100644
index 0000000..61f52f2
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_1.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png
new file mode 100644
index 0000000..7bd363f
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_2.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png
new file mode 100644
index 0000000..b93f725
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_3.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png
new file mode 100644
index 0000000..ca90a1e
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_on_4.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png
new file mode 100644
index 0000000..79f3d59
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_off.png
diff --git a/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png
new file mode 100644
index 0000000..1c8edaa
--- /dev/null
+++ b/mesecons/mesecons_delayer/textures/mesecons_delayer_sides_on.png
diff --git a/mesecons/mesecons_detector/depends.txt b/mesecons/mesecons_detector/depends.txt
new file mode 100644
index 0000000..bc7b062
--- /dev/null
+++ b/mesecons/mesecons_detector/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_materials
diff --git a/mesecons/mesecons_detector/doc/nodedetector/description.html b/mesecons/mesecons_detector/doc/nodedetector/description.html
new file mode 100644
index 0000000..be34fde
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/nodedetector/description.html
@@ -0,0 +1,6 @@
+The node detector is a receptor. It changes its state when either any node
+or a specific node is detected. Right-click it to set a nodename to scan for.
+It can also receive digiline signals. You can either send "GET" and it will
+respond with the detected nodename or you can send any other string and it will
+set this string as the node to scan for.
+Nodenames must include the mod they reside in, so for instance default:dirt, not just dirt.
diff --git a/mesecons/mesecons_detector/doc/nodedetector/preview.png b/mesecons/mesecons_detector/doc/nodedetector/preview.png
new file mode 100644
index 0000000..1f78161
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/nodedetector/preview.png
diff --git a/mesecons/mesecons_detector/doc/nodedetector/recipe.png b/mesecons/mesecons_detector/doc/nodedetector/recipe.png
new file mode 100644
index 0000000..958c7e6
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/nodedetector/recipe.png
diff --git a/mesecons/mesecons_detector/doc/objectdetector/description.html b/mesecons/mesecons_detector/doc/objectdetector/description.html
new file mode 100644
index 0000000..c8315e8
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/objectdetector/description.html
@@ -0,0 +1,3 @@
+The object detector is a receptor. It changes its state when a player approaches.
+Right-click it to set a name to scan for.
+It can also receive digiline signals which are the name to scan for on the specified channel in the right-click menu.
diff --git a/mesecons/mesecons_detector/doc/objectdetector/preview.png b/mesecons/mesecons_detector/doc/objectdetector/preview.png
new file mode 100644
index 0000000..85c4dea
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/objectdetector/preview.png
diff --git a/mesecons/mesecons_detector/doc/objectdetector/recipe.png b/mesecons/mesecons_detector/doc/objectdetector/recipe.png
new file mode 100644
index 0000000..a1cee00
--- /dev/null
+++ b/mesecons/mesecons_detector/doc/objectdetector/recipe.png
diff --git a/mesecons/mesecons_detector/init.lua b/mesecons/mesecons_detector/init.lua
new file mode 100644
index 0000000..084535b
--- /dev/null
+++ b/mesecons/mesecons_detector/init.lua
@@ -0,0 +1,272 @@
+local GET_COMMAND = "GET"
+
+-- Object detector
+-- Detects players in a certain radius
+-- The radius can be specified in mesecons/settings.lua
+
+local object_detector_make_formspec = function (pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec", "size[9,2.5]" ..
+		"field[0.3,  0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
+		"button_exit[7,0.75;2,3;;Save]")
+end
+
+local object_detector_on_receive_fields = function(pos, formname, fields)
+	if not fields.scanname or not fields.digiline_channel then return end;
+
+	local meta = minetest.get_meta(pos)
+	meta:set_string("scanname", fields.scanname)
+	meta:set_string("digiline_channel", fields.digiline_channel)
+	object_detector_make_formspec(pos)
+end
+
+-- returns true if player was found, false if not
+local object_detector_scan = function (pos)
+	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
+	for k, obj in pairs(objs) do
+		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
+		local scanname = minetest.get_meta(pos):get_string("scanname")
+		if (isname == scanname and isname ~= "") or (isname  ~= "" and scanname == "") then -- player with scanname found or not scanname specified
+			return true
+		end
+	end
+	return false
+end
+
+-- set player name when receiving a digiline signal on a specific channel
+local object_detector_digiline = {
+	effector = {
+		action = function (pos, node, channel, msg)
+			local meta = minetest.get_meta(pos)
+			local active_channel = meta:get_string("digiline_channel")
+			if channel == active_channel then
+				meta:set_string("scanname", msg)
+				object_detector_make_formspec(pos)
+			end
+		end,
+	}
+}
+
+minetest.register_node("mesecons_detector:object_detector_off", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png"},
+	paramtype = "light",
+	walkable = true,
+	groups = {cracky=3},
+	description="Player Detector",
+	mesecons = {receptor = {
+		state = mesecon.state.off,
+		rules = mesecon.rules.pplate
+	}},
+	on_construct = object_detector_make_formspec,
+	on_receive_fields = object_detector_on_receive_fields,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = object_detector_digiline
+})
+
+minetest.register_node("mesecons_detector:object_detector_on", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"},
+	paramtype = "light",
+	walkable = true,
+	groups = {cracky=3,not_in_creative_inventory=1},
+	drop = 'mesecons_detector:object_detector_off',
+	mesecons = {receptor = {
+		state = mesecon.state.on,
+		rules = mesecon.rules.pplate
+	}},
+	on_construct = object_detector_make_formspec,
+	on_receive_fields = object_detector_on_receive_fields,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = object_detector_digiline
+})
+
+minetest.register_craft({
+	output = 'mesecons_detector:object_detector_off',
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
+		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
+	}
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:object_detector_off"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos)
+		if object_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_on"})
+			mesecon.receptor_on(pos, mesecon.rules.pplate)
+		end
+	end,
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:object_detector_on"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos)
+		if not object_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_off"})
+			mesecon.receptor_off(pos, mesecon.rules.pplate)
+		end
+	end,
+})
+
+-- Node detector
+-- Detects the node in front of it
+
+local node_detector_make_formspec = function (pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec", "size[9,2.5]" ..
+		"field[0.3,  0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
+		"button_exit[7,0.75;2,3;;Save]")
+end
+
+local node_detector_on_receive_fields = function(pos, formname, fields)
+	if not fields.scanname or not fields.digiline_channel then return end;
+
+	local meta = minetest.get_meta(pos)
+	meta:set_string("scanname", fields.scanname)
+	meta:set_string("digiline_channel", fields.digiline_channel)
+	node_detector_make_formspec(pos)
+end
+
+-- returns true if player was found, false if not
+local node_detector_scan = function (pos)
+	if not pos then return end
+	local node = minetest.get_node_or_nil(pos)
+	if not node then return end
+	local scandir = minetest.facedir_to_dir(node.param2)
+	if not scandir then return end
+	local frontpos = vector.subtract(pos, scandir)
+	local frontnode = minetest.get_node(frontpos)
+	local meta = minetest.get_meta(pos)
+	return (frontnode.name == meta:get_string("scanname")) or
+		(frontnode.name ~= "air" and frontnode.name ~= "ignore" and meta:get_string("scanname") == "")
+end
+
+-- set player name when receiving a digiline signal on a specific channel
+local node_detector_digiline = {
+	effector = {
+		action = function (pos, node, channel, msg)
+			local meta = minetest.get_meta(pos)
+			local active_channel = meta:get_string("digiline_channel")
+			if channel == active_channel then
+				if msg == GET_COMMAND then
+					local frontpos = vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+					local name = minetest.get_node(frontpos).name
+					digiline:receptor_send(pos, digiline.rules.default, channel, name)
+				else
+					meta:set_string("scanname", msg)
+					node_detector_make_formspec(pos)
+				end
+			end
+		end,
+	},
+	receptor = {}
+}
+
+minetest.register_node("mesecons_detector:node_detector_off", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = {cracky=3},
+	description="Node Detector",
+	mesecons = {receptor = {
+		state = mesecon.state.off
+	}},
+	on_construct = node_detector_make_formspec,
+	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = function (pos, placer)
+		local placer_pos = placer:getpos()
+
+		--correct for the player's height
+		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
+
+		--correct for 6d facedir
+		if placer_pos then
+			local dir = {
+				x = pos.x - placer_pos.x,
+				y = pos.y - placer_pos.y,
+				z = pos.z - placer_pos.z
+			}
+			local node = minetest.get_node(pos)
+			node.param2 = minetest.dir_to_facedir(dir, true)
+			minetest.set_node(pos, node)
+			minetest.log("action", "real (6d) facedir: " .. node.param2)
+		end
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = node_detector_digiline
+})
+
+minetest.register_node("mesecons_detector:node_detector_on", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_on.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = {cracky=3,not_in_creative_inventory=1},
+	drop = 'mesecons_detector:node_detector_off',
+	mesecons = {receptor = {
+		state = mesecon.state.on
+	}},
+	on_construct = node_detector_make_formspec,
+	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = function (pos, placer)
+		local placer_pos = placer:getpos()
+
+		--correct for the player's height
+		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
+
+		--correct for 6d facedir
+		if placer_pos then
+			local dir = {
+				x = pos.x - placer_pos.x,
+				y = pos.y - placer_pos.y,
+				z = pos.z - placer_pos.z
+			}
+			local node = minetest.get_node(pos)
+			node.param2 = minetest.dir_to_facedir(dir, true)
+			minetest.set_node(pos, node)
+			minetest.log("action", "real (6d) facedir: " .. node.param2)
+		end
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = node_detector_digiline
+})
+
+minetest.register_craft({
+	output = 'mesecons_detector:node_detector_off',
+	recipe = {
+		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
+		{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+	}
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:node_detector_off"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node)
+		if node_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_on", param2 = node.param2})
+			mesecon.receptor_on(pos)
+		end
+	end,
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:node_detector_on"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node)
+		if not node_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_off", param2 = node.param2})
+			mesecon.receptor_off(pos)
+		end
+	end,
+})
diff --git a/mesecons/mesecons_detector/textures/jeija_node_detector_off.png b/mesecons/mesecons_detector/textures/jeija_node_detector_off.png
new file mode 100644
index 0000000..6d130ad
--- /dev/null
+++ b/mesecons/mesecons_detector/textures/jeija_node_detector_off.png
diff --git a/mesecons/mesecons_detector/textures/jeija_node_detector_on.png b/mesecons/mesecons_detector/textures/jeija_node_detector_on.png
new file mode 100644
index 0000000..926a9d1
--- /dev/null
+++ b/mesecons/mesecons_detector/textures/jeija_node_detector_on.png
diff --git a/mesecons/mesecons_detector/textures/jeija_object_detector_off.png b/mesecons/mesecons_detector/textures/jeija_object_detector_off.png
new file mode 100644
index 0000000..825d78f
--- /dev/null
+++ b/mesecons/mesecons_detector/textures/jeija_object_detector_off.png
diff --git a/mesecons/mesecons_detector/textures/jeija_object_detector_on.png b/mesecons/mesecons_detector/textures/jeija_object_detector_on.png
new file mode 100644
index 0000000..96f8ba3
--- /dev/null
+++ b/mesecons/mesecons_detector/textures/jeija_object_detector_on.png
diff --git a/mesecons/mesecons_doors/depends.txt b/mesecons/mesecons_doors/depends.txt
new file mode 100644
index 0000000..ed2fcd8
--- /dev/null
+++ b/mesecons/mesecons_doors/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+doors
diff --git a/mesecons/mesecons_doors/init.lua b/mesecons/mesecons_doors/init.lua
new file mode 100644
index 0000000..7346128
--- /dev/null
+++ b/mesecons/mesecons_doors/init.lua
@@ -0,0 +1,84 @@
+-- Modified, from minetest_game/mods/doors/init.lua
+local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+	pos.y = pos.y + dir
+	if not minetest.get_node(pos).name == check_name then
+		return
+	end
+	local p2 = minetest.get_node(pos).param2
+	p2 = params[p2 + 1]
+
+	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
+
+	pos.y = pos.y - dir
+	minetest.swap_node(pos, {name = replace, param2 = p2})
+
+	if (minetest.get_meta(pos):get_int("right") ~= 0) == (params[1] ~= 3) then
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+	else
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+	end
+end
+
+local function meseconify_door(name)
+	if not minetest.registered_items[name] then return end
+
+	local function toggle_state1 (pos, node)
+		on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+	end
+
+	local function toggle_state2 (pos, node)
+		on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+	end
+
+	minetest.override_item(name.."_b_1", {
+		mesecons = {effector = {
+			action_on = toggle_state1,
+			action_off = toggle_state1,
+			rules = mesecon.rules.pplate
+		}},
+	})
+
+	minetest.override_item(name.."_b_2", {
+		mesecons = {effector = {
+			action_on = toggle_state2,
+			action_off = toggle_state2,
+			rules = mesecon.rules.pplate
+		}},
+	})
+end
+
+meseconify_door("doors:door_wood")
+meseconify_door("doors:door_steel")
+meseconify_door("doors:door_glass")
+meseconify_door("doors:door_obsidian_glass")
+
+-- Trapdoor
+local function trapdoor_switch(pos, node)
+	local state = minetest.get_meta(pos):get_int("state")
+
+	if state == 1 then
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
+	else
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
+	end
+
+	minetest.get_meta(pos):set_int("state", state == 1 and 0 or 1)
+end
+
+if minetest.registered_nodes["doors:trapdoor"] then
+	minetest.override_item("doors:trapdoor", {
+		mesecons = {effector = {
+			action_on = trapdoor_switch,
+			action_off = trapdoor_switch
+		}},
+	})
+
+	minetest.override_item("doors:trapdoor_open", {
+		mesecons = {effector = {
+			action_on = trapdoor_switch,
+			action_off = trapdoor_switch
+		}},
+	})
+end
diff --git a/mesecons/mesecons_extrawires/corner.lua b/mesecons/mesecons_extrawires/corner.lua
new file mode 100644
index 0000000..1e29870
--- /dev/null
+++ b/mesecons/mesecons_extrawires/corner.lua
@@ -0,0 +1,83 @@
+local corner_nodebox = {
+	type = "fixed",
+	fixed = {{ -16/32-0.001, -17/32, -3/32, 0, -13/32, 3/32 },
+		   { -3/32, -17/32, -16/32+0.001, 3/32, -13/32, 3/32}}
+}
+
+local corner_selectionbox = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -18/32, -16/32, 5/32, -12/32, 5/32 },
+}
+
+local corner_get_rules = function (node)
+	local rules =
+	{{x = 1,  y = 0,  z =  0},
+	 {x = 0,  y = 0,  z = -1}}
+
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+
+	return rules
+end
+
+minetest.register_node("mesecons_extrawires:corner_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_curved_tb_on.png",
+		"jeija_insulated_wire_curved_tb_on.png^[transformR270",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = corner_selectionbox,
+	node_box = corner_nodebox,
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons_extrawires:corner_off",
+	mesecons = {conductor =
+	{
+		state = mesecon.state.on,
+		rules = corner_get_rules,
+		offstate = "mesecons_extrawires:corner_off"
+	}}
+})
+
+minetest.register_node("mesecons_extrawires:corner_off", {
+	drawtype = "nodebox",
+	description = "Mesecon Corner",
+	tiles = {
+		"jeija_insulated_wire_curved_tb_off.png",
+		"jeija_insulated_wire_curved_tb_off.png^[transformR270",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = corner_selectionbox,
+	node_box = corner_nodebox,
+	groups = {dig_immediate = 3},
+	mesecons = {conductor =
+	{
+		state = mesecon.state.off,
+		rules = corner_get_rules,
+		onstate = "mesecons_extrawires:corner_on"
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_extrawires:corner_off 3",
+	recipe = {
+		{"", "", ""},
+		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""},
+		{"", "mesecons_insulated:insulated_off", ""},
+	}
+})
diff --git a/mesecons/mesecons_extrawires/crossover.lua b/mesecons/mesecons_extrawires/crossover.lua
new file mode 100644
index 0000000..4ecfc12
--- /dev/null
+++ b/mesecons/mesecons_extrawires/crossover.lua
@@ -0,0 +1,176 @@
+function crossover_get_rules(node)
+	return {
+		{--first wire
+			{x=-1,y=0,z=0},
+			{x=1,y=0,z=0},
+		},
+		{--second wire
+			{x=0,y=0,z=-1},
+			{x=0,y=0,z=1},
+		},
+	}
+end
+
+local crossover_states = {
+	"mesecons_extrawires:crossover_off",
+	"mesecons_extrawires:crossover_01",
+	"mesecons_extrawires:crossover_10",
+	"mesecons_extrawires:crossover_on",
+}
+
+minetest.register_node("mesecons_extrawires:crossover_off", {
+	description = "Insulated Crossover",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
+		"jeija_insulated_wire_ends_off.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_01", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_01.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01z.png",
+		"jeija_insulated_wire_ends_01z.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_10", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_10.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10z.png",
+		"jeija_insulated_wire_ends_10z.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_on", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "mesecons_extrawires:crossover_off",
+	recipe = {
+		"mesecons_insulated:insulated_off",
+		"mesecons_insulated:insulated_off",
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "mesecons_insulated:insulated_off 2",
+	recipe = {
+		"mesecons_extrawires:crossover_off",
+	},
+})
diff --git a/mesecons/mesecons_extrawires/depends.txt b/mesecons/mesecons_extrawires/depends.txt
new file mode 100644
index 0000000..aca967d
--- /dev/null
+++ b/mesecons/mesecons_extrawires/depends.txt
@@ -0,0 +1,2 @@
+default
+mesecons
diff --git a/mesecons/mesecons_extrawires/doc/corner/description.html b/mesecons/mesecons_extrawires/doc/corner/description.html
new file mode 100644
index 0000000..92de8b0
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/corner/description.html
@@ -0,0 +1 @@
+Insulated corners are conductors that only conduct between the inputs (also not up or down). When placing they always point to the left in direction of your vision.
diff --git a/mesecons/mesecons_extrawires/doc/corner/preview.png b/mesecons/mesecons_extrawires/doc/corner/preview.png
new file mode 100644
index 0000000..9713229
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/corner/preview.png
diff --git a/mesecons/mesecons_extrawires/doc/corner/recipe.png b/mesecons/mesecons_extrawires/doc/corner/recipe.png
new file mode 100644
index 0000000..ac85b01
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/corner/recipe.png
diff --git a/mesecons/mesecons_extrawires/doc/crossing/description.html b/mesecons/mesecons_extrawires/doc/crossing/description.html
new file mode 100644
index 0000000..aa4cf25
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/crossing/description.html
@@ -0,0 +1 @@
+Insulated crossing are conductors that conduct two signals between the opposing sides, the signals are insulated to each other.
diff --git a/mesecons/mesecons_extrawires/doc/crossing/preview.png b/mesecons/mesecons_extrawires/doc/crossing/preview.png
new file mode 100644
index 0000000..66aaa05
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/crossing/preview.png
diff --git a/mesecons/mesecons_extrawires/doc/crossing/recipe.png b/mesecons/mesecons_extrawires/doc/crossing/recipe.png
new file mode 100644
index 0000000..ac37401
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/crossing/recipe.png
diff --git a/mesecons/mesecons_extrawires/doc/mese/description.html b/mesecons/mesecons_extrawires/doc/mese/description.html
new file mode 100644
index 0000000..1a14864
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/mese/description.html
@@ -0,0 +1 @@
+The basic prerequesite for mesecons, can be crafted into wires and other stuff. Have a look at the <a href="http://wiki.minetest.net/Mese">Minetest Wiki</a> for more information. Mese is a conductor. It conducts in all six directions: Up/Down/Left/Right/Forward/Backward
diff --git a/mesecons/mesecons_extrawires/doc/mese/preview.png b/mesecons/mesecons_extrawires/doc/mese/preview.png
new file mode 100644
index 0000000..3ce0ea4
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/mese/preview.png
diff --git a/mesecons/mesecons_extrawires/doc/mese/recipe.png b/mesecons/mesecons_extrawires/doc/mese/recipe.png
new file mode 100644
index 0000000..904cf0b
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/mese/recipe.png
diff --git a/mesecons/mesecons_extrawires/doc/tjunction/description.html b/mesecons/mesecons_extrawires/doc/tjunction/description.html
new file mode 100644
index 0000000..f655a5d
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/tjunction/description.html
@@ -0,0 +1 @@
+Insulated T-Junctions are conductors that only conduct between the inputs (also not up or down).
diff --git a/mesecons/mesecons_extrawires/doc/tjunction/preview.png b/mesecons/mesecons_extrawires/doc/tjunction/preview.png
new file mode 100644
index 0000000..4dec841
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/tjunction/preview.png
diff --git a/mesecons/mesecons_extrawires/doc/tjunction/recipe.png b/mesecons/mesecons_extrawires/doc/tjunction/recipe.png
new file mode 100644
index 0000000..8602941
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/tjunction/recipe.png
diff --git a/mesecons/mesecons_extrawires/doc/vertical/description.html b/mesecons/mesecons_extrawires/doc/vertical/description.html
new file mode 100644
index 0000000..df09b94
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/vertical/description.html
@@ -0,0 +1 @@
+Vertical Mesecons only conduct up and down. Plates appear at the ends, at that place they also conduct to the side.
diff --git a/mesecons/mesecons_extrawires/doc/vertical/preview.png b/mesecons/mesecons_extrawires/doc/vertical/preview.png
new file mode 100644
index 0000000..aad6ea8
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/vertical/preview.png
diff --git a/mesecons/mesecons_extrawires/doc/vertical/recipe.png b/mesecons/mesecons_extrawires/doc/vertical/recipe.png
new file mode 100644
index 0000000..83bc498
--- /dev/null
+++ b/mesecons/mesecons_extrawires/doc/vertical/recipe.png
diff --git a/mesecons/mesecons_extrawires/init.lua b/mesecons/mesecons_extrawires/init.lua
new file mode 100644
index 0000000..b22f2e5
--- /dev/null
+++ b/mesecons/mesecons_extrawires/init.lua
@@ -0,0 +1,5 @@
+dofile(minetest.get_modpath("mesecons_extrawires").."/crossover.lua");
+dofile(minetest.get_modpath("mesecons_extrawires").."/tjunction.lua");
+dofile(minetest.get_modpath("mesecons_extrawires").."/corner.lua");
+dofile(minetest.get_modpath("mesecons_extrawires").."/vertical.lua");
+dofile(minetest.get_modpath("mesecons_extrawires").."/mesewire.lua");
diff --git a/mesecons/mesecons_extrawires/mesewire.lua b/mesecons/mesecons_extrawires/mesewire.lua
new file mode 100644
index 0000000..150178c
--- /dev/null
+++ b/mesecons/mesecons_extrawires/mesewire.lua
@@ -0,0 +1,30 @@
+local mesewire_rules =
+{
+	{x = 1, y = 0, z = 0},
+	{x =-1, y = 0, z = 0},
+	{x = 0, y = 1, z = 0},
+	{x = 0, y =-1, z = 0},
+	{x = 0, y = 0, z = 1},
+	{x = 0, y = 0, z =-1},
+}
+
+minetest.override_item("default:mese", {
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:mese_powered",
+		rules = mesewire_rules
+	}}
+})
+
+minetest.register_node("mesecons_extrawires:mese_powered", {
+	tiles = {minetest.registered_nodes["default:mese"].tiles[1].."^[brighten"},
+	is_ground_content = true,
+	groups = {cracky=1, not_in_creative_inventory = 1},
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "default:mese",
+		rules = mesewire_rules
+	}},
+	drop = "default:mese"
+})
diff --git a/mesecons/mesecons_extrawires/tjunction.lua b/mesecons/mesecons_extrawires/tjunction.lua
new file mode 100644
index 0000000..1091e83
--- /dev/null
+++ b/mesecons/mesecons_extrawires/tjunction.lua
@@ -0,0 +1,84 @@
+local tjunction_nodebox = {
+	type = "fixed",
+	fixed = {{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+		 { -3/32, -17/32, -16/32+0.001, 3/32, -13/32, -3/32},}
+}
+
+local tjunction_selectionbox = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -18/32, -16/32, 16/32+0.001, -12/32, 7/32 },
+}
+
+local tjunction_get_rules = function (node)
+	local rules =
+	{{x = 0,  y = 0,  z =  1},
+	 {x = 1,  y = 0,  z =  0},
+	 {x = 0,  y = 0,  z = -1}}
+
+	for i = 0, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+
+	return rules
+end
+
+minetest.register_node("mesecons_extrawires:tjunction_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_tjunction_tb_on.png",
+		"jeija_insulated_wire_tjunction_tb_on.png^[transformR180",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = tjunction_selectionbox,
+	node_box = tjunction_nodebox,
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons_extrawires:tjunction_off",
+	mesecons = {conductor =
+	{
+		state = mesecon.state.on,
+		rules = tjunction_get_rules,
+		offstate = "mesecons_extrawires:tjunction_off"
+	}}
+})
+
+minetest.register_node("mesecons_extrawires:tjunction_off", {
+	drawtype = "nodebox",
+	description = "T-junction",
+	tiles = {
+		"jeija_insulated_wire_tjunction_tb_off.png",
+		"jeija_insulated_wire_tjunction_tb_off.png^[transformR180",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = tjunction_selectionbox,
+	node_box = tjunction_nodebox,
+	groups = {dig_immediate = 3},
+	mesecons = {conductor =
+	{
+		state = mesecon.state.off,
+		rules = tjunction_get_rules,
+		onstate = "mesecons_extrawires:tjunction_on"
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_extrawires:tjunction_off 3",
+	recipe = {
+		{"", "", ""},
+		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"},
+		{"", "mesecons_insulated:insulated_off", ""},
+	}
+})
diff --git a/mesecons/mesecons_extrawires/vertical.lua b/mesecons/mesecons_extrawires/vertical.lua
new file mode 100644
index 0000000..cac2ae2
--- /dev/null
+++ b/mesecons/mesecons_extrawires/vertical.lua
@@ -0,0 +1,183 @@
+local vertical_box = {
+	type = "fixed",
+	fixed = {-1/16, -8/16, -1/16, 1/16, 8/16, 1/16}
+}
+
+local top_box = {
+	type = "fixed",
+	fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16}}
+}
+
+local bottom_box = {
+	type = "fixed",
+	fixed = {
+		{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16},
+		{-1/16, -7/16, -1/16, 1/16, 8/16, 1/16},
+	}
+}
+
+local vertical_rules = {
+	{x=0, y=1, z=0},
+	{x=0, y=-1, z=0}
+}
+
+local top_rules = {
+	{x=1,y=0, z=0},
+	{x=-1,y=0, z=0},
+	{x=0,y=0, z=1},
+	{x=0,y=0, z=-1},
+	{x=0,y=-1, z=0}
+}
+
+local bottom_rules = {
+	{x=1, y=0, z=0},
+	{x=-1, y=0, z=0},
+	{x=0, y=0, z=1},
+	{x=0, y=0, z=-1},
+	{x=0, y=1, z=0},
+	{x=0, y=2, z=0} -- receive power from pressure plate / detector / ... 2 nodes above
+}
+
+local vertical_updatepos = function (pos)
+	local node = minetest.get_node(pos)
+	if minetest.registered_nodes[node.name]
+	and minetest.registered_nodes[node.name].is_vertical_conductor then
+		local node_above = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[1]))
+		local node_below = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[2]))
+		local namestate = minetest.registered_nodes[node.name].vertical_conductor_state
+
+		local above = minetest.registered_nodes[node_above.name]
+			and minetest.registered_nodes[node_above.name].is_vertical_conductor
+		local below = minetest.registered_nodes[node_below.name]
+			and minetest.registered_nodes[node_below.name].is_vertical_conductor
+
+		local basename = "mesecons_extrawires:vertical_"
+		if above and below then -- above and below: vertical mesecon
+			minetest.add_node(pos, {name = basename .. namestate})
+		elseif above and not below then -- above only: bottom
+			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
+		elseif not above and below then -- below only: top
+			minetest.add_node(pos, {name = basename .. "top_" .. namestate})
+		else -- no vertical wire above, no vertical wire below: use bottom
+			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
+		end
+		mesecon.update_autoconnect(pos)
+	end
+end
+
+local vertical_update = function (pos, node)
+	vertical_updatepos(pos) -- this one
+	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[1])) -- above
+	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[2])) -- below
+end
+
+-- Vertical wire
+mesecon.register_node("mesecons_extrawires:vertical", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	selection_box = vertical_box,
+	node_box = vertical_box,
+	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
+	groups = {dig_immediate=3},
+	vertical_conductor_state = "off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:vertical_on",
+		rules = vertical_rules,
+	}}
+},{
+	tiles = {"mesecons_wire_on.png"},
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	vertical_conductor_state = "on",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_off",
+		rules = vertical_rules,
+	}}
+})
+
+-- Vertical wire top
+mesecon.register_node("mesecons_extrawires:vertical_top", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	selection_box = top_box,
+	node_box = top_box,
+	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
+	vertical_conductor_state = "off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:vertical_top_on",
+		rules = top_rules,
+	}}
+},{
+	tiles = {"mesecons_wire_on.png"},
+	vertical_conductor_state = "on",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_top_off",
+		rules = top_rules,
+	}}
+})
+
+-- Vertical wire bottom
+mesecon.register_node("mesecons_extrawires:vertical_bottom", {
+	description = "Vertical mesecon",
+	drawtype = "nodebox",
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	selection_box = bottom_box,
+	node_box = bottom_box,
+	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
+	vertical_conductor_state = "off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_extrawires:vertical_bottom_on",
+		rules = bottom_rules,
+	}}
+},{
+	tiles = {"mesecons_wire_on.png"},
+	vertical_conductor_state = "on",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_bottom_off",
+		rules = bottom_rules,
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_extrawires:vertical_off 3",
+	recipe = {
+		{"mesecons:wire_00000000_off"},
+		{"mesecons:wire_00000000_off"},
+		{"mesecons:wire_00000000_off"}
+	}
+})
+
+minetest.register_craft({
+	output = "mesecons:wire_00000000_off",
+	recipe = {{"mesecons_extrawires:vertical_off"}}
+})
diff --git a/mesecons/mesecons_gates/depends.txt b/mesecons/mesecons_gates/depends.txt
new file mode 100644
index 0000000..f3e0392
--- /dev/null
+++ b/mesecons/mesecons_gates/depends.txt
@@ -0,0 +1,6 @@
+mesecons
+mesecons_microcontroller
+mesecons_delayer
+
+mesecons_torch
+mesecons_materials
diff --git a/mesecons/mesecons_gates/doc/and/description.html b/mesecons/mesecons_gates/doc/and/description.html
new file mode 100644
index 0000000..eafbeda
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/and/description.html
@@ -0,0 +1 @@
+And gates power their output if both inputs (from left and right) are powered.
diff --git a/mesecons/mesecons_gates/doc/and/preview.png b/mesecons/mesecons_gates/doc/and/preview.png
new file mode 100644
index 0000000..b2b5301
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/and/preview.png
diff --git a/mesecons/mesecons_gates/doc/and/recipe.png b/mesecons/mesecons_gates/doc/and/recipe.png
new file mode 100644
index 0000000..ae6bf63
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/and/recipe.png
diff --git a/mesecons/mesecons_gates/doc/diode/description.html b/mesecons/mesecons_gates/doc/diode/description.html
new file mode 100644
index 0000000..174fd64
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/diode/description.html
@@ -0,0 +1 @@
+Mesecon diodes, just like real ones, only transfer power (signals) in one direction only.
diff --git a/mesecons/mesecons_gates/doc/diode/preview.png b/mesecons/mesecons_gates/doc/diode/preview.png
new file mode 100644
index 0000000..ced541b
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/diode/preview.png
diff --git a/mesecons/mesecons_gates/doc/diode/recipe.png b/mesecons/mesecons_gates/doc/diode/recipe.png
new file mode 100644
index 0000000..71086bf
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/diode/recipe.png
diff --git a/mesecons/mesecons_gates/doc/nand/description.html b/mesecons/mesecons_gates/doc/nand/description.html
new file mode 100644
index 0000000..a520fd2
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nand/description.html
@@ -0,0 +1 @@
+Nand gates do not power their output if both inputs (from left and right) are powered, but power it in every other case.
diff --git a/mesecons/mesecons_gates/doc/nand/preview.png b/mesecons/mesecons_gates/doc/nand/preview.png
new file mode 100644
index 0000000..d8db780
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nand/preview.png
diff --git a/mesecons/mesecons_gates/doc/nand/recipe.png b/mesecons/mesecons_gates/doc/nand/recipe.png
new file mode 100644
index 0000000..e6118b3
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nand/recipe.png
diff --git a/mesecons/mesecons_gates/doc/nor/description.html b/mesecons/mesecons_gates/doc/nor/description.html
new file mode 100644
index 0000000..cfcd4c0
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nor/description.html
@@ -0,0 +1 @@
+Nor gates only power their output if none of their two inputs is powered. They are basically or gates with a not gate at their output.
diff --git a/mesecons/mesecons_gates/doc/nor/preview.png b/mesecons/mesecons_gates/doc/nor/preview.png
new file mode 100644
index 0000000..b6d2781
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nor/preview.png
diff --git a/mesecons/mesecons_gates/doc/nor/recipe.png b/mesecons/mesecons_gates/doc/nor/recipe.png
new file mode 100644
index 0000000..a2063c7
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/nor/recipe.png
diff --git a/mesecons/mesecons_gates/doc/not/description.html b/mesecons/mesecons_gates/doc/not/description.html
new file mode 100644
index 0000000..8bd6795
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/not/description.html
@@ -0,0 +1 @@
+Not gates invert signals, just like a mesecon torch does, but faster. The input is at the opposite side of the output.
diff --git a/mesecons/mesecons_gates/doc/not/preview.png b/mesecons/mesecons_gates/doc/not/preview.png
new file mode 100644
index 0000000..4a33cd1
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/not/preview.png
diff --git a/mesecons/mesecons_gates/doc/not/recipe.png b/mesecons/mesecons_gates/doc/not/recipe.png
new file mode 100644
index 0000000..ee1c0d6
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/not/recipe.png
diff --git a/mesecons/mesecons_gates/doc/or/description.html b/mesecons/mesecons_gates/doc/or/description.html
new file mode 100644
index 0000000..0a74abd
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/or/description.html
@@ -0,0 +1 @@
+Or gates power their output if either of their inputs (or both) are powered. You could basically get the same behaviour with two diodes, but or gates save some space.
diff --git a/mesecons/mesecons_gates/doc/or/preview.png b/mesecons/mesecons_gates/doc/or/preview.png
new file mode 100644
index 0000000..b7a8cdc
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/or/preview.png
diff --git a/mesecons/mesecons_gates/doc/or/recipe.png b/mesecons/mesecons_gates/doc/or/recipe.png
new file mode 100644
index 0000000..b94169d
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/or/recipe.png
diff --git a/mesecons/mesecons_gates/doc/xor/description.html b/mesecons/mesecons_gates/doc/xor/description.html
new file mode 100644
index 0000000..f52f3fc
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/xor/description.html
@@ -0,0 +1 @@
+XOR gates power their output if only one input is powered, they're off if either both or none of the inputs is powered.
diff --git a/mesecons/mesecons_gates/doc/xor/preview.png b/mesecons/mesecons_gates/doc/xor/preview.png
new file mode 100644
index 0000000..3d3941e
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/xor/preview.png
diff --git a/mesecons/mesecons_gates/doc/xor/recipe.png b/mesecons/mesecons_gates/doc/xor/recipe.png
new file mode 100644
index 0000000..1e129bf
--- /dev/null
+++ b/mesecons/mesecons_gates/doc/xor/recipe.png
diff --git a/mesecons/mesecons_gates/init.lua b/mesecons/mesecons_gates/init.lua
new file mode 100644
index 0000000..f3d6f09
--- /dev/null
+++ b/mesecons/mesecons_gates/init.lua
@@ -0,0 +1,134 @@
+local nodebox = {
+	type = "fixed",
+	fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }},
+}
+
+local function gate_rotate_rules(node, rules)
+	for rotations = 0, node.param2 - 1 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
+
+local function gate_get_output_rules(node)
+	return gate_rotate_rules(node, {{x=1, y=0, z=0}})
+end
+
+local function gate_get_input_rules_oneinput(node)
+	return gate_rotate_rules(node, {{x=-1, y=0, z=0}})
+end
+
+local function gate_get_input_rules_twoinputs(node)
+	return gate_rotate_rules(node, {{x=0, y=0, z=1, name="input1"},
+		{x=0, y=0, z=-1, name="input2"}})
+end
+
+local function set_gate(pos, node, state)
+	local gate = minetest.registered_nodes[node.name]
+
+	if mesecon.do_overheat(pos) then
+		minetest.remove_node(pos)
+		mesecon.receptor_off(pos, gate_get_output_rules(node))
+		minetest.add_item(pos, gate.drop)
+	elseif state then
+		minetest.swap_node(pos, {name = gate.onstate, param2=node.param2})
+		mesecon.receptor_on(pos, gate_get_output_rules(node))
+	else
+		minetest.swap_node(pos, {name = gate.offstate, param2=node.param2})
+		mesecon.receptor_off(pos, gate_get_output_rules(node))
+	end
+end
+
+local function update_gate(pos, node, link, newstate)
+	local gate = minetest.registered_nodes[node.name]
+
+	if gate.inputnumber == 1 then
+		set_gate(pos, node, gate.assess(newstate == "on"))
+	elseif gate.inputnumber == 2 then
+		local meta = minetest.get_meta(pos)
+		meta:set_int(link.name, newstate == "on" and 1 or 0)
+
+		local val1 = meta:get_int("input1") == 1
+		local val2 = meta:get_int("input2") == 1
+		set_gate(pos, node, gate.assess(val1, val2))
+	end
+end
+
+function register_gate(name, inputnumber, assess, recipe)
+	local get_inputrules = inputnumber == 2 and gate_get_input_rules_twoinputs or
+		gate_get_input_rules_oneinput
+	local description = "Mesecons Logic Gate: "..name
+
+	local basename = "mesecons_gates:"..name
+	mesecon.register_node(basename, {
+		description = description,
+		inventory_image = "jeija_gate_off.png^jeija_gate_"..name..".png",
+		paramtype = "light",
+		paramtype2 = "facedir",
+		drawtype = "nodebox",
+		drop = basename.."_off",
+		selection_box = nodebox,
+		node_box = nodebox,
+		walkable = true,
+		sounds = default.node_sound_stone_defaults(),
+		assess = assess,
+		onstate = basename.."_on",
+		offstate = basename.."_off",
+		inputnumber = inputnumber
+	},{
+		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_off.png^"..
+			"jeija_gate_"..name..".png"},
+		groups = {dig_immediate = 2, overheat = 1},
+		mesecons = { receptor = {
+			state = "off",
+			rules = gate_get_output_rules
+		}, effector = {
+			rules = get_inputrules,
+			action_change = update_gate
+		}}
+	},{
+		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_on.png^"..
+			"jeija_gate_"..name..".png"},
+		groups = {dig_immediate = 2, not_in_creative_inventory = 1, overheat = 1},
+		mesecons = { receptor = {
+			state = "on",
+			rules = gate_get_output_rules
+		}, effector = {
+			rules = get_inputrules,
+			action_change = update_gate
+		}}
+	})
+
+	minetest.register_craft({output = basename.."_off", recipe = recipe})
+end
+
+register_gate("diode", 1, function (input) return input end,
+	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons_torch:mesecon_torch_on"}})
+
+register_gate("not", 1, function (input) return not input end,
+	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons:mesecon"}})
+
+register_gate("and", 2, function (val1, val2) return val1 and val2 end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons:mesecon"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("nand", 2, function (val1, val2) return not (val1 and val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons_torch:mesecon_torch_on"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("xor", 2, function (val1, val2) return (val1 or val2) and not (val1 and val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons_materials:silicon"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("nor", 2, function (val1, val2) return not (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons:mesecon", "mesecons_torch:mesecon_torch_on"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("or", 2, function (val1, val2) return (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons:mesecon", "mesecons:mesecon"},
+	 {"mesecons:mesecon", "", ""}})
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_and.png b/mesecons/mesecons_gates/textures/jeija_gate_and.png
new file mode 100644
index 0000000..0ddc043
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_and.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_diode.png b/mesecons/mesecons_gates/textures/jeija_gate_diode.png
new file mode 100644
index 0000000..ffa403f
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_diode.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_nand.png b/mesecons/mesecons_gates/textures/jeija_gate_nand.png
new file mode 100644
index 0000000..0e4294e
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_nand.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_nor.png b/mesecons/mesecons_gates/textures/jeija_gate_nor.png
new file mode 100644
index 0000000..c4298e3
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_nor.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_not.png b/mesecons/mesecons_gates/textures/jeija_gate_not.png
new file mode 100644
index 0000000..939fb76
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_not.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_off.png b/mesecons/mesecons_gates/textures/jeija_gate_off.png
new file mode 100644
index 0000000..44017b0
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_off.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_on.png b/mesecons/mesecons_gates/textures/jeija_gate_on.png
new file mode 100644
index 0000000..47028a8
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_on.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_or.png b/mesecons/mesecons_gates/textures/jeija_gate_or.png
new file mode 100644
index 0000000..09f0661
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_or.png
diff --git a/mesecons/mesecons_gates/textures/jeija_gate_xor.png b/mesecons/mesecons_gates/textures/jeija_gate_xor.png
new file mode 100644
index 0000000..afbd6ab
--- /dev/null
+++ b/mesecons/mesecons_gates/textures/jeija_gate_xor.png
diff --git a/mesecons/mesecons_hydroturbine/depends.txt b/mesecons/mesecons_hydroturbine/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_hydroturbine/doc/waterturbine/description.html b/mesecons/mesecons_hydroturbine/doc/waterturbine/description.html
new file mode 100644
index 0000000..4b4e5a0
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/doc/waterturbine/description.html
@@ -0,0 +1 @@
+Water turbines are receptors that turn on if flowing water is above them.
diff --git a/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png b/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png
new file mode 100644
index 0000000..14be16e
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/doc/waterturbine/preview.png
diff --git a/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png b/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png
new file mode 100644
index 0000000..8eb5365
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/doc/waterturbine/recipe.png
diff --git a/mesecons/mesecons_hydroturbine/init.lua b/mesecons/mesecons_hydroturbine/init.lua
new file mode 100644
index 0000000..d1c08f7
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/init.lua
@@ -0,0 +1,92 @@
+-- HYDRO_TURBINE
+-- Water turbine:
+-- Active if flowing >water< above it
+-- (does not work with other liquids)
+
+minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
+	tiles = {
+		"jeija_hydro_turbine_sides_off.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
+	inventory_image = "jeija_hydro_turbine_inv.png",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
+	groups = {dig_immediate=2},
+	description="Water Turbine",
+	paramtype = "light",
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
+	},
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.off
+	}}
+})
+
+minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
+	tiles = {
+		"jeija_hydro_turbine_sides_on.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
+	inventory_image = "jeija_hydro_turbine_inv.png",
+	drop = "mesecons_hydroturbine:hydro_turbine_off 1",
+	groups = {dig_immediate=2,not_in_creative_inventory=1},
+	description="Water Turbine",
+	paramtype = "light",
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
+	},
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.on
+	}}
+})
+
+
+minetest.register_abm({
+nodenames = {"mesecons_hydroturbine:hydro_turbine_off"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
+		if minetest.get_node(waterpos).name=="default:water_flowing" then
+			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"})
+			nodeupdate(pos)
+			mesecon.receptor_on(pos)
+		end
+	end,
+})
+
+minetest.register_abm({
+nodenames = {"mesecons_hydroturbine:hydro_turbine_on"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
+		if minetest.get_node(waterpos).name~="default:water_flowing" then
+			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"})
+			nodeupdate(pos)
+			mesecon.receptor_off(pos)
+		end
+	end,
+})
+
+minetest.register_craft({
+	output = "mesecons_hydroturbine:hydro_turbine_off 2",
+	recipe = {
+	{"","default:stick", ""},
+	{"default:stick", "default:steel_ingot", "default:stick"},
+	{"","default:stick", ""},
+	}
+})
+
diff --git a/mesecons/mesecons_hydroturbine/models/jeija_hydro_turbine.obj b/mesecons/mesecons_hydroturbine/models/jeija_hydro_turbine.obj
new file mode 100644
index 0000000..84a1a44
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/models/jeija_hydro_turbine.obj
@@ -0,0 +1,429 @@
+# Blender v2.73 (sub 0) OBJ File: 'mesecons-water-turbine.blend'
+# www.blender.org
+o Cylinder.002_Cylinder.003
+v 0.000000 0.500000 -0.150000
+v 0.000000 0.562500 -0.150000
+v 0.106066 0.500000 -0.106066
+v 0.106066 0.562500 -0.106066
+v 0.150000 0.500000 0.000000
+v 0.150000 0.562500 0.000000
+v 0.106066 0.500000 0.106066
+v 0.106066 0.562500 0.106066
+v -0.000000 0.500000 0.150000
+v -0.000000 0.562500 0.150000
+v -0.106066 0.500000 0.106066
+v -0.106066 0.562500 0.106066
+v -0.150000 0.500000 -0.000000
+v -0.150000 0.562500 -0.000000
+v -0.106066 0.500000 -0.106066
+v -0.106066 0.562500 -0.106066
+v 0.097545 0.625000 -0.490393
+v -0.097545 0.625000 -0.490393
+v -0.277785 0.625000 -0.415735
+v -0.415735 0.625000 -0.277785
+v -0.490393 0.625000 -0.097545
+v -0.490393 0.625000 0.097545
+v -0.415735 0.625000 0.277785
+v -0.277785 0.625000 0.415735
+v -0.097545 0.625000 0.490393
+v 0.097545 0.625000 0.490393
+v 0.277785 0.625000 0.415735
+v 0.415735 0.625000 0.277785
+v 0.490393 0.625000 0.097545
+v 0.490393 0.625000 -0.097545
+v 0.415735 0.625000 -0.277785
+v 0.277785 0.625000 -0.415735
+v 0.097545 0.656250 -0.490393
+v -0.097545 0.656250 -0.490393
+v -0.277785 0.656250 -0.415735
+v -0.415735 0.656250 -0.277785
+v -0.490393 0.656250 -0.097545
+v -0.490393 0.656250 0.097545
+v -0.415735 0.656250 0.277785
+v -0.277785 0.656250 0.415735
+v -0.097545 0.656250 0.490393
+v 0.097545 0.656250 0.490393
+v 0.277785 0.656250 0.415735
+v 0.415735 0.656250 0.277785
+v 0.490393 0.656250 0.097545
+v 0.490393 0.656250 -0.097545
+v 0.415735 0.656250 -0.277785
+v 0.277785 0.656250 -0.415735
+v 0.116233 0.634645 -0.436100
+v 0.116233 1.482640 -0.436100
+v 0.299524 0.634645 -0.186124
+v 0.299524 1.482640 -0.186124
+v 0.343405 0.634645 0.080186
+v 0.343405 1.482640 0.080186
+v 0.186124 0.634645 0.299524
+v 0.186124 1.482640 0.299524
+v -0.080186 0.634645 0.343405
+v -0.080186 1.482640 0.343405
+v -0.299524 0.634645 0.186124
+v -0.299524 1.482640 0.186124
+v -0.343405 0.634645 -0.080186
+v -0.343405 1.482640 -0.080186
+v -0.186124 0.634645 -0.299524
+v -0.186124 1.482640 -0.299524
+v 0.080186 0.634645 -0.343405
+v 0.080186 1.482640 -0.343405
+v 0.390559 1.482640 -0.226180
+v 0.390559 0.634645 -0.226180
+v 0.436100 1.482640 0.116233
+v 0.436100 0.634645 0.116233
+v 0.226180 1.482640 0.390559
+v 0.226180 0.634645 0.390559
+v -0.116233 1.482640 0.436100
+v -0.116233 0.634645 0.436100
+v -0.390559 1.482640 0.226180
+v -0.390559 0.634645 0.226180
+v -0.436100 1.482640 -0.116233
+v -0.436100 0.634645 -0.116233
+v -0.226180 1.482640 -0.390559
+v -0.226180 0.634645 -0.390559
+v 0.108975 0.634645 -0.430778
+v 0.292266 0.634645 -0.180802
+v 0.292266 1.482640 -0.180802
+v 0.108975 1.482640 -0.430778
+v 0.381664 0.634645 -0.227549
+v 0.334509 0.634645 0.078817
+v 0.334509 1.482640 0.078817
+v 0.381664 1.482640 -0.227549
+v 0.430778 0.634645 0.108975
+v 0.180802 0.634645 0.292266
+v 0.180802 1.482640 0.292266
+v 0.430778 1.482640 0.108975
+v 0.227549 0.634645 0.381664
+v -0.078817 0.634645 0.334509
+v -0.078817 1.482640 0.334509
+v 0.227549 1.482640 0.381664
+v -0.108975 0.634645 0.430778
+v -0.292266 0.634645 0.180802
+v -0.292266 1.482640 0.180802
+v -0.108975 1.482640 0.430778
+v -0.381664 0.634645 0.227549
+v -0.334509 0.634645 -0.078817
+v -0.334509 1.482640 -0.078817
+v -0.381664 1.482640 0.227549
+v -0.227549 0.634645 -0.381663
+v 0.078817 0.634645 -0.334509
+v 0.078817 1.482640 -0.334509
+v -0.227549 1.482640 -0.381663
+v -0.430779 0.634645 -0.108975
+v -0.180802 0.634645 -0.292266
+v -0.180802 1.482640 -0.292266
+v -0.430779 1.482640 -0.108975
+v 0.097545 1.500000 -0.490393
+v -0.097545 1.500000 -0.490393
+v -0.277785 1.500000 -0.415735
+v -0.415735 1.500000 -0.277785
+v -0.490393 1.500000 -0.097545
+v -0.490393 1.500000 0.097545
+v -0.415735 1.500000 0.277785
+v -0.277785 1.500000 0.415735
+v -0.097545 1.500000 0.490393
+v 0.097545 1.500000 0.490393
+v 0.277785 1.500000 0.415735
+v 0.415735 1.500000 0.277785
+v 0.490393 1.500000 0.097545
+v 0.490393 1.500000 -0.097545
+v 0.415735 1.500000 -0.277785
+v 0.277785 1.500000 -0.415735
+v 0.097545 1.468750 -0.490393
+v -0.097545 1.468750 -0.490393
+v -0.277785 1.468750 -0.415735
+v -0.415735 1.468750 -0.277785
+v -0.490393 1.468750 -0.097545
+v -0.490393 1.468750 0.097545
+v -0.415735 1.468750 0.277785
+v -0.277785 1.468750 0.415735
+v -0.097545 1.468750 0.490393
+v 0.097545 1.468750 0.490393
+v 0.277785 1.468750 0.415735
+v 0.415735 1.468750 0.277785
+v 0.490393 1.468750 0.097545
+v 0.490393 1.468750 -0.097545
+v 0.415735 1.468750 -0.277785
+v 0.277785 1.468750 -0.415735
+v 0.025624 0.559630 -0.061863
+v 0.025624 1.481372 -0.061863
+v 0.061863 0.559630 -0.025624
+v 0.061863 1.481372 -0.025624
+v 0.061863 0.559630 0.025624
+v 0.061863 1.481372 0.025624
+v 0.025624 0.559630 0.061863
+v 0.025624 1.481372 0.061863
+v -0.025624 0.559630 0.061863
+v -0.025624 1.481372 0.061863
+v -0.061863 0.559630 0.025624
+v -0.061863 1.481372 0.025624
+v -0.061863 0.559630 -0.025624
+v -0.061863 1.481372 -0.025624
+v -0.025624 0.559630 -0.061863
+v -0.025624 1.481372 -0.061863
+v 0.499775 -0.499550 -0.499775
+v 0.499775 -0.499550 0.499775
+v -0.499775 -0.499550 0.499775
+v -0.499775 -0.499550 -0.499775
+v 0.499775 0.500000 -0.499775
+v 0.499775 0.500000 0.499775
+v -0.499775 0.500000 0.499775
+v -0.499775 0.500000 -0.499775
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.400544 1.000000
+vt 0.599456 1.000000
+vt 0.783227 0.923880
+vt 0.923880 0.783227
+vt 1.000000 0.599456
+vt 1.000000 0.400544
+vt 0.923880 0.216773
+vt 0.783227 0.076120
+vt 0.599456 0.000000
+vt 0.400544 0.000000
+vt 0.216773 0.076121
+vt 0.076120 0.216773
+vt 0.000000 0.400544
+vt 0.000000 0.599456
+vt 0.076121 0.783227
+vt 0.216773 0.923880
+vt 0.500000 0.343750
+vt 0.531250 0.343750
+vt 0.531250 0.375000
+vt 0.500000 0.375000
+vt 0.531250 0.406250
+vt 0.500000 0.406250
+vt 0.500000 0.531250
+vt 0.531250 0.531250
+vt 0.531250 0.500000
+vt 0.500000 0.500000
+vt 0.531250 0.468750
+vt 0.500000 0.468750
+vt 0.531250 0.437500
+vt 0.500000 0.437500
+vt 0.593750 0.468750
+vt 0.625000 0.437500
+vt 0.656250 0.437500
+vt 0.687500 0.468750
+vt 0.687500 0.500000
+vt 0.656250 0.531250
+vt 0.625000 0.531250
+vt 0.593750 0.500000
+vt 0.500000 0.312500
+vt 0.531250 0.312500
+vt 0.500000 0.281250
+vt 0.531250 0.281250
+vt 0.156250 0.750000
+vt 0.156250 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.750000
+vt 0.156250 0.625000
+vt 0.125000 0.625000
+vt 0.156250 0.500000
+vt 0.125000 0.500000
+vt 0.156250 0.375000
+vt 0.125000 0.375000
+vt 0.156250 0.250000
+vt 0.125000 0.250000
+vt 0.250000 0.500000
+vt 0.250000 0.625000
+vt 0.218750 0.625000
+vt 0.218750 0.500000
+vt 0.156250 0.125000
+vt 0.125000 0.125000
+vt 0.156250 -0.000000
+vt 0.125000 -0.000000
+vt 0.250000 0.375000
+vt 0.218750 0.375000
+vt 0.250000 0.875000
+vt 0.250000 1.000000
+vt 0.218750 1.000000
+vt 0.218750 0.875000
+vt 0.250000 0.250000
+vt 0.218750 0.250000
+vt 0.250000 0.750000
+vt 0.218750 0.750000
+vt 0.250000 0.125000
+vt 0.218750 0.125000
+vt 0.250000 -0.000000
+vt 0.218750 -0.000000
+vt 0.156250 1.000000
+vt 0.125000 1.000000
+vt 0.781250 0.593750
+vt 0.781250 0.968750
+vt 0.656250 0.968750
+vt 0.656250 0.593750
+vt 0.625000 0.593750
+vt 0.625000 0.968750
+vt 0.500000 0.968750
+vt 0.500000 0.593750
+vt 0.406250 -0.000000
+vt 0.437500 -0.000000
+vt 0.437500 0.125000
+vt 0.406250 0.125000
+vt 0.312500 0.875000
+vt 0.343750 0.875000
+vt 0.343750 1.000000
+vt 0.312500 1.000000
+vt 0.312500 0.750000
+vt 0.343750 0.750000
+vt 0.312500 0.625000
+vt 0.343750 0.625000
+vt 0.312500 0.500000
+vt 0.343750 0.500000
+vt 0.406250 0.750000
+vt 0.437500 0.750000
+vt 0.437500 0.875000
+vt 0.406250 0.875000
+vt 0.312500 0.375000
+vt 0.343750 0.375000
+vt 0.312500 0.250000
+vt 0.343750 0.250000
+vt 0.406250 0.625000
+vt 0.437500 0.625000
+vt 0.312500 0.125000
+vt 0.343750 0.125000
+vt 0.406250 0.500000
+vt 0.437500 0.500000
+vt 0.312500 -0.000000
+vt 0.343750 -0.000000
+vt 0.406250 0.375000
+vt 0.437500 0.375000
+vt 0.437500 1.000000
+vt 0.406250 1.000000
+vt 0.406250 0.250000
+vt 0.437500 0.250000
+vt 0.031250 0.937500
+vt 0.062500 0.937500
+vt 0.062500 0.968750
+vt 0.031250 0.968750
+vt 0.031250 0.718750
+vt 0.062500 0.718750
+vt 0.062500 0.750000
+vt 0.031250 0.750000
+vt 0.062500 0.781250
+vt 0.031250 0.781250
+vt 0.062500 0.812500
+vt 0.031250 0.812500
+vt 0.062500 0.843750
+vt 0.031250 0.843750
+vt 0.062500 0.875000
+vt 0.031250 0.875000
+vt 0.031250 0.906250
+vt 0.062500 0.906250
+vn 1.000000 0.000000 0.000000
+vn -0.000000 -0.000000 1.000000
+vn -1.000000 -0.000000 -0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.382700 0.000000 -0.923900
+vn 0.923900 0.000000 -0.382700
+vn 0.923900 0.000000 0.382700
+vn 0.382700 0.000000 0.923900
+vn -0.382700 0.000000 0.923900
+vn -0.923900 0.000000 0.382700
+vn -0.382700 0.000000 -0.923900
+vn -0.923900 0.000000 -0.382700
+vn 0.707100 0.000000 0.707100
+vn -0.707100 0.000000 0.707100
+vn 0.707100 0.000000 -0.707100
+vn -0.707100 0.000000 -0.707100
+vn 0.806400 0.000000 -0.591300
+vn 0.988400 0.000000 0.152100
+vn 0.591300 0.000000 0.806400
+vn -0.152100 0.000000 0.988400
+vn -0.806400 0.000000 0.591300
+vn -0.988400 0.000000 -0.152100
+vn 0.152100 0.000000 -0.988400
+vn -0.591300 0.000000 -0.806400
+g Cylinder.002_Cylinder.003_sides
+s off
+f 161/1/1 165/2/1 166/3/1 162/4/1
+f 162/1/2 166/2/2 167/3/2 163/4/2
+f 163/4/3 167/3/3 168/2/3 164/1/3
+f 165/2/4 161/1/4 164/4/4 168/3/4
+g Cylinder.002_Cylinder.003_top-bottom
+f 161/2/5 162/1/5 163/4/5 164/3/5
+f 165/2/6 168/3/6 167/4/6 166/1/6
+g Cylinder.002_Cylinder.003_turbine-top-bottom
+f 130/5/5 129/6/5 144/7/5 143/8/5 142/9/5 141/10/5 140/11/5 139/12/5 138/13/5 137/14/5 136/15/5 135/16/5 134/17/5 133/18/5 132/19/5 131/20/5
+f 18/5/5 17/6/5 32/7/5 31/8/5 30/9/5 29/10/5 28/11/5 27/12/5 26/13/5 25/14/5 24/15/5 23/16/5 22/17/5 21/18/5 20/19/5 19/20/5
+f 33/6/6 34/5/6 35/20/6 36/19/6 37/18/6 38/17/6 39/16/6 40/15/6 41/14/6 42/13/6 43/12/6 44/11/6 45/10/6 46/9/6 47/8/6 48/7/6
+f 113/6/6 114/5/6 115/20/6 116/19/6 117/18/6 118/17/6 119/16/6 120/15/6 121/14/6 122/13/6 123/12/6 124/11/6 125/10/6 126/9/6 127/8/6 128/7/6
+g Cylinder.002_Cylinder.003_turbine-blades-etc
+f 1/21/7 2/22/7 4/23/7 3/24/7
+f 3/24/8 4/23/8 6/25/8 5/26/8
+f 5/27/9 6/28/9 8/29/9 7/30/9
+f 7/30/10 8/29/10 10/31/10 9/32/10
+f 9/32/11 10/31/11 12/33/11 11/34/11
+f 11/34/12 12/33/12 14/25/12 13/26/12
+f 4/35/6 2/36/6 16/37/6 14/38/6 12/39/6 10/40/6 8/41/6 6/42/6
+f 15/43/13 16/44/13 2/22/13 1/21/13
+f 13/45/14 14/46/14 16/44/14 15/43/14
+f 27/47/15 28/48/15 44/49/15 43/50/15
+f 26/51/10 27/47/10 43/50/10 42/52/10
+f 25/53/2 26/51/2 42/52/2 41/54/2
+f 24/55/11 25/53/11 41/54/11 40/56/11
+f 23/57/16 24/55/16 40/56/16 39/58/16
+f 17/59/4 18/60/4 34/61/4 33/62/4
+f 22/63/12 23/57/12 39/58/12 38/64/12
+f 21/65/3 22/63/3 38/64/3 37/66/3
+f 32/67/7 17/59/7 33/62/7 48/68/7
+f 20/69/14 21/70/14 37/71/14 36/72/14
+f 31/73/17 32/67/17 48/68/17 47/74/17
+f 19/75/18 20/69/18 36/72/18 35/76/18
+f 30/77/8 31/73/8 47/74/8 46/78/8
+f 18/60/13 19/75/13 35/76/13 34/61/13
+f 29/79/1 30/77/1 46/78/1 45/80/1
+f 28/48/9 29/81/9 45/82/9 44/49/9
+f 49/83/19 50/84/19 52/85/19 51/86/19
+f 68/86/20 67/83/20 54/84/20 53/85/20
+f 70/83/21 69/84/21 56/85/21 55/86/21
+f 72/84/22 71/85/22 58/86/22 57/83/22
+f 74/83/23 73/84/23 60/85/23 59/86/23
+f 76/83/24 75/84/24 62/85/24 61/86/24
+f 80/84/25 79/85/25 66/86/25 65/83/25
+f 78/83/26 77/84/26 64/85/26 63/86/26
+f 81/87/23 82/88/23 83/89/23 84/90/23
+f 85/88/24 86/89/24 87/90/24 88/87/24
+f 89/89/26 90/90/26 91/87/26 92/88/26
+f 93/90/25 94/87/25 95/88/25 96/89/25
+f 97/90/19 98/87/19 99/88/19 100/89/19
+f 101/87/20 102/88/20 103/89/20 104/90/20
+f 105/90/22 106/87/22 107/88/22 108/89/22
+f 109/89/21 110/90/21 111/87/21 112/88/21
+f 75/88/22 76/87/22 101/86/22 104/85/22
+f 71/88/20 72/87/20 93/86/20 96/85/20
+f 67/86/25 68/85/25 85/88/25 88/87/25
+f 79/86/24 80/85/24 105/88/24 108/87/24
+f 77/88/23 78/87/23 109/86/23 112/85/23
+f 73/88/21 74/87/21 97/86/21 100/85/21
+f 69/86/19 70/85/19 89/88/19 92/87/19
+f 50/86/26 49/85/26 81/88/26 84/87/26
+f 123/91/15 139/92/15 140/93/15 124/94/15
+f 122/95/10 138/96/10 139/97/10 123/98/10
+f 121/99/2 137/100/2 138/96/2 122/95/2
+f 120/101/11 136/102/11 137/100/11 121/99/11
+f 119/103/16 135/104/16 136/102/16 120/101/16
+f 113/105/4 129/106/4 130/107/4 114/108/4
+f 118/109/12 134/110/12 135/104/12 119/103/12
+f 117/111/3 133/112/3 134/110/3 118/109/3
+f 128/113/7 144/114/7 129/106/7 113/105/7
+f 116/115/14 132/116/14 133/112/14 117/111/14
+f 127/117/17 143/118/17 144/114/17 128/113/17
+f 115/119/18 131/120/18 132/116/18 116/115/18
+f 126/121/8 142/122/8 143/118/8 127/117/8
+f 114/108/13 130/107/13 131/123/13 115/124/13
+f 125/125/1 141/126/1 142/122/1 126/121/1
+f 124/94/9 140/93/9 141/126/9 125/125/9
+f 145/127/17 146/128/17 148/129/17 147/130/17
+f 147/131/1 148/132/1 150/133/1 149/134/1
+f 149/134/15 150/133/15 152/135/15 151/136/15
+f 151/136/2 152/135/2 154/137/2 153/138/2
+f 153/138/16 154/137/16 156/139/16 155/140/16
+f 155/140/3 156/139/3 158/141/3 157/142/3
+f 159/143/4 160/144/4 146/128/4 145/127/4
+f 157/142/18 158/141/18 160/144/18 159/143/18
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png
new file mode 100644
index 0000000..4cc9f20
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_inv.png
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png
new file mode 100644
index 0000000..89975e8
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_off.png
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png
new file mode 100644
index 0000000..759388a
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_sides_on.png
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_top_bottom.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_top_bottom.png
new file mode 100644
index 0000000..37d634f
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_top_bottom.png
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png
new file mode 100644
index 0000000..45a720b
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_misc.png
diff --git a/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_top_bottom.png b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_top_bottom.png
new file mode 100644
index 0000000..fa76591
--- /dev/null
+++ b/mesecons/mesecons_hydroturbine/textures/jeija_hydro_turbine_turbine_top_bottom.png
diff --git a/mesecons/mesecons_insulated/depends.txt b/mesecons/mesecons_insulated/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_insulated/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_insulated/doc/insulated/description.html b/mesecons/mesecons_insulated/doc/insulated/description.html
new file mode 100644
index 0000000..df2a6df
--- /dev/null
+++ b/mesecons/mesecons_insulated/doc/insulated/description.html
@@ -0,0 +1 @@
+ Insulated mesecons are conductors that only conduct in one direction (and also not up or down).
diff --git a/mesecons/mesecons_insulated/doc/insulated/preview.png b/mesecons/mesecons_insulated/doc/insulated/preview.png
new file mode 100644
index 0000000..bf544e8
--- /dev/null
+++ b/mesecons/mesecons_insulated/doc/insulated/preview.png
diff --git a/mesecons/mesecons_insulated/doc/insulated/recipe.png b/mesecons/mesecons_insulated/doc/insulated/recipe.png
new file mode 100644
index 0000000..f2a731a
--- /dev/null
+++ b/mesecons/mesecons_insulated/doc/insulated/recipe.png
diff --git a/mesecons/mesecons_insulated/init.lua b/mesecons/mesecons_insulated/init.lua
new file mode 100644
index 0000000..c6fc05e
--- /dev/null
+++ b/mesecons/mesecons_insulated/init.lua
@@ -0,0 +1,80 @@
+function insulated_wire_get_rules(node)
+	local rules = 	{{x = 1,  y = 0,  z = 0},
+			 {x =-1,  y = 0,  z = 0}}
+	if node.param2 == 1 or node.param2 == 3 then
+		return mesecon.rotate_rules_right(rules)
+	end
+	return rules
+end
+
+minetest.register_node("mesecons_insulated:insulated_on", {
+	drawtype = "nodebox",
+	description = "Insulated Mesecon",
+	tiles = {
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_sides_on.png",
+		"jeija_insulated_wire_sides_on.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -18/32, -7/32, 16/32+0.001, -12/32, 7/32 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }
+	},
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons_insulated:insulated_off",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_insulated:insulated_off",
+		rules = insulated_wire_get_rules
+	}}
+})
+
+minetest.register_node("mesecons_insulated:insulated_off", {
+	drawtype = "nodebox",
+	description = "Insulated Mesecon",
+	tiles = {
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_ends_off.png",
+		"jeija_insulated_wire_sides_off.png",
+		"jeija_insulated_wire_sides_off.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -18/32, -7/32, 16/32+0.001, -12/32, 7/32 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }
+	},
+	groups = {dig_immediate = 3},
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		onstate = "mesecons_insulated:insulated_on",
+		rules = insulated_wire_get_rules
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_insulated:insulated_off 3",
+	recipe = {
+		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
+		{"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"},
+		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
+	}
+})
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png
new file mode 100644
index 0000000..d872b2b
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png
new file mode 100644
index 0000000..ae06dea
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png
new file mode 100644
index 0000000..41b5ff4
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png
new file mode 100644
index 0000000..154288b
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png
new file mode 100644
index 0000000..85ca90b
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png
new file mode 100644
index 0000000..772d9a6
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png
new file mode 100644
index 0000000..b742152
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png
new file mode 100644
index 0000000..497a467
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png
new file mode 100644
index 0000000..d407cff
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png
new file mode 100644
index 0000000..830d390
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png
new file mode 100644
index 0000000..89a8385
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png
new file mode 100644
index 0000000..75cf435
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png
new file mode 100644
index 0000000..db33f14
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png
new file mode 100644
index 0000000..f76e9a8
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png
new file mode 100644
index 0000000..a897b29
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png
diff --git a/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png
new file mode 100644
index 0000000..8fc312b
--- /dev/null
+++ b/mesecons/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png
diff --git a/mesecons/mesecons_lamp/depends.txt b/mesecons/mesecons_lamp/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_lamp/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_lamp/doc/lamp/description.html b/mesecons/mesecons_lamp/doc/lamp/description.html
new file mode 100644
index 0000000..5bfe6c5
--- /dev/null
+++ b/mesecons/mesecons_lamp/doc/lamp/description.html
@@ -0,0 +1 @@
+Lamps are effectors that if powered emit light.
diff --git a/mesecons/mesecons_lamp/doc/lamp/preview.png b/mesecons/mesecons_lamp/doc/lamp/preview.png
new file mode 100644
index 0000000..a581cb3
--- /dev/null
+++ b/mesecons/mesecons_lamp/doc/lamp/preview.png
diff --git a/mesecons/mesecons_lamp/doc/lamp/recipe.png b/mesecons/mesecons_lamp/doc/lamp/recipe.png
new file mode 100644
index 0000000..77570bd
--- /dev/null
+++ b/mesecons/mesecons_lamp/doc/lamp/recipe.png
diff --git a/mesecons/mesecons_lamp/init.lua b/mesecons/mesecons_lamp/init.lua
new file mode 100644
index 0000000..362453c
--- /dev/null
+++ b/mesecons/mesecons_lamp/init.lua
@@ -0,0 +1,61 @@
+-- MESELAMPS
+-- A lamp is "is an electrical device used to create artificial light" (wikipedia)
+-- guess what?
+
+mesecon_lamp_box = {
+	type = "wallmounted",
+	wall_top = {-0.3125,0.375,-0.3125,0.3125,0.5,0.3125},
+	wall_bottom = {-0.3125,-0.5,-0.3125,0.3125,-0.375,0.3125},
+	wall_side = {-0.375,-0.3125,-0.3125,-0.5,0.3125,0.3125},
+}
+
+minetest.register_node("mesecons_lamp:lamp_on", {
+	drawtype = "nodebox",
+	tiles = {"jeija_meselamp_on.png"},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	legacy_wallmounted = true,
+	sunlight_propagates = true,
+	walkable = true,
+	light_source = default.LIGHT_MAX,
+	node_box = mesecon_lamp_box,
+	selection_box = mesecon_lamp_box,
+	groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},
+	drop="mesecons_lamp:lamp_off 1",
+	sounds = default.node_sound_glass_defaults(),
+	mesecons = {effector = {
+		action_off = function (pos, node)
+			minetest.swap_node(pos, {name = "mesecons_lamp:lamp_off", param2 = node.param2})
+		end
+	}}
+})
+
+minetest.register_node("mesecons_lamp:lamp_off", {
+	drawtype = "nodebox",
+	tiles = {"jeija_meselamp_off.png"},
+	inventory_image = "jeija_meselamp.png",
+	wield_image = "jeija_meselamp.png",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	sunlight_propagates = true,
+	walkable = true,
+	node_box = mesecon_lamp_box,
+	selection_box = mesecon_lamp_box,
+	groups = {dig_immediate=3, mesecon_receptor_off = 1, mesecon_effector_off = 1},
+    	description="Meselamp",
+	sounds = default.node_sound_glass_defaults(),
+	mesecons = {effector = {
+		action_on = function (pos, node)
+			minetest.swap_node(pos, {name = "mesecons_lamp:lamp_on", param2 = node.param2})
+		end
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_lamp:lamp_off 1",
+	recipe = {
+		{"", "default:glass", ""},
+		{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
+		{"", "default:glass", ""},
+	}
+})
diff --git a/mesecons/mesecons_lamp/textures/jeija_meselamp.png b/mesecons/mesecons_lamp/textures/jeija_meselamp.png
new file mode 100644
index 0000000..5456ee9
--- /dev/null
+++ b/mesecons/mesecons_lamp/textures/jeija_meselamp.png
diff --git a/mesecons/mesecons_lamp/textures/jeija_meselamp_off.png b/mesecons/mesecons_lamp/textures/jeija_meselamp_off.png
new file mode 100644
index 0000000..67bd7fd
--- /dev/null
+++ b/mesecons/mesecons_lamp/textures/jeija_meselamp_off.png
diff --git a/mesecons/mesecons_lamp/textures/jeija_meselamp_on.png b/mesecons/mesecons_lamp/textures/jeija_meselamp_on.png
new file mode 100644
index 0000000..2316e00
--- /dev/null
+++ b/mesecons/mesecons_lamp/textures/jeija_meselamp_on.png
diff --git a/mesecons/mesecons_lightstone/depends.txt b/mesecons/mesecons_lightstone/depends.txt
new file mode 100644
index 0000000..f9705e0
--- /dev/null
+++ b/mesecons/mesecons_lightstone/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+dye
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_blue/description.html b/mesecons/mesecons_lightstone/doc/lightstone_blue/description.html
new file mode 100644
index 0000000..813e6ea
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_blue/description.html
@@ -0,0 +1 @@
+Effector, glows blue when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png
new file mode 100644
index 0000000..579f719
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_blue/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png
new file mode 100644
index 0000000..ce8ebd7
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_blue/recipe.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/description.html b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/description.html
new file mode 100644
index 0000000..826ca0f
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/description.html
@@ -0,0 +1 @@
+Effector, glows dark grey when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png
new file mode 100644
index 0000000..56fe6ea
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png
new file mode 100644
index 0000000..fed0db2
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_darkgrey/recipe.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_green/description.html b/mesecons/mesecons_lightstone/doc/lightstone_green/description.html
new file mode 100644
index 0000000..cb5b515
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_green/description.html
@@ -0,0 +1 @@
+Effector, glows green when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png
new file mode 100644
index 0000000..9efc774
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_green/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png
new file mode 100644
index 0000000..6690064
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_green/recipe.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/description.html b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/description.html
new file mode 100644
index 0000000..990b501
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/description.html
@@ -0,0 +1 @@
+Effector, glows light grey when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png
new file mode 100644
index 0000000..0084fa3
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png
new file mode 100644
index 0000000..e790012
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_lightgrey/recipe.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_red/description.html b/mesecons/mesecons_lightstone/doc/lightstone_red/description.html
new file mode 100644
index 0000000..699b1ee
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_red/description.html
@@ -0,0 +1 @@
+Effector, glows red when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png
new file mode 100644
index 0000000..5fd3eba
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_red/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png
new file mode 100644
index 0000000..7791a99
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_red/recipe.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_yellow/description.html b/mesecons/mesecons_lightstone/doc/lightstone_yellow/description.html
new file mode 100644
index 0000000..2bed7f2
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_yellow/description.html
@@ -0,0 +1 @@
+Effector, glows yellow when powered.
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png b/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png
new file mode 100644
index 0000000..fb9f644
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_yellow/preview.png
diff --git a/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png b/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png
new file mode 100644
index 0000000..f17e9d4
--- /dev/null
+++ b/mesecons/mesecons_lightstone/doc/lightstone_yellow/recipe.png
diff --git a/mesecons/mesecons_lightstone/init.lua b/mesecons/mesecons_lightstone/init.lua
new file mode 100644
index 0000000..da7cc41
--- /dev/null
+++ b/mesecons/mesecons_lightstone/init.lua
@@ -0,0 +1,60 @@
+local lightstone_rules = {
+	{x=0,  y=0,  z=-1},
+	{x=1,  y=0,  z=0},
+	{x=-1, y=0,  z=0},
+	{x=0,  y=0,  z=1},
+	{x=1,  y=1,  z=0},
+	{x=1,  y=-1, z=0},
+	{x=-1, y=1,  z=0},
+	{x=-1, y=-1, z=0},
+	{x=0,  y=1,  z=1},
+	{x=0,  y=-1, z=1},
+	{x=0,  y=1,  z=-1},
+	{x=0,  y=-1, z=-1},
+	{x=0,  y=-1, z=0},
+}
+
+function mesecon.lightstone_add(name, base_item, texture_off, texture_on)
+	minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_off", {
+		tiles = {texture_off},
+		groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2},
+		description=name.." Lightstone",
+		sounds = default.node_sound_stone_defaults(),
+		mesecons = {effector = {
+			rules = lightstone_rules,
+			action_on = function (pos, node)
+				minetest.swap_node(pos, {name = "mesecons_lightstone:lightstone_" .. name .. "_on", param2 = node.param2})
+			end,
+		}}
+	})
+	minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
+	tiles = {texture_on},
+	groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
+	drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
+	light_source = default.LIGHT_MAX-2,
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {effector = {
+		rules = lightstone_rules,
+		action_off = function (pos, node)
+			minetest.swap_node(pos, {name = "mesecons_lightstone:lightstone_" .. name .. "_off", param2 = node.param2})
+		end,
+	}}
+	})
+
+	minetest.register_craft({
+		output = "mesecons_lightstone:lightstone_" .. name .. "_off",
+		recipe = {
+			{"",base_item,""},
+			{base_item,"default:torch",base_item},
+			{"","group:mesecon_conductor_craftable",""}
+		}
+	})
+end
+
+
+mesecon.lightstone_add("red", "dye:red", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
+mesecon.lightstone_add("green", "dye:green", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
+mesecon.lightstone_add("blue", "dye:blue", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
+mesecon.lightstone_add("gray", "dye:grey", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
+mesecon.lightstone_add("darkgray", "dye:dark_grey", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")
+mesecon.lightstone_add("yellow", "dye:yellow", "jeija_lightstone_yellow_off.png", "jeija_lightstone_yellow_on.png")
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_off.png
new file mode 100644
index 0000000..09acc22
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_on.png
new file mode 100644
index 0000000..93c8638
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_blue_on.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png
new file mode 100644
index 0000000..7e5aae7
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png
new file mode 100644
index 0000000..e6d4d00
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_off.png
new file mode 100644
index 0000000..f168fc2
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_on.png
new file mode 100644
index 0000000..24c5470
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_gray_on.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_off.png
new file mode 100644
index 0000000..2f214fa
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_on.png
new file mode 100644
index 0000000..225bf4e
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_green_on.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_off.png
new file mode 100644
index 0000000..3c828b2
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_on.png
new file mode 100644
index 0000000..512b0fe
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_red_on.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png
new file mode 100644
index 0000000..2e7fed0
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png
diff --git a/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png b/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png
new file mode 100644
index 0000000..8943aca
--- /dev/null
+++ b/mesecons/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png
diff --git a/mesecons/mesecons_luacontroller/depends.txt b/mesecons/mesecons_luacontroller/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_luacontroller/doc/luacontroller/description.html b/mesecons/mesecons_luacontroller/doc/luacontroller/description.html
new file mode 100644
index 0000000..ca14615
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/doc/luacontroller/description.html
@@ -0,0 +1,5 @@
+The luacontroller is an advanced programmable component.
+You can simply code it in the language mesecons uses itself: Lua!
+All the code runs in a sandbox, so it's completely safe (but I won't guarantee that for absolute certainty!).
+
+<a href="http://mesecons.net/luacontroller/">Documentation is available here!</a>
diff --git a/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png b/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png
new file mode 100644
index 0000000..f16c9d0
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/doc/luacontroller/preview.png
diff --git a/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png b/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png
new file mode 100644
index 0000000..529b66d
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/doc/luacontroller/recipe.png
diff --git a/mesecons/mesecons_luacontroller/init.lua b/mesecons/mesecons_luacontroller/init.lua
new file mode 100644
index 0000000..839d150
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/init.lua
@@ -0,0 +1,642 @@
+--        ______
+--       |
+--       |
+--       |        __       ___  _   __         _  _
+-- |   | |       |  | |\ |  |  |_| |  | |  |  |_ |_|
+-- |___| |______ |__| | \|  |  | \ |__| |_ |_ |_ |\
+-- |
+-- |
+--
+
+-- Reference
+-- ports = get_real_port_states(pos): gets if inputs are powered from outside
+-- newport = merge_port_states(state1, state2): just does result = state1 or state2 for every port
+-- set_port(pos, rule, state): activates/deactivates the mesecons according to the port states
+-- set_port_states(pos, ports): Applies new port states to a LuaController at pos
+-- run(pos): runs the code in the controller at pos
+-- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error messages
+-- resetn(pos): performs a hardware reset, turns off all ports
+--
+-- The Sandbox
+-- The whole code of the controller runs in a sandbox,
+-- a very restricted environment.
+-- However, as this does not prevent you from using e.g. loops,
+-- we need to check for these prohibited commands first.
+-- Actually the only way to damage the server is to
+-- use too much memory from the sandbox.
+-- You can add more functions to the environment
+-- (see where local env is defined)
+-- Something nice to play is is appending minetest.env to it.
+
+local BASENAME = "mesecons_luacontroller:luacontroller"
+
+local rules = {
+	a = {x = -1, y = 0, z =  0, name="A"},
+	b = {x =  0, y = 0, z =  1, name="B"},
+	c = {x =  1, y = 0, z =  0, name="C"},
+	d = {x =  0, y = 0, z = -1, name="D"},
+}
+
+
+------------------
+-- Action stuff --
+------------------
+-- These helpers are required to set the port states of the luacontroller
+
+local function update_real_port_states(pos, rule_name, new_state)
+	local meta = minetest.get_meta(pos)
+	if rule_name == nil then
+		meta:set_int("real_portstates", 1)
+		return
+	end
+	local n = meta:get_int("real_portstates") - 1
+	local L = {}
+	for i = 1, 4 do
+		L[i] = n % 2
+		n = math.floor(n / 2)
+	end
+	--                   (0,-1) (-1,0)      (1,0) (0,1)
+	local pos_to_side = {  4,     1,   nil,   3,    2 }
+	if rule_name.x == nil then
+		for _, rname in ipairs(rule_name) do
+			local port = pos_to_side[rname.x + (2 * rname.z) + 3]
+			L[port] = (newstate == "on") and 1 or 0
+		end
+	else
+		local port = pos_to_side[rule_name.x + (2 * rule_name.z) + 3]
+		L[port] = (new_state == "on") and 1 or 0
+	end
+	meta:set_int("real_portstates",
+		1 +
+		1 * L[1] +
+		2 * L[2] +
+		4 * L[3] +
+		8 * L[4])
+end
+
+
+local port_names = {"a", "b", "c", "d"}
+
+local function get_real_port_states(pos)
+	-- Determine if ports are powered (by itself or from outside)
+	local meta = minetest.get_meta(pos)
+	local L = {}
+	local n = meta:get_int("real_portstates") - 1
+	for _, name in ipairs(port_names) do
+		L[name] = ((n % 2) == 1)
+		n = math.floor(n / 2)
+	end
+	return L
+end
+
+
+local function merge_port_states(ports, vports)
+	return {
+		a = ports.a or vports.a,
+		b = ports.b or vports.b,
+		c = ports.c or vports.c,
+		d = ports.d or vports.d,
+	}
+end
+
+local function generate_name(ports)
+	local d = ports.d and 1 or 0
+	local c = ports.c and 1 or 0
+	local b = ports.b and 1 or 0
+	local a = ports.a and 1 or 0
+	return BASENAME..d..c..b..a
+end
+
+
+local function set_port(pos, rule, state)
+	if state then
+		mesecon.receptor_on(pos, {rule})
+	else
+		mesecon.receptor_off(pos, {rule})
+	end
+end
+
+
+local function clean_port_states(ports)
+	ports.a = ports.a and true or false
+	ports.b = ports.b and true or false
+	ports.c = ports.c and true or false
+	ports.d = ports.d and true or false
+end
+
+
+local function set_port_states(pos, ports)
+	local node = minetest.get_node(pos)
+	local name = node.name
+	clean_port_states(ports)
+	local vports = minetest.registered_nodes[name].virtual_portstates
+	local new_name = generate_name(ports)
+
+	if name ~= new_name and vports then
+		-- Problem:
+		-- We need to place the new node first so that when turning
+		-- off some port, it won't stay on because the rules indicate
+		-- there is an onstate output port there.
+		-- When turning the output off then, it will however cause feedback
+		-- so that the luacontroller will receive an "off" event by turning
+		-- its output off.
+		-- Solution / Workaround:
+		-- Remember which output was turned off and ignore next "off" event.
+		local meta = minetest.get_meta(pos)
+		local ign = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+		if ports.a and not vports.a and not mesecon.is_powered(pos, rules.a) then ign.A = true end
+		if ports.b and not vports.b and not mesecon.is_powered(pos, rules.b) then ign.B = true end
+		if ports.c and not vports.c and not mesecon.is_powered(pos, rules.c) then ign.C = true end
+		if ports.d and not vports.d and not mesecon.is_powered(pos, rules.d) then ign.D = true end
+		meta:set_string("ignore_offevents", minetest.serialize(ign))
+
+		minetest.swap_node(pos, {name = new_name, param2 = node.param2})
+
+		if ports.a ~= vports.a then set_port(pos, rules.a, ports.a) end
+		if ports.b ~= vports.b then set_port(pos, rules.b, ports.b) end
+		if ports.c ~= vports.c then set_port(pos, rules.c, ports.c) end
+		if ports.d ~= vports.d then set_port(pos, rules.d, ports.d) end
+	end
+end
+
+
+-----------------
+-- Overheating --
+-----------------
+local function burn_controller(pos)
+	local node = minetest.get_node(pos)
+	node.name = BASENAME.."_burnt"
+	minetest.swap_node(pos, node)
+	minetest.get_meta(pos):set_string("lc_memory", "");
+	-- Wait for pending operations
+	minetest.after(0.2, mesecon.receptor_off, pos, mesecon.rules.flat)
+end
+
+local function overheat(pos, meta)
+	if mesecon.do_overheat(pos) then -- If too hot
+		burn_controller(pos)
+		return true
+	end
+end
+
+------------------------
+-- Ignored off events --
+------------------------
+
+local function ignore_event(event, meta)
+	if event.type ~= "off" then return false end
+	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+	if ignore_offevents[event.pin.name] then
+		ignore_offevents[event.pin.name] = nil
+		meta:set_string("ignore_offevents", minetest.serialize(ignore_offevents))
+		return true
+	end
+end
+
+-------------------------
+-- Parsing and running --
+-------------------------
+
+local function safe_print(param)
+	print(dump(param))
+end
+
+local function safe_date()
+	return(os.date("*t",os.time()))
+end
+
+local function remove_functions(x)
+	local tp = type(x)
+	if tp == "table" then
+		for key, value in pairs(x) do
+			local key_t, val_t = type(key), type(value)
+			if key_t == "function" or val_t == "function" then
+				x[key] = nil
+			else
+				if key_t == "table" then
+					remove_functions(key)
+				end
+				if val_t == "table" then
+					remove_functions(value)
+				end
+			end
+		end
+	elseif tp == "function" then
+		return nil
+	end
+	return x
+end
+
+local function get_interrupt(pos)
+	-- iid = interrupt id
+	local function interrupt(time, iid)
+		if type(time) ~= "number" then return end
+		local luac_id = minetest.get_meta(pos):get_int("luac_id")
+		mesecon.queue:add_action(pos, "lc_interrupt", {luac_id, iid}, time, iid, 1)
+	end
+	return interrupt
+end
+
+
+local function get_digiline_send(pos)
+	if not digiline then return end
+	return function(channel, msg)
+		minetest.after(0, function()
+			digiline:receptor_send(pos, digiline.rules.default, channel, msg)
+		end)
+	end
+end
+
+
+local safe_globals = {
+	"assert", "error", "ipairs", "next", "pairs", "pcall", "select",
+	"tonumber", "tostring", "type", "unpack", "_VERSION", "xpcall",
+}
+local function create_environment(pos, mem, event)
+	-- Gather variables for the environment
+	local vports = minetest.registered_nodes[minetest.get_node(pos).name].virtual_portstates
+	local vports_copy = {}
+	for k, v in pairs(vports) do vports_copy[k] = v end
+	local rports = get_real_port_states(pos)
+
+	-- Create new library tables on each call to prevent one LuaController
+	-- from breaking a library and messing up other LuaControllers.
+	local env = {
+		pin = merge_port_states(vports, rports),
+		port = vports_copy,
+		event = event,
+		mem = mem,
+		heat = minetest.get_meta(pos):get_int("heat"),
+		heat_max = mesecon.setting("overheat_max", 20),
+		print = safe_print,
+		interrupt = get_interrupt(pos),
+		digiline_send = get_digiline_send(pos),
+		string = {
+			byte = string.byte,
+			char = string.char,
+			format = string.format,
+			gsub = string.gsub,
+			len = string.len,
+			lower = string.lower,
+			upper = string.upper,
+			rep = string.rep,
+			reverse = string.reverse,
+			sub = string.sub,
+		},
+		math = {
+			abs = math.abs,
+			acos = math.acos,
+			asin = math.asin,
+			atan = math.atan,
+			atan2 = math.atan2,
+			ceil = math.ceil,
+			cos = math.cos,
+			cosh = math.cosh,
+			deg = math.deg,
+			exp = math.exp,
+			floor = math.floor,
+			fmod = math.fmod,
+			frexp = math.frexp,
+			huge = math.huge,
+			ldexp = math.ldexp,
+			log = math.log,
+			log10 = math.log10,
+			max = math.max,
+			min = math.min,
+			modf = math.modf,
+			pi = math.pi,
+			pow = math.pow,
+			rad = math.rad,
+			random = math.random,
+			sin = math.sin,
+			sinh = math.sinh,
+			sqrt = math.sqrt,
+			tan = math.tan,
+			tanh = math.tanh,
+		},
+		table = {
+			concat = table.concat,
+			insert = table.insert,
+			maxn = table.maxn,
+			remove = table.remove,
+			sort = table.sort,
+		},
+		os = {
+			clock = os.clock,
+			difftime = os.difftime,
+			time = os.time,
+			datetable = safe_date,
+		},
+	}
+	env._G = env
+
+	for _, name in pairs(safe_globals) do
+		env[name] = _G[name]
+	end
+
+	return env
+end
+
+
+local function timeout()
+	debug.sethook()  -- Clear hook
+	error("Code timed out!")
+end
+
+
+local function code_prohibited(code)
+	-- LuaJIT doesn't increment the instruction counter when running
+	-- loops, so we have to sanitize inputs if we're using LuaJIT.
+	if not jit then
+		return false
+	end
+	local prohibited = {"while", "for", "do", "repeat", "until", "goto"}
+	code = " "..code.." "
+	for _, p in ipairs(prohibited) do
+		if string.find(code, "[^%w_]"..p.."[^%w_]") then
+			return "Prohibited command: "..p
+		end
+	end
+end
+
+
+local function create_sandbox(code, env)
+	if code:byte(1) == 27 then
+		return nil, "Binary code prohibited."
+	end
+	local f, msg = loadstring(code)
+	if not f then return nil, msg end
+	setfenv(f, env)
+
+	return function(...)
+		debug.sethook(timeout, "", 10000)
+		local ok, ret = pcall(f, ...)
+		debug.sethook()  -- Clear hook
+		if not ok then error(ret) end
+		return ret
+	end
+end
+
+
+local function load_memory(meta)
+	return minetest.deserialize(meta:get_string("lc_memory")) or {}
+end
+
+
+local function save_memory(pos, meta, mem)
+	local memstring = minetest.serialize(remove_functions(mem))
+	local memsize_max = mesecon.setting("luacontroller_memsize", 100000)
+
+	if (#memstring <= memsize_max) then
+		meta:set_string("lc_memory", memstring)
+	else
+		print("Error: Luacontroller memory overflow. "..memsize_max.." bytes available, "
+				..#memstring.." required. Controller overheats.")
+		burn_controller(pos)
+	end
+end
+
+
+local function run(pos, event)
+	local meta = minetest.get_meta(pos)
+	if overheat(pos) then return end
+	if ignore_event(event, meta) then return end
+
+	-- Load code & mem from meta
+	local mem  = load_memory(meta)
+	local code = meta:get_string("code")
+
+	local err = code_prohibited(code)
+	if err then return err end
+
+	-- Create environment
+	local env = create_environment(pos, mem, event)
+
+	-- Create the sandbox and execute code
+	local f, msg = create_sandbox(code, env)
+	if not f then return msg end
+	local success, msg = pcall(f)
+	if not success then return msg end
+	if type(env.port) ~= "table" then
+		return "Ports set are invalid."
+	end
+
+	-- Actually set the ports
+	set_port_states(pos, env.port)
+
+	-- Save memory. This may burn the luacontroller if a memory overflow occurs.
+	save_memory(pos, meta, env.mem)
+end
+
+mesecon.queue:add_function("lc_interrupt", function (pos, luac_id, iid)
+	-- There is no luacontroller anymore / it has been reprogrammed / replaced / burnt
+	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end
+	run(pos, {type="interrupt", iid = iid})
+end)
+
+local function reset_meta(pos, code, errmsg)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("code", code)
+	code = minetest.formspec_escape(code or "")
+	errmsg = minetest.formspec_escape(errmsg or "")
+	meta:set_string("formspec", "size[10,8]"..
+		"background[-0.2,-0.25;10.4,8.75;jeija_luac_background.png]"..
+		"textarea[0.2,0.6;10.2,5;code;;"..code.."]"..
+		"image_button[3.75,6;2.5,1;jeija_luac_runbutton.png;program;]"..
+		"image_button_exit[9.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"..
+		"label[0.1,5;"..errmsg.."]")
+	meta:set_int("heat", 0)
+	meta:set_int("luac_id", math.random(1, 65535))
+end
+
+local function reset(pos)
+	set_port_states(pos, {a=false, b=false, c=false, d=false})
+end
+
+
+-----------------------
+-- Node Registration --
+-----------------------
+
+local output_rules = {}
+local input_rules = {}
+
+local node_box = {
+	type = "fixed",
+	fixed = {
+		{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16}, -- Bottom slab
+		{-5/16, -7/16, -5/16, 5/16, -6/16, 5/16}, -- Circuit board
+		{-3/16, -6/16, -3/16, 3/16, -5/16, 3/16}, -- IC
+	}
+}
+
+local selection_box = {
+	type = "fixed",
+	fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
+}
+
+local digiline = {
+	receptor = {},
+	effector = {
+		action = function(pos, node, channel, msg)
+			run(pos, {type = "digiline", channel = channel, msg = msg})
+		end
+	}
+}
+local function on_receive_fields(pos, form_name, fields)
+	if not fields.program then
+		return
+	end
+	reset(pos)
+	reset_meta(pos, fields.code)
+	local err = run(pos, {type="program"})
+	if err then
+		print(err)
+		reset_meta(pos, fields.code, err)
+	end
+end
+
+for a = 0, 1 do -- 0 = off  1 = on
+for b = 0, 1 do
+for c = 0, 1 do
+for d = 0, 1 do
+	local cid = tostring(d)..tostring(c)..tostring(b)..tostring(a)
+	local node_name = BASENAME..cid
+	local top = "jeija_luacontroller_top.png"
+	if a == 1 then
+		top = top.."^jeija_luacontroller_LED_A.png"
+	end
+	if b == 1 then
+		top = top.."^jeija_luacontroller_LED_B.png"
+	end
+	if c == 1 then
+		top = top.."^jeija_luacontroller_LED_C.png"
+	end
+	if d == 1 then
+		top = top.."^jeija_luacontroller_LED_D.png"
+	end
+
+	local groups
+	if a + b + c + d ~= 0 then
+		groups = {dig_immediate=2, not_in_creative_inventory=1, overheat = 1}
+	else
+		groups = {dig_immediate=2, overheat = 1}
+	end
+
+	output_rules[cid] = {}
+	input_rules[cid] = {}
+	if a == 1 then table.insert(output_rules[cid], rules.a) end
+	if b == 1 then table.insert(output_rules[cid], rules.b) end
+	if c == 1 then table.insert(output_rules[cid], rules.c) end
+	if d == 1 then table.insert(output_rules[cid], rules.d) end
+
+	if a == 0 then table.insert( input_rules[cid], rules.a) end
+	if b == 0 then table.insert( input_rules[cid], rules.b) end
+	if c == 0 then table.insert( input_rules[cid], rules.c) end
+	if d == 0 then table.insert( input_rules[cid], rules.d) end
+
+	local mesecons = {
+		effector = {
+			rules = input_rules[cid],
+			action_change = function (pos, _, rule_name, new_state)
+				update_real_port_states(pos, rule_name, new_state)
+				run(pos, {type=new_state, pin=rule_name})
+			end,
+		},
+		receptor = {
+			state = mesecon.state.on,
+			rules = output_rules[cid]
+		}
+	}
+
+	minetest.register_node(node_name, {
+		description = "LuaController",
+		drawtype = "nodebox",
+		tiles = {
+			top,
+			"jeija_microcontroller_bottom.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png"
+		},
+		inventory_image = top,
+		paramtype = "light",
+		groups = groups,
+		drop = BASENAME.."0000",
+		sunlight_propagates = true,
+		selection_box = selection_box,
+		node_box = node_box,
+		on_construct = reset_meta,
+		on_receive_fields = on_receive_fields,
+		sounds = default.node_sound_stone_defaults(),
+		mesecons = mesecons,
+		digiline = digiline,
+		-- Virtual portstates are the ports that
+		-- the node shows as powered up (light up).
+		virtual_portstates = {
+			a = a == 1,
+			b = b == 1,
+			c = c == 1,
+			d = d == 1,
+		},
+		after_dig_node = function (pos, node)
+			mesecon.receptor_off(pos, output_rules)
+		end,
+		is_luacontroller = true,
+	})
+end
+end
+end
+end
+
+------------------------------
+-- Overheated LuaController --
+------------------------------
+
+minetest.register_node(BASENAME .. "_burnt", {
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_luacontroller_burnt_top.png",
+		"jeija_microcontroller_bottom.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png"
+	},
+	inventory_image = "jeija_luacontroller_burnt_top.png",
+	is_burnt = true,
+	paramtype = "light",
+	groups = {dig_immediate=2, not_in_creative_inventory=1},
+	drop = BASENAME.."0000",
+	sunlight_propagates = true,
+	selection_box = selection_box,
+	node_box = node_box,
+	on_construct = reset_meta,
+	on_receive_fields = on_receive_fields,
+	sounds = default.node_sound_stone_defaults(),
+	virtual_portstates = {a = false, b = false, c = false, d = false},
+	mesecons = {
+		effector = {
+			rules = mesecon.rules.flat,
+			action_change = function(pos, _, rule_name, new_state)
+				update_real_port_states(pos, rule_name, new_state)
+			end,
+		},
+	},
+})
+
+------------------------
+-- Craft Registration --
+------------------------
+
+minetest.register_craft({
+	output = BASENAME.."0000 2",
+	recipe = {
+		{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
+		{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
+		{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''},
+	}
+})
+
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luac_background.png b/mesecons/mesecons_luacontroller/textures/jeija_luac_background.png
new file mode 100644
index 0000000..40e316c
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luac_background.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luac_runbutton.png b/mesecons/mesecons_luacontroller/textures/jeija_luac_runbutton.png
new file mode 100644
index 0000000..157507f
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luac_runbutton.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png
new file mode 100644
index 0000000..a187e8e
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png
new file mode 100644
index 0000000..738ba96
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png
new file mode 100644
index 0000000..abe0fe6
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png
new file mode 100644
index 0000000..cc10170
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png
new file mode 100644
index 0000000..d1a17af
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png
diff --git a/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_top.png b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_top.png
new file mode 100644
index 0000000..3128230
--- /dev/null
+++ b/mesecons/mesecons_luacontroller/textures/jeija_luacontroller_top.png
diff --git a/mesecons/mesecons_materials/depends.txt b/mesecons/mesecons_materials/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_materials/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_materials/doc/fiber/description.html b/mesecons/mesecons_materials/doc/fiber/description.html
new file mode 100644
index 0000000..23a414a
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/fiber/description.html
@@ -0,0 +1 @@
+Craftitem: It can't be placed! Made by cooking glue in the furnace. Used for insulated mesecon crafting.
diff --git a/mesecons/mesecons_materials/doc/fiber/preview.png b/mesecons/mesecons_materials/doc/fiber/preview.png
new file mode 100644
index 0000000..cad9645
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/fiber/preview.png
diff --git a/mesecons/mesecons_materials/doc/fiber/recipe.png b/mesecons/mesecons_materials/doc/fiber/recipe.png
new file mode 100644
index 0000000..7a53123
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/fiber/recipe.png
diff --git a/mesecons/mesecons_materials/doc/glue/description.html b/mesecons/mesecons_materials/doc/glue/description.html
new file mode 100644
index 0000000..a18490c
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/glue/description.html
@@ -0,0 +1 @@
+Craftitem: It can't be placed! Made by cooking saplings in furnace. Used for sticky pistons and sticky movestones.
diff --git a/mesecons/mesecons_materials/doc/glue/preview.png b/mesecons/mesecons_materials/doc/glue/preview.png
new file mode 100644
index 0000000..0158f9c
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/glue/preview.png
diff --git a/mesecons/mesecons_materials/doc/glue/recipe.png b/mesecons/mesecons_materials/doc/glue/recipe.png
new file mode 100644
index 0000000..b20ce66
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/glue/recipe.png
diff --git a/mesecons/mesecons_materials/doc/silicon/description.html b/mesecons/mesecons_materials/doc/silicon/description.html
new file mode 100644
index 0000000..a2ae598
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/silicon/description.html
@@ -0,0 +1 @@
+Silicon is just a craftitem: It can't be placed. You'll need it in order to craft other items.
diff --git a/mesecons/mesecons_materials/doc/silicon/preview.png b/mesecons/mesecons_materials/doc/silicon/preview.png
new file mode 100644
index 0000000..cd52dbd
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/silicon/preview.png
diff --git a/mesecons/mesecons_materials/doc/silicon/recipe.png b/mesecons/mesecons_materials/doc/silicon/recipe.png
new file mode 100644
index 0000000..9e8b332
--- /dev/null
+++ b/mesecons/mesecons_materials/doc/silicon/recipe.png
diff --git a/mesecons/mesecons_materials/init.lua b/mesecons/mesecons_materials/init.lua
new file mode 100644
index 0000000..eb19c3e
--- /dev/null
+++ b/mesecons/mesecons_materials/init.lua
@@ -0,0 +1,41 @@
+-- Glue and fiber
+minetest.register_craftitem("mesecons_materials:glue", {
+	image = "mesecons_glue.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+    	description="Glue",
+})
+
+minetest.register_craftitem("mesecons_materials:fiber", {
+	image = "mesecons_fiber.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+    	description="Fiber",
+})
+
+minetest.register_craft({
+	output = "mesecons_materials:glue 2",
+	type = "cooking",
+	recipe = "group:sapling",
+	cooktime = 2
+})
+
+minetest.register_craft({
+	output = "mesecons_materials:fiber 6",
+	type = "cooking",
+	recipe = "mesecons_materials:glue",
+	cooktime = 4
+})
+
+-- Silicon
+minetest.register_craftitem("mesecons_materials:silicon", {
+	image = "mesecons_silicon.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+    	description="Silicon",
+})
+
+minetest.register_craft({
+	output = "mesecons_materials:silicon 4",
+	recipe = {
+		{"group:sand", "group:sand"},
+		{"group:sand", "default:steel_ingot"},
+	}
+})
diff --git a/mesecons/mesecons_materials/textures/mesecons_fiber.png b/mesecons/mesecons_materials/textures/mesecons_fiber.png
new file mode 100644
index 0000000..e8c7b08
--- /dev/null
+++ b/mesecons/mesecons_materials/textures/mesecons_fiber.png
diff --git a/mesecons/mesecons_materials/textures/mesecons_glue.png b/mesecons/mesecons_materials/textures/mesecons_glue.png
new file mode 100644
index 0000000..2f351d1
--- /dev/null
+++ b/mesecons/mesecons_materials/textures/mesecons_glue.png
diff --git a/mesecons/mesecons_materials/textures/mesecons_silicon.png b/mesecons/mesecons_materials/textures/mesecons_silicon.png
new file mode 100644
index 0000000..a7b0d52
--- /dev/null
+++ b/mesecons/mesecons_materials/textures/mesecons_silicon.png
diff --git a/mesecons/mesecons_microcontroller/MeseconMicro.odt b/mesecons/mesecons_microcontroller/MeseconMicro.odt
new file mode 100644
index 0000000..be82d1b
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/MeseconMicro.odt
diff --git a/mesecons/mesecons_microcontroller/MeseconMicro.pdf b/mesecons/mesecons_microcontroller/MeseconMicro.pdf
new file mode 100644
index 0000000..7ab7484
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/MeseconMicro.pdf
diff --git a/mesecons/mesecons_microcontroller/depends.txt b/mesecons/mesecons_microcontroller/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_microcontroller/init.lua b/mesecons/mesecons_microcontroller/init.lua
new file mode 100644
index 0000000..6778a10
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/init.lua
@@ -0,0 +1,692 @@
+EEPROM_SIZE = 255
+
+local microc_rules = {}
+
+for a = 0, 1 do
+for b = 0, 1 do
+for c = 0, 1 do
+for d = 0, 1 do
+local nodename = "mesecons_microcontroller:microcontroller"..tostring(d)..tostring(c)..tostring(b)..tostring(a)
+local top = "jeija_microcontroller_top.png"
+if tostring(a) == "1" then
+	top = top.."^jeija_microcontroller_LED_A.png"
+end
+if tostring(b) == "1" then
+	top = top.."^jeija_microcontroller_LED_B.png"
+end
+if tostring(c) == "1" then
+	top = top.."^jeija_microcontroller_LED_C.png"
+end
+if tostring(d) == "1" then
+	top = top.."^jeija_microcontroller_LED_D.png"
+end
+if tostring(d)..tostring(c)..tostring(b)..tostring(a) ~= "0000" then
+	groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon = 3, overheat = 1}
+else
+	groups = {dig_immediate=2, mesecon = 3, overheat = 1}
+end
+local rules={}
+if (a == 1) then table.insert(rules, {x = -1, y = 0, z =  0}) end
+if (b == 1) then table.insert(rules, {x =  0, y = 0, z =  1}) end
+if (c == 1) then table.insert(rules, {x =  1, y = 0, z =  0}) end
+if (d == 1) then table.insert(rules, {x =  0, y = 0, z = -1}) end
+
+local input_rules={}
+if (a == 0) then table.insert(input_rules, {x = -1, y = 0, z =  0, name = "A"}) end
+if (b == 0) then table.insert(input_rules, {x =  0, y = 0, z =  1, name = "B"}) end
+if (c == 0) then table.insert(input_rules, {x =  1, y = 0, z =  0, name = "C"}) end
+if (d == 0) then table.insert(input_rules, {x =  0, y = 0, z = -1, name = "D"}) end
+microc_rules[nodename] = rules
+
+local mesecons = {effector =
+{
+	rules = input_rules,
+	action_change = function (pos, node, rulename, newstate)
+		yc_update_real_portstates(pos, node, rulename, newstate)
+		update_yc(pos)
+	end
+}}
+if nodename ~= "mesecons_microcontroller:microcontroller0000" then
+	mesecons.receptor = {
+		state = mesecon.state.on,
+		rules = rules
+	}
+end
+
+minetest.register_node(nodename, {
+	description = "Microcontroller",
+	drawtype = "nodebox",
+	tiles = {
+		top,
+		"jeija_microcontroller_bottom.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png",
+		"jeija_microcontroller_sides.png"
+		},
+
+	sunlight_propagates = true,
+	paramtype = "light",
+	walkable = true,
+	groups = groups,
+	drop = "mesecons_microcontroller:microcontroller0000 1",
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
+			{ -5/16, -7/16, -5/16, 5/16, -6/16, 5/16 }, -- circuit board
+			{ -3/16, -6/16, -3/16, 3/16, -5/16, 3/16 }, -- IC
+		}
+	},
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("code", "")
+		meta:set_string("formspec", "size[9,2.5]"..
+			"field[0.256,-0.2;9,2;code;Code:;]"..
+			"button[0  ,0.2;1.5,3;band;AND]"..
+			"button[1.5,0.2;1.5,3;bxor;XOR]"..
+			"button[3  ,0.2;1.5,3;bnot;NOT]"..
+			"button[4.5,0.2;1.5,3;bnand;NAND]"..
+			"button[6  ,0.2;1.5,3;btflop;T-Flop]"..
+			"button[7.5,0.2;1.5,3;brsflop;RS-Flop]"..
+			"button_exit[3.5,1;2,3;program;Program]")
+		meta:set_string("infotext", "Unprogrammed Microcontroller")
+		local r = ""
+		for i=1, EEPROM_SIZE+1 do r=r.."0" end --Generate a string with EEPROM_SIZE*"0"
+		meta:set_string("eeprom", r)
+	end,
+	on_receive_fields = function(pos, formanme, fields, sender)
+		local meta = minetest.get_meta(pos)
+		if fields.band then
+			fields.code = "sbi(C, A&B) :A and B are inputs, C is output"
+		elseif fields.bxor then
+			fields.code = "sbi(C, A~B) :A and B are inputs, C is output"
+		elseif fields.bnot then
+			fields.code = "sbi(B, !A) :A is input, B is output"
+		elseif fields.bnand then
+			fields.code = "sbi(C, !A|!B) :A and B are inputs, C is output"
+		elseif fields.btflop then
+			fields.code = "if(A)sbi(1,1);if(!A&#1)sbi(B,!B)sbi(1,0); if(C)off(B,1); :A is input, B is output (Q), C is reset, toggles with falling edge"
+		elseif fields.brsflop then
+			fields.code = "if(A)on(C);if(B)off(C); :A is S (Set), B is R (Reset), C is output (R dominates)"
+		end
+		if fields.code == nil then return end
+
+		meta:set_string("code", fields.code)
+		meta:set_string("formspec", "size[9,2.5]"..
+		"field[0.256,-0.2;9,2;code;Code:;"..minetest.formspec_escape(fields.code).."]"..
+		"button[0  ,0.2;1.5,3;band;AND]"..
+		"button[1.5,0.2;1.5,3;bxor;XOR]"..
+		"button[3  ,0.2;1.5,3;bnot;NOT]"..
+		"button[4.5,0.2;1.5,3;bnand;NAND]"..
+		"button[6  ,0.2;1.5,3;btflop;T-Flop]"..
+		"button[7.5,0.2;1.5,3;brsflop;RS-Flop]"..
+		"button_exit[3.5,1;2,3;program;Program]")
+		meta:set_string("infotext", "Programmed Microcontroller")
+		yc_reset (pos)
+		update_yc(pos)
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = mesecons,
+	after_dig_node = function (pos, node)
+		rules = microc_rules[node.name]
+		mesecon.receptor_off(pos, rules)
+	end,
+})
+end
+end
+end
+end
+
+minetest.register_craft({
+	output = 'craft "mesecons_microcontroller:microcontroller0000" 2',
+	recipe = {
+		{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
+		{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
+		{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''},
+	}
+})
+
+function yc_reset(pos)
+	yc_action(pos, {a=false, b=false, c=false, d=false})
+	local meta = minetest.get_meta(pos)
+	meta:set_int("afterid", 0)
+	local r = ""
+	for i=1, EEPROM_SIZE+1 do r=r.."0" end --Generate a string with EEPROM_SIZE*"0"
+	meta:set_string("eeprom", r)
+end
+
+function update_yc(pos)
+	local meta = minetest.get_meta(pos)
+
+	if (mesecon.do_overheat(pos)) then
+		minetest.remove_node(pos)
+		minetest.after(0.2, function (pos)
+			mesecon.receptor_off(pos, mesecon.rules.flat)
+		end , pos) -- wait for pending parsings
+		minetest.add_item(pos, "mesecons_microcontroller:microcontroller0000")
+	end
+
+	local code = meta:get_string("code")
+	code = yc_code_remove_commentary(code)
+	code = string.gsub(code, " ", "")	--Remove all spaces
+	code = string.gsub(code, "	", "")	--Remove all tabs
+	if yc_parsecode(code, pos) == nil then
+		meta:set_string("infotext", "Code not valid!\n"..code)
+	else
+		meta:set_string("infotext", "Working Microcontroller\n"..code)
+	end
+end
+
+
+--Code Parsing
+function yc_code_remove_commentary(code)
+	local is_string = false
+	for i = 1, #code do
+		if code:sub(i, i) == '"' then
+			is_string = not is_string --toggle is_string
+		elseif code:sub(i, i) == ":" and not is_string then
+			return code:sub(1, i-1)
+		end
+	end
+	return code
+end
+
+function yc_parsecode(code, pos)
+	local meta = minetest.get_meta(pos)
+	local endi = 1
+	local Lreal = yc_get_real_portstates(pos)
+	local Lvirtual = yc_get_virtual_portstates(pos)
+	if Lvirtual == nil then return nil end
+	local c
+	local eeprom = meta:get_string("eeprom")
+	while true do
+		local command, params
+		command, endi = parse_get_command(code, endi)
+		if command == nil then return nil end
+		if command == true then break end --end of code
+		if command == "if" then
+			local r
+			r, endi = yc_command_if(code, endi, yc_merge_portstates(Lreal, Lvirtual), eeprom)
+			if r == nil then return nil end
+			if r == true then  -- nothing
+			elseif r == false then
+				local endi_new = yc_skip_to_else (code, endi)
+				if endi_new == nil then --else > not found
+					endi = yc_skip_to_endif(code, endi)
+				else
+					endi = endi_new
+				end
+				if endi == nil then return nil end
+			end
+		else
+			params, endi = parse_get_params(code, endi)
+			if not params then return nil end
+		end
+		if command == "on" then
+			L = yc_command_on (params, Lvirtual)
+		elseif command == "off" then
+			L = yc_command_off(params, Lvirtual)
+		elseif command == "print" then
+			local su = yc_command_print(params, eeprom, yc_merge_portstates(Lreal, Lvirtual))
+			if su ~= true then return nil end
+		elseif command == "after" then
+			local su = yc_command_after(params, pos)
+			if su == nil then return nil end
+		elseif command == "sbi" then
+			local new_eeprom
+			new_eeprom, Lvirtual = yc_command_sbi (params, eeprom, yc_merge_portstates(Lreal, Lvirtual), Lvirtual)
+			if new_eeprom == nil then return nil
+			else eeprom = new_eeprom end
+		elseif command == "if" then --nothing
+		else
+			return nil
+		end
+		if Lvirtual == nil then return nil end
+		if eeprom == nil then return nil else
+		minetest.get_meta(pos):set_string("eeprom", eeprom) end
+	end
+	yc_action(pos, Lvirtual)
+	return true
+end
+
+function parse_get_command(code, starti)
+	i = starti
+	local s
+	while s ~= "" do
+		s = string.sub(code, i, i)
+		if s == "(" then
+			return string.sub(code, starti, i-1), i + 1 -- i: ( i+1 after (
+		end
+		if s == ";" and starti == i then
+			starti = starti + 1
+			i = starti
+		elseif s == ">" then
+			starti = yc_skip_to_endif(code, starti)
+			if starti == nil then return nil end
+			i = starti
+		else
+			i = i + 1
+		end
+	end
+
+	if starti == i-1 then
+		return true, true
+	end
+	return nil, nil
+end
+
+function parse_get_params(code, starti)
+	i = starti
+	local s
+	local params = {}
+	local is_string = false
+	while s ~= "" do
+		s = string.sub(code, i, i)
+		if code:sub(i, i) == '"' then
+			is_string = (is_string==false) --toggle is_string
+		end
+		if s == ")" and is_string == false then
+			table.insert(params, string.sub(code, starti, i-1)) -- i: ) i+1 after )
+			return params, i + 1
+		end
+		if s == "," and is_string == false then
+			table.insert(params, string.sub(code, starti, i-1)) -- i: ) i+1 after )
+			starti = i + 1
+		end
+		i = i + 1
+	end
+	return nil, nil
+end
+
+function yc_parse_get_eeprom_param(cond, starti)
+	i = starti
+	local s
+	local addr
+	while s ~= "" do
+		s = string.sub(cond, i, i)
+		if string.find("0123456789", s) == nil or s == "" then
+			addr = string.sub(cond, starti, i-1) -- i: last number i+1 after last number
+			return addr, i
+		end
+		if s == "," then return nil, nil end
+		i = i + 1
+	end
+	return nil, nil
+end
+
+function yc_skip_to_endif(code, starti)
+	local i = starti
+	local s = false
+	local open_ifs = 1
+	while s ~= nil and s~= "" do
+		s = code:sub(i, i)
+		if s == "i" and code:sub(i+1, i+1) == "f" then --if in µCScript
+			open_ifs = open_ifs + 1
+		end
+		if s == ";" then
+			open_ifs = open_ifs - 1
+		end
+		if open_ifs == 0 then
+			return i + 1
+		end
+		i = i + 1
+	end
+	return nil
+end
+
+function yc_skip_to_else(code, starti)
+	local i = starti
+	local s = false
+	local open_ifs = 1
+	while s ~= nil and s~= "" do
+		s = code:sub(i, i)
+		if s == "i" and code:sub(i+1, i+1) == "f" then --if in µCScript
+			open_ifs = open_ifs + 1
+		end
+		if s == ";" then
+			open_ifs = open_ifs - 1
+		end
+		if open_ifs == 1 and s == ">" then
+			return i + 1
+		end
+		i = i + 1
+	end
+	return nil
+end
+
+--Commands
+function yc_command_on(params, L)
+	local rules = {}
+	for i, port in ipairs(params) do
+		L = yc_set_portstate (port, true, L)
+	end
+	return L
+end
+
+function yc_command_off(params, L)
+	local rules = {}
+	for i, port in ipairs(params) do
+		L = yc_set_portstate (port, false, L)
+	end
+	return L
+end
+
+function yc_command_print(params, eeprom, L)
+	local s = ""
+	for i, param in ipairs(params) do
+		if param:sub(1,1) == '"' and param:sub(#param, #param) == '"' then
+			s = s..param:sub(2, #param-1)
+		else
+			r = yc_command_parsecondition(param, L, eeprom)
+			if r == "1" or r == "0" then
+				s = s..r
+			else return nil end
+		end
+	end
+	print(s) --don't remove
+	return true
+end
+
+function yc_command_sbi(params, eeprom, L, Lv)
+	if params[1]==nil or params[2]==nil or params[3] ~=nil then return nil end
+	local status = yc_command_parsecondition(params[2], L, eeprom)
+
+	if status == nil then return nil, nil end
+
+	if string.find("ABCD", params[1])~=nil and #params[1]==1 then --is a port
+		if status == "1" then
+			Lv = yc_set_portstate (params[1], true,  Lv)
+		else
+			Lv = yc_set_portstate (params[1], false, Lv)
+		end
+		return eeprom, Lv;
+	end
+
+	--is an eeprom address
+	local new_eeprom = "";
+	for i=1, #eeprom do
+		if tonumber(params[1])==i then
+			new_eeprom = new_eeprom..status
+		else
+			new_eeprom = new_eeprom..eeprom:sub(i, i)
+		end
+	end
+	return new_eeprom, Lv
+end
+
+-- after (delay)
+function yc_command_after(params, pos)
+	if params[1] == nil or params[2] == nil or params[3] ~= nil then return nil end
+
+	--get time (maximum time is 200)
+	local time = tonumber(params[1])
+	if time == nil or time > 200 then
+		return nil
+	end
+
+	--get code in quotes "code"
+	if string.sub(params[2], 1, 1) ~= '"' or string.sub(params[2], #params[2], #params[2]) ~= '"' then return nil end
+	local code = string.sub(params[2], 2, #params[2] - 1)
+
+	local afterid = math.random(10000)
+	local meta = minetest.get_meta(pos)
+	meta:set_int("afterid", afterid)
+	minetest.after(time, yc_command_after_execute, {pos = pos, code = code, afterid = afterid})
+	return true
+end
+
+function yc_command_after_execute(params)
+	local meta = minetest.get_meta(params.pos)
+	if meta:get_int("afterid") == params.afterid then --make sure the node has not been changed
+		if yc_parsecode(params.code, params.pos) == nil then
+			meta:set_string("infotext", "Code in after() not valid!")
+		else
+			if code ~= nil then
+				meta:set_string("infotext", "Working Microcontroller\n"..code)
+			else
+				meta:set_string("infotext", "Working Microcontroller")
+			end
+		end
+	end
+end
+
+--If
+function yc_command_if(code, starti, L, eeprom)
+	local cond, endi = yc_command_if_getcondition(code, starti)
+	if cond == nil then return nil end
+
+	cond = yc_command_parsecondition(cond, L, eeprom)
+
+	local result
+	if cond == "0" then result = false
+	elseif cond == "1" then result = true end
+	if not result then end
+	return result, endi --endi from local cond, endi = yc_command_if_getcondition(code, starti)
+end
+
+--Condition parsing
+function yc_command_if_getcondition(code, starti)
+	i = starti
+	local s
+	local brackets = 1 --1 Bracket to close
+	while s ~= "" do
+		s = string.sub(code, i, i)
+
+		if s == ")" then
+			brackets = brackets - 1
+		end
+
+		if s == "(" then
+			brackets = brackets + 1
+		end
+
+		if brackets == 0 then
+			return string.sub(code, starti, i-1), i + 1 -- i: ( i+1 after (
+		end
+
+		i = i + 1
+	end
+	return nil, nil
+end
+
+function yc_command_parsecondition(cond, L, eeprom)
+	cond = string.gsub(cond, "A", tonumber(L.a and 1 or 0))
+	cond = string.gsub(cond, "B", tonumber(L.b and 1 or 0))
+	cond = string.gsub(cond, "C", tonumber(L.c and 1 or 0))
+	cond = string.gsub(cond, "D", tonumber(L.d and 1 or 0))
+
+
+	local i = 1
+	local l = string.len(cond)
+	while i<=l do
+		local s = cond:sub(i,i)
+		if s == "#" then
+			local addr, endi = yc_parse_get_eeprom_param(cond, i+1)
+			local buf = yc_eeprom_read(tonumber(addr), eeprom)
+			if buf == nil then return nil end
+			local call = cond:sub(i, endi-1)
+			cond = string.gsub(cond, call, buf)
+			i = 0
+			l = string.len(cond)
+		end
+		i = i + 1
+	end
+
+	cond = string.gsub(cond, "!0", "1")
+	cond = string.gsub(cond, "!1", "0")
+
+	local i = 2
+	local l = string.len(cond)
+	while i<=l do
+		local s = cond:sub(i,i)
+		local b = tonumber(cond:sub(i-1, i-1))
+		local a = tonumber(cond:sub(i+1, i+1))
+		if cond:sub(i+1, i+1) == nil then break end
+		if s == "=" then
+			if a==nil then return nil end
+			if b==nil then return nil end
+			if a == b  then buf = "1" end
+			if a ~= b then buf = "0" end
+			cond = string.gsub(cond, b..s..a, buf)
+			i = 1
+			l = string.len(cond)
+		end
+		i = i + 1
+	end
+
+	local i = 2
+	local l = string.len(cond)
+	while i<=l do
+		local s = cond:sub(i,i)
+		local b = tonumber(cond:sub(i-1, i-1))
+		local a = tonumber(cond:sub(i+1, i+1))
+		if cond:sub(i+1, i+1) == nil then break end
+		if s == "&" then
+			if a==nil then return nil end
+			local buf = ((a==1) and (b==1))
+			if buf == true  then buf = "1" end
+			if buf == false then buf = "0" end
+			cond = string.gsub(cond, b..s..a, buf)
+			i = 1
+			l = string.len(cond)
+		end
+		if s == "|" then
+			if a==nil then return nil end
+			local buf = ((a == 1) or (b == 1))
+			if buf == true  then buf = "1" end
+			if buf == false then buf = "0" end
+			cond = string.gsub(cond, b..s..a, buf)
+			i = 1
+			l = string.len(cond)
+		end
+		if s == "~" then
+			if a==nil then return nil end
+			local buf = (((a == 1) or (b == 1)) and not((a==1) and (b==1)))
+			if buf == true  then buf = "1" end
+			if buf == false then buf = "0" end
+			cond = string.gsub(cond, b..s..a, buf)
+			i = 1
+			l = string.len(cond)
+		end
+		i = i + 1
+	end
+
+	return cond
+end
+
+--Virtual-Hardware functions
+function yc_eeprom_read(number, eeprom)
+	if not number then return end
+	return eeprom:sub(number, number)
+end
+
+--Real I/O functions
+function yc_action(pos, L) --L-->Lvirtual
+	local Lv = yc_get_virtual_portstates(pos)
+	local name = "mesecons_microcontroller:microcontroller"
+		..tonumber(L.d and 1 or 0)
+		..tonumber(L.c and 1 or 0)
+		..tonumber(L.b and 1 or 0)
+		..tonumber(L.a and 1 or 0)
+	local node = minetest.get_node(pos)
+	minetest.swap_node(pos, {name = name, param2 = node.param2})
+
+	yc_action_setports(pos, L, Lv)
+end
+
+function yc_action_setports(pos, L, Lv)
+	local name = "mesecons_microcontroller:microcontroller"
+	local rules
+	if Lv.a ~= L.a then
+		rules = microc_rules[name.."0001"]
+		if L.a == true then mesecon.receptor_on(pos, rules)
+		else mesecon.receptor_off(pos, rules) end
+	end
+	if Lv.b ~= L.b then
+		rules = microc_rules[name.."0010"]
+		if L.b == true then mesecon.receptor_on(pos, rules)
+		else mesecon.receptor_off(pos, rules) end
+	end
+	if Lv.c ~= L.c then
+		rules = microc_rules[name.."0100"]
+		if L.c == true then mesecon.receptor_on(pos, rules)
+		else mesecon.receptor_off(pos, rules) end
+	end
+	if Lv.d ~= L.d then
+		rules = microc_rules[name.."1000"]
+		if L.d == true then mesecon.receptor_on(pos, rules)
+		else mesecon.receptor_off(pos, rules) end
+	end
+end
+
+function yc_set_portstate(port, state, L)
+	if port == "A" then L.a = state
+	elseif port == "B" then L.b = state
+	elseif port == "C" then L.c = state
+	elseif port == "D" then L.d = state
+	else return nil end
+	return L
+end
+
+function yc_update_real_portstates(pos, node, rulename, newstate)
+	local meta = minetest.get_meta(pos)
+	if rulename == nil then
+		meta:set_int("real_portstates", 1)
+		return
+	end
+	local n = meta:get_int("real_portstates") - 1
+	local L = {}
+	for i = 1, 4 do
+		L[i] = n%2
+		n = math.floor(n/2)
+	end
+	if rulename.x == nil then
+		for _, rname in ipairs(rulename) do
+			local port = ({4, 1, nil, 3, 2})[rname.x+2*rname.z+3]
+			L[port] = (newstate == "on") and 1 or 0
+		end
+	else
+		local port = ({4, 1, nil, 3, 2})[rulename.x+2*rulename.z+3]
+		L[port] = (newstate == "on") and 1 or 0
+	end
+	meta:set_int("real_portstates", 1 + L[1] + 2*L[2] + 4*L[3] + 8*L[4])
+end
+
+function yc_get_real_portstates(pos) -- determine if ports are powered (by itself or from outside)
+	local meta = minetest.get_meta(pos)
+	local L = {}
+	local n = meta:get_int("real_portstates") - 1
+	for _, index in ipairs({"a", "b", "c", "d"}) do
+		L[index] = ((n%2) == 1)
+		n = math.floor(n/2)
+	end
+	return L
+end
+
+function yc_get_virtual_portstates(pos) -- portstates according to the name
+	local name = minetest.get_node(pos).name
+	local b, a = string.find(name, ":microcontroller")
+	if a == nil then return nil end
+	a = a + 1
+
+	local Lvirtual = {a=false, b=false, c=false, d=false}
+	if name:sub(a  , a  ) == "1" then Lvirtual.d = true end
+	if name:sub(a+1, a+1) == "1" then Lvirtual.c = true end
+	if name:sub(a+2, a+2) == "1" then Lvirtual.b = true end
+	if name:sub(a+3, a+3) == "1" then Lvirtual.a = true end
+	return Lvirtual
+end
+
+function yc_merge_portstates(Lreal, Lvirtual)
+	local L = {a=false, b=false, c=false, d=false}
+	if Lvirtual.a or Lreal.a then L.a = true end
+	if Lvirtual.b or Lreal.b then L.b = true end
+	if Lvirtual.c or Lreal.c then L.c = true end
+	if Lvirtual.d or Lreal.d then L.d = true end
+	return L
+end
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png
new file mode 100644
index 0000000..64526cf
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png
new file mode 100644
index 0000000..1f7b451
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png
new file mode 100644
index 0000000..399cc2c
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png
new file mode 100644
index 0000000..506389c
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png
new file mode 100644
index 0000000..3a9161e
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_sides.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_sides.png
new file mode 100644
index 0000000..b367644
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_sides.png
diff --git a/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_top.png b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_top.png
new file mode 100644
index 0000000..438c934
--- /dev/null
+++ b/mesecons/mesecons_microcontroller/textures/jeija_microcontroller_top.png
diff --git a/mesecons/mesecons_movestones/depends.txt b/mesecons/mesecons_movestones/depends.txt
new file mode 100644
index 0000000..a596cf8
--- /dev/null
+++ b/mesecons/mesecons_movestones/depends.txt
@@ -0,0 +1,3 @@
+mesecons
+mesecons_materials
+mesecons_mvps
diff --git a/mesecons/mesecons_movestones/doc/movestone/description.html b/mesecons/mesecons_movestones/doc/movestone/description.html
new file mode 100644
index 0000000..8555a9e
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone/description.html
@@ -0,0 +1 @@
+Movestones are effectors that push the blocks in front of them. They move along on the right side of a mesecon wire track.
diff --git a/mesecons/mesecons_movestones/doc/movestone/preview.png b/mesecons/mesecons_movestones/doc/movestone/preview.png
new file mode 100644
index 0000000..bda64db
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone/preview.png
diff --git a/mesecons/mesecons_movestones/doc/movestone/recipe.png b/mesecons/mesecons_movestones/doc/movestone/recipe.png
new file mode 100644
index 0000000..f3d45df
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone/recipe.png
diff --git a/mesecons/mesecons_movestones/doc/movestone_sticky/description.html b/mesecons/mesecons_movestones/doc/movestone_sticky/description.html
new file mode 100644
index 0000000..460c277
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone_sticky/description.html
@@ -0,0 +1 @@
+Movestones are effectors that push the blocks in front of them. They move along on the right side of a mesecon wire track. Sticky ones also pull blocks.
diff --git a/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png b/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png
new file mode 100644
index 0000000..85f9213
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone_sticky/preview.png
diff --git a/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png b/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png
new file mode 100644
index 0000000..bbf0a94
--- /dev/null
+++ b/mesecons/mesecons_movestones/doc/movestone_sticky/recipe.png
diff --git a/mesecons/mesecons_movestones/init.lua b/mesecons/mesecons_movestones/init.lua
new file mode 100644
index 0000000..52a5605
--- /dev/null
+++ b/mesecons/mesecons_movestones/init.lua
@@ -0,0 +1,156 @@
+-- MOVESTONE
+-- Non-sticky:
+-- Moves along mesecon lines
+-- Pushes all blocks in front of it
+--
+-- Sticky one
+-- Moves along mesecon lines
+-- Pushes all block in front of it
+-- Pull all blocks in its back
+
+function mesecon.get_movestone_direction(pos)
+	local lpos
+	local rules = {
+		{x=0,  y=1,  z=-1},
+		{x=0,  y=0,  z=-1},
+		{x=0,  y=-1, z=-1},
+		{x=0,  y=1,  z=1},
+		{x=0,  y=-1, z=1},
+		{x=0,  y=0,  z=1},
+		{x=1,  y=0,  z=0},
+		{x=1,  y=1,  z=0},
+		{x=1,  y=-1, z=0},
+		{x=-1, y=1,  z=0},
+		{x=-1, y=-1, z=0},
+		{x=-1, y=0,  z=0}}
+
+	lpos = {x=pos.x+1, y=pos.y, z=pos.z}
+	for n = 1, 3 do
+		if mesecon.is_power_on(lpos, rules[n].x, rules[n].y, rules[n].z) then
+			return {x=0, y=0, z=-1}
+		end
+	end
+
+	lpos = {x = pos.x-1, y = pos.y, z = pos.z}
+	for n=4, 6 do
+		if mesecon.is_power_on(lpos, rules[n].x, rules[n].y, rules[n].z) then
+			return {x=0, y=0, z=1}
+		end
+	end
+
+	lpos = {x = pos.x, y = pos.y, z = pos.z+1}
+	for n=7, 9 do
+		if mesecon.is_power_on(lpos, rules[n].x, rules[n].y, rules[n].z) then
+			return {x=-1, y=0, z=0}
+		end
+	end
+
+	lpos = {x = pos.x, y = pos.y, z = pos.z-1}
+	for n=10, 12 do
+		if mesecon.is_power_on(lpos, rules[n].x, rules[n].y, rules[n].z) then
+			return {x=1, y=0, z=0}
+		end
+	end
+end
+
+function mesecon.register_movestone(name, def, is_sticky)
+	local timer_interval = 1 / mesecon.setting("movestone_speed", 3)
+	local name_active = name.."_active"
+
+	local function movestone_move (pos)
+		if minetest.get_node(pos).name ~= name_active then
+			return
+		end
+
+		local direction = mesecon.get_movestone_direction(pos)
+		if not direction then
+			minetest.set_node(pos, {name = name})
+			return
+		end
+		local frontpos = vector.add(pos, direction)
+		local backpos = vector.subtract(pos, direction)
+
+		-- ### Step 1: Push nodes in front ###
+		local maxpush = mesecon.setting("movestone_max_push", 50)
+		local maxpull = mesecon.setting("movestone_max_pull", 50)
+		local success, stack, oldstack = mesecon.mvps_push(frontpos, direction, maxpush)
+		if success then
+			mesecon.mvps_process_stack(stack)
+			mesecon.mvps_move_objects(frontpos, direction, oldstack)
+		-- Too large stack/stopper in the way: try again very soon
+		else
+			minetest.after(0.05, movestone_move, pos)
+			return
+		end
+
+		-- ### Step 2: Move the movestone ###
+		local node = minetest.get_node(pos)
+		minetest.set_node(frontpos, node)
+		minetest.remove_node(pos)
+		mesecon.on_dignode(pos, node)
+		mesecon.on_placenode(frontpos, node)
+		minetest.after(timer_interval, movestone_move, frontpos)
+
+		-- ### Step 3: If sticky, pull stack behind ###
+		if is_sticky then
+			mesecon.mvps_pull_all(backpos, direction, maxpull)
+		end
+	end
+
+	def.mesecons = {effector = {
+		action_on = function (pos)
+			if minetest.get_node(pos).name ~= name_active then
+				minetest.set_node(pos, {name = name_active})
+				movestone_move(pos)
+			end
+		end,
+		action_off = function (pos)
+			minetest.set_node(pos, {name = name})
+		end
+	}}
+
+	def.drop = name
+
+	minetest.register_node(name, def)
+
+	-- active node only
+	local def_active = table.copy(def)
+	def_active.groups.not_in_creative_inventory = 1
+	minetest.register_node(name_active, def_active)
+end
+
+mesecon.register_movestone("mesecons_movestones:movestone", {
+	tiles = {"jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_movestone_arrows.png", "jeija_movestone_arrows.png"},
+	groups = {cracky=3},
+    	description="Movestone",
+	sounds = default.node_sound_stone_defaults()
+}, false)
+
+minetest.register_craft({
+	output = "mesecons_movestones:movestone 2",
+	recipe = {
+		{"default:stone", "default:stone", "default:stone"},
+		{"group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable"},
+		{"default:stone", "default:stone", "default:stone"},
+	}
+})
+
+-- STICKY_MOVESTONE
+mesecon.register_movestone("mesecons_movestones:sticky_movestone", {
+	tiles = {"jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_movestone_side.png", "jeija_sticky_movestone.png", "jeija_sticky_movestone.png"},
+	inventory_image = minetest.inventorycube("jeija_sticky_movestone.png", "jeija_movestone_side.png", "jeija_movestone_side.png"),
+	groups = {cracky=3},
+    	description="Sticky Movestone",
+	sounds = default.node_sound_stone_defaults(),
+}, true)
+
+minetest.register_craft({
+	output = "mesecons_movestones:sticky_movestone 2",
+	recipe = {
+		{"mesecons_materials:glue", "mesecons_movestones:movestone", "mesecons_materials:glue"},
+	}
+})
+
+-- Don't allow pushing movestones while they're active
+mesecon.register_mvps_stopper("mesecons_movestones:movestone_active")
+mesecon.register_mvps_stopper("mesecons_movestones:sticky_movestone_active")
diff --git a/mesecons/mesecons_movestones/textures/jeija_movestone_arrows.png b/mesecons/mesecons_movestones/textures/jeija_movestone_arrows.png
new file mode 100644
index 0000000..358c357
--- /dev/null
+++ b/mesecons/mesecons_movestones/textures/jeija_movestone_arrows.png
diff --git a/mesecons/mesecons_movestones/textures/jeija_movestone_side.png b/mesecons/mesecons_movestones/textures/jeija_movestone_side.png
new file mode 100644
index 0000000..de753ef
--- /dev/null
+++ b/mesecons/mesecons_movestones/textures/jeija_movestone_side.png
diff --git a/mesecons/mesecons_movestones/textures/jeija_sticky_movestone.png b/mesecons/mesecons_movestones/textures/jeija_sticky_movestone.png
new file mode 100644
index 0000000..8953cf1
--- /dev/null
+++ b/mesecons/mesecons_movestones/textures/jeija_sticky_movestone.png
diff --git a/mesecons/mesecons_mvps/depends.txt b/mesecons/mesecons_mvps/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_mvps/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_mvps/init.lua b/mesecons/mesecons_mvps/init.lua
new file mode 100644
index 0000000..beec94b
--- /dev/null
+++ b/mesecons/mesecons_mvps/init.lua
@@ -0,0 +1,238 @@
+--register stoppers for movestones/pistons
+
+mesecon.mvps_stoppers = {}
+mesecon.on_mvps_move = {}
+mesecon.mvps_unmov = {}
+
+--- Objects (entities) that cannot be moved
+function mesecon.register_mvps_unmov(objectname)
+	mesecon.mvps_unmov[objectname] = true;
+end
+
+function mesecon.is_mvps_unmov(objectname)
+	return mesecon.mvps_unmov[objectname]
+end
+
+-- Nodes that cannot be pushed / pulled by movestones, pistons
+function mesecon.is_mvps_stopper(node, pushdir, stack, stackid)
+	local get_stopper = mesecon.mvps_stoppers[node.name]
+	if type (get_stopper) == "function" then
+		get_stopper = get_stopper(node, pushdir, stack, stackid)
+	end
+	return get_stopper
+end
+
+function mesecon.register_mvps_stopper(nodename, get_stopper)
+	if get_stopper == nil then
+			get_stopper = true
+	end
+	mesecon.mvps_stoppers[nodename] = get_stopper
+end
+
+-- Functions to be called on mvps movement
+function mesecon.register_on_mvps_move(callback)
+	mesecon.on_mvps_move[#mesecon.on_mvps_move+1] = callback
+end
+
+local function on_mvps_move(moved_nodes)
+	for _, callback in ipairs(mesecon.on_mvps_move) do
+		callback(moved_nodes)
+	end
+end
+
+function mesecon.mvps_process_stack(stack)
+	-- update mesecons for placed nodes ( has to be done after all nodes have been added )
+	for _, n in ipairs(stack) do
+		mesecon.on_placenode(n.pos, minetest.get_node(n.pos))
+	end
+end
+
+function mesecon.mvps_get_stack(pos, dir, maximum, all_pull_sticky)
+	-- determine the number of nodes to be pushed
+	local nodes = {}
+	local frontiers = {pos}
+
+	while #frontiers > 0 do
+		local np = frontiers[1]
+		local nn = minetest.get_node(np)
+
+		if nn.name ~= "air"
+		and minetest.registered_nodes[nn.name]
+		and minetest.registered_nodes[nn.name].liquidtype == "none" then
+			table.insert(nodes, {node = nn, pos = np})
+			if #nodes > maximum then return nil end
+
+			-- add connected nodes to frontiers, connected is a vector list
+			-- the vectors must be absolute positions
+			local connected = {}
+			if minetest.registered_nodes[nn.name]
+			and minetest.registered_nodes[nn.name].mvps_sticky then
+				connected = minetest.registered_nodes[nn.name].mvps_sticky(np, nn)
+			end
+
+			table.insert(connected, vector.add(np, dir))
+
+			-- If adjacent node is sticky block and connects add that
+			-- position to the connected table
+			for _, r in ipairs(mesecon.rules.alldirs) do
+				local adjpos = vector.add(np, r)
+				local adjnode = minetest.get_node(adjpos)
+				if minetest.registered_nodes[adjnode.name]
+				and minetest.registered_nodes[adjnode.name].mvps_sticky then
+					local sticksto = minetest.registered_nodes[adjnode.name]
+						.mvps_sticky(adjpos, adjnode)
+
+					-- connects to this position?
+					for _, link in ipairs(sticksto) do
+						if vector.equals(link, np) then
+							table.insert(connected, adjpos)
+						end
+					end
+				end
+			end
+
+			if all_pull_sticky then
+				table.insert(connected, vector.subtract(np, dir))
+			end
+
+			-- Make sure there are no duplicates in frontiers / nodes before
+			-- adding nodes in "connected" to frontiers
+			for _, cp in ipairs(connected) do
+				local duplicate = false
+				for _, rp in ipairs(nodes) do
+					if vector.equals(cp, rp.pos) then
+						duplicate = true
+					end
+				end
+				for _, fp in ipairs(frontiers) do
+					if vector.equals(cp, fp) then
+						duplicate = true
+					end
+				end
+				if not duplicate then
+					table.insert(frontiers, cp)
+				end
+			end
+		end
+		table.remove(frontiers, 1)
+	end
+
+	return nodes
+end
+
+function mesecon.mvps_push(pos, dir, maximum)
+	return mesecon.mvps_push_or_pull(pos, dir, dir, maximum)
+end
+
+function mesecon.mvps_pull_all(pos, dir, maximum)
+	return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum, true)
+end
+
+function mesecon.mvps_pull_single(pos, dir, maximum)
+	return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum)
+end
+
+-- pos: pos of mvps; stackdir: direction of building the stack
+-- movedir: direction of actual movement
+-- maximum: maximum nodes to be pushed
+-- all_pull_sticky: All nodes are sticky in the direction that they are pulled from
+function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, all_pull_sticky)
+	local nodes = mesecon.mvps_get_stack(pos, movedir, maximum, all_pull_sticky)
+
+	if not nodes then return end
+	-- determine if one of the nodes blocks the push / pull
+	for id, n in ipairs(nodes) do
+		if mesecon.is_mvps_stopper(n.node, movedir, nodes, id) then
+			return
+		end
+	end
+
+	-- remove all nodes
+	for _, n in ipairs(nodes) do
+		n.meta = minetest.get_meta(n.pos):to_table()
+		minetest.remove_node(n.pos)
+	end
+
+	-- update mesecons for removed nodes ( has to be done after all nodes have been removed )
+	for _, n in ipairs(nodes) do
+		mesecon.on_dignode(n.pos, n.node)
+	end
+
+	-- add nodes
+	for _, n in ipairs(nodes) do
+		local np = mesecon.addPosRule(n.pos, movedir)
+
+		minetest.add_node(np, n.node)
+		minetest.get_meta(np):from_table(n.meta)
+	end
+
+	local moved_nodes = {}
+	local oldstack = mesecon.tablecopy(nodes)
+	for i in ipairs(nodes) do
+		moved_nodes[i] = {}
+		moved_nodes[i].oldpos = nodes[i].pos
+		nodes[i].pos = mesecon.addPosRule(nodes[i].pos, movedir)
+		moved_nodes[i].pos = nodes[i].pos
+		moved_nodes[i].node = nodes[i].node
+		moved_nodes[i].meta = nodes[i].meta
+	end
+
+	on_mvps_move(moved_nodes)
+
+	return true, nodes, oldstack
+end
+
+mesecon.register_on_mvps_move(function(moved_nodes)
+	for _, n in ipairs(moved_nodes) do
+		mesecon.on_placenode(n.pos, n.node)
+		mesecon.update_autoconnect(n.pos)
+	end
+end)
+
+function mesecon.mvps_move_objects(pos, dir, nodestack)
+	local objects_to_move = {}
+
+	-- Move object at tip of stack
+	local pushpos = mesecon.addPosRule(pos, -- get pos at tip of stack
+		{x = dir.x * #nodestack,
+		 y = dir.y * #nodestack,
+		 z = dir.z * #nodestack})
+
+
+	local objects = minetest.get_objects_inside_radius(pushpos, 1)
+	for _, obj in ipairs(objects) do
+		table.insert(objects_to_move, obj)
+	end
+
+	-- Move objects lying/standing on the stack (before it was pushed - oldstack)
+	if tonumber(minetest.setting_get("movement_gravity")) > 0 and dir.y == 0 then
+		-- If gravity positive and dir horizontal, push players standing on the stack
+		for _, n in ipairs(nodestack) do
+			local p_above = mesecon.addPosRule(n.pos, {x=0, y=1, z=0})
+			local objects = minetest.get_objects_inside_radius(p_above, 1)
+			for _, obj in ipairs(objects) do
+				table.insert(objects_to_move, obj)
+			end
+		end
+	end
+
+	for _, obj in ipairs(objects_to_move) do
+		local entity = obj:get_luaentity()
+		if not entity or not mesecon.is_mvps_unmov(entity.name) then
+			local np = mesecon.addPosRule(obj:getpos(), dir)
+
+			--move only if destination is not solid
+			local nn = minetest.get_node(np)
+			if not ((not minetest.registered_nodes[nn.name])
+			or minetest.registered_nodes[nn.name].walkable) then
+				obj:setpos(np)
+			end
+		end
+	end
+end
+
+mesecon.register_mvps_stopper("doors:door_steel_b_1")
+mesecon.register_mvps_stopper("doors:door_steel_t_1")
+mesecon.register_mvps_stopper("doors:door_steel_b_2")
+mesecon.register_mvps_stopper("doors:door_steel_t_2")
+mesecon.register_mvps_stopper("default:chest_locked")
diff --git a/mesecons/mesecons_noteblock/depends.txt b/mesecons/mesecons_noteblock/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_noteblock/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_noteblock/doc/noteblock/description.html b/mesecons/mesecons_noteblock/doc/noteblock/description.html
new file mode 100644
index 0000000..729bfe1
--- /dev/null
+++ b/mesecons/mesecons_noteblock/doc/noteblock/description.html
@@ -0,0 +1,13 @@
+This effector makes a sound if powered and can be used for making music. Normally it makes piano sounds. The sound frequency can be changed by punching the block. There are some special sounds that depend on the block below:
+<table colspace="5">
+<tr><th>Block Below</th><th>Effect</th></tr>
+<tr><td>Glass</td><td>Hihat</td></tr>
+<tr><td>Stone</td><td>Kick</td></tr>
+<tr><td>Chest</td><td>Snare</td></tr>
+<tr><td>Tree</td><td>Crash</td></tr>
+<tr><td>Glass</td><td>Hihat</td></tr>
+<tr><td>Wood</td><td>Lite Crash</td></tr>
+<tr><td>Coal Block</td><td>Explosion Sound </td></tr>
+<tr><td>Lava Source</td><td>Fire Sound</td></tr>
+<tr><td>Steel Block</td><td>Raises the pitch by one octave</td></tr>
+</table>
diff --git a/mesecons/mesecons_noteblock/doc/noteblock/preview.png b/mesecons/mesecons_noteblock/doc/noteblock/preview.png
new file mode 100644
index 0000000..c4991fb
--- /dev/null
+++ b/mesecons/mesecons_noteblock/doc/noteblock/preview.png
diff --git a/mesecons/mesecons_noteblock/doc/noteblock/recipe.png b/mesecons/mesecons_noteblock/doc/noteblock/recipe.png
new file mode 100644
index 0000000..d3c3675
--- /dev/null
+++ b/mesecons/mesecons_noteblock/doc/noteblock/recipe.png
diff --git a/mesecons/mesecons_noteblock/init.lua b/mesecons/mesecons_noteblock/init.lua
new file mode 100644
index 0000000..d5e49ff
--- /dev/null
+++ b/mesecons/mesecons_noteblock/init.lua
@@ -0,0 +1,69 @@
+minetest.register_node("mesecons_noteblock:noteblock", {
+	description = "Noteblock",
+	tiles = {"mesecons_noteblock.png"},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
+	on_punch = function(pos, node) -- change sound when punched
+		node.param2 = (node.param2+1)%12
+		mesecon.noteblock_play(pos, node.param2)
+		minetest.add_node(pos, node)
+	end,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector = { -- play sound when activated
+		action_on = function(pos, node)
+			mesecon.noteblock_play(pos, node.param2)
+		end
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_noteblock:noteblock 1",
+	recipe = {
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
+		{"group:wood", "group:wood", "group:wood"},
+	}
+})
+
+local soundnames = {
+	[0] = "mesecons_noteblock_csharp",
+	"mesecons_noteblock_d",
+	"mesecons_noteblock_dsharp",
+	"mesecons_noteblock_e",
+	"mesecons_noteblock_f",
+	"mesecons_noteblock_fsharp",
+	"mesecons_noteblock_g",
+	"mesecons_noteblock_gsharp",
+
+	"mesecons_noteblock_a",
+	"mesecons_noteblock_asharp",
+	"mesecons_noteblock_b",
+	"mesecons_noteblock_c"
+}
+
+local node_sounds = {
+	["default:glass"] = "mesecons_noteblock_hihat",
+	["default:stone"] = "mesecons_noteblock_kick",
+	["default:lava_source"] = "fire_large",
+	["default:chest"] = "mesecons_noteblock_snare",
+	["default:tree"] = "mesecons_noteblock_crash",
+	["default:wood"] = "mesecons_noteblock_litecrash",
+	["default:coalblock"] = "tnt_explode",
+}
+
+mesecon.noteblock_play = function(pos, param2)
+	pos.y = pos.y-1
+	local nodeunder = minetest.get_node(pos).name
+	local soundname = node_sounds[nodeunder]
+	if not soundname then
+		soundname = soundnames[param2]
+		if not soundname then
+			minetest.log("error", "[mesecons_noteblock] No soundname found, test param2")
+			return
+		end
+		if nodeunder == "default:steelblock" then
+			soundname = soundname.. 2
+		end
+	end
+	pos.y = pos.y+1
+	minetest.sound_play(soundname, {pos = pos})
+end
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a.ogg
new file mode 100644
index 0000000..331fc1c
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a2.ogg
new file mode 100644
index 0000000..695b0f4
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_a2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp.ogg
new file mode 100644
index 0000000..db96aed
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp2.ogg
new file mode 100644
index 0000000..27bd09d
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_asharp2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b.ogg
new file mode 100644
index 0000000..810fe18
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b2.ogg
new file mode 100644
index 0000000..3de1250
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_b2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c.ogg
new file mode 100644
index 0000000..5c60d31
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c2.ogg
new file mode 100644
index 0000000..724db7d
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_c2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg
new file mode 100644
index 0000000..0308d11
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_crash.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp.ogg
new file mode 100644
index 0000000..12c1ef3
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp2.ogg
new file mode 100644
index 0000000..fc7f6c8
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_csharp2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d.ogg
new file mode 100644
index 0000000..929b7fb
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d2.ogg
new file mode 100644
index 0000000..dfd702b
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_d2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp.ogg
new file mode 100644
index 0000000..eb6045d
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp2.ogg
new file mode 100644
index 0000000..5ac16dd
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_dsharp2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e.ogg
new file mode 100644
index 0000000..94977e0
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e2.ogg
new file mode 100644
index 0000000..1dcc0c4
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_e2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f.ogg
new file mode 100644
index 0000000..221d926
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f2.ogg
new file mode 100644
index 0000000..acf10db
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_f2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp.ogg
new file mode 100644
index 0000000..7af83a8
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp2.ogg
new file mode 100644
index 0000000..a96f637
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_fsharp2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g.ogg
new file mode 100644
index 0000000..480ca36
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g2.ogg
new file mode 100644
index 0000000..917b2b9
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_g2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp.ogg
new file mode 100644
index 0000000..2e71fea
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp2.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp2.ogg
new file mode 100644
index 0000000..941c685
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_gsharp2.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg
new file mode 100644
index 0000000..0afa7c0
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_hihat.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg
new file mode 100644
index 0000000..10d585b
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_kick.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg
new file mode 100644
index 0000000..79ab256
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_litecrash.ogg
diff --git a/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg
new file mode 100644
index 0000000..83a7944
--- /dev/null
+++ b/mesecons/mesecons_noteblock/sounds/mesecons_noteblock_snare.ogg
diff --git a/mesecons/mesecons_noteblock/textures/mesecons_noteblock.png b/mesecons/mesecons_noteblock/textures/mesecons_noteblock.png
new file mode 100644
index 0000000..7158a49
--- /dev/null
+++ b/mesecons/mesecons_noteblock/textures/mesecons_noteblock.png
diff --git a/mesecons/mesecons_pistons/depends.txt b/mesecons/mesecons_pistons/depends.txt
new file mode 100644
index 0000000..01f085b
--- /dev/null
+++ b/mesecons/mesecons_pistons/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_mvps
diff --git a/mesecons/mesecons_pistons/doc/piston/description.html b/mesecons/mesecons_pistons/doc/piston/description.html
new file mode 100644
index 0000000..d95dfb9
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston/description.html
@@ -0,0 +1 @@
+Pistons are effectors, they push up to 20 blocks in front of them. The push direction can be set by placing them from different angles.
diff --git a/mesecons/mesecons_pistons/doc/piston/preview.png b/mesecons/mesecons_pistons/doc/piston/preview.png
new file mode 100644
index 0000000..9e9ede3
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston/preview.png
diff --git a/mesecons/mesecons_pistons/doc/piston/recipe.png b/mesecons/mesecons_pistons/doc/piston/recipe.png
new file mode 100644
index 0000000..0a71159
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston/recipe.png
diff --git a/mesecons/mesecons_pistons/doc/piston_sticky/description.html b/mesecons/mesecons_pistons/doc/piston_sticky/description.html
new file mode 100644
index 0000000..3974097
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston_sticky/description.html
@@ -0,0 +1 @@
+Sticky pistons are effectors, they push up to 20 blocks in front of them. The push direction can be set by placing them from different angles. Sticky ones also pull 1 block.
diff --git a/mesecons/mesecons_pistons/doc/piston_sticky/preview.png b/mesecons/mesecons_pistons/doc/piston_sticky/preview.png
new file mode 100644
index 0000000..716d675
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston_sticky/preview.png
diff --git a/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png b/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png
new file mode 100644
index 0000000..3520736
--- /dev/null
+++ b/mesecons/mesecons_pistons/doc/piston_sticky/recipe.png
diff --git a/mesecons/mesecons_pistons/init.lua b/mesecons/mesecons_pistons/init.lua
new file mode 100644
index 0000000..bad061a
--- /dev/null
+++ b/mesecons/mesecons_pistons/init.lua
@@ -0,0 +1,761 @@
+-- Get mesecon rules of pistons
+piston_rules =
+{{x=0,  y=0,  z=1}, --everything apart from z- (pusher side)
+ {x=1,  y=0,  z=0},
+ {x=-1, y=0,  z=0},
+ {x=1,  y=1,  z=0},
+ {x=1,  y=-1, z=0},
+ {x=-1, y=1,  z=0},
+ {x=-1, y=-1, z=0},
+ {x=0,  y=1,  z=1},
+ {x=0,  y=-1, z=1}}
+
+local piston_up_rules =
+{{x=0,  y=0,  z=-1}, --everything apart from y+ (pusher side)
+ {x=1,  y=0,  z=0},
+ {x=-1, y=0,  z=0},
+ {x=0,  y=0,  z=1},
+ {x=1,  y=-1, z=0},
+ {x=-1, y=-1, z=0},
+ {x=0,  y=-1, z=1},
+ {x=0,  y=-1, z=-1}}
+
+local piston_down_rules =
+{{x=0,  y=0,  z=-1}, --everything apart from y- (pusher side)
+ {x=1,  y=0,  z=0},
+ {x=-1, y=0,  z=0},
+ {x=0,  y=0,  z=1},
+ {x=1,  y=1, z=0},
+ {x=-1, y=1, z=0},
+ {x=0,  y=1, z=1},
+ {x=0,  y=1, z=-1}}
+
+local piston_get_rules = function (node)
+	local rules = piston_rules
+	for i = 1, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules
+end
+
+piston_facedir_direction = function (node)
+	local rules = {{x = 0, y = 0, z = -1}}
+	for i = 1, node.param2 do
+		rules = mesecon.rotate_rules_left(rules)
+	end
+	return rules[1]
+end
+
+piston_get_direction = function(dir, node)
+	if type(dir) == "function" then
+		return dir(node)
+	else
+		return dir
+	end
+end
+
+local piston_remove_pusher = function(pos, node)
+	local pistonspec = minetest.registered_nodes[node.name].mesecons_piston
+	local dir = piston_get_direction(pistonspec.dir, node)
+	local pusherpos = mesecon.addPosRule(pos, dir)
+	local pushername = minetest.get_node(pusherpos).name
+
+	-- make sure there actually is a pusher (for compatibility reasons mainly)
+	if pushername ~= pistonspec.pusher then
+		return
+	end
+
+	minetest.remove_node(pusherpos)
+	minetest.sound_play("piston_retract", {
+		pos = pos,
+		max_hear_distance = 20,
+		gain = 0.3,
+	})
+	nodeupdate(pusherpos)
+end
+
+local piston_on = function(pos, node)
+	local pistonspec = minetest.registered_nodes[node.name].mesecons_piston
+
+	local dir = piston_get_direction(pistonspec.dir, node)
+	local np = mesecon.addPosRule(pos, dir)
+	local maxpush = mesecon.setting("piston_max_push", 15)
+	local success, stack, oldstack = mesecon.mvps_push(np, dir, maxpush)
+	if success then
+		minetest.add_node(pos, {param2 = node.param2, name = pistonspec.onname})
+		minetest.add_node(np,  {param2 = node.param2, name = pistonspec.pusher})
+		minetest.sound_play("piston_extend", {
+			pos = pos,
+			max_hear_distance = 20,
+			gain = 0.3,
+		})
+		mesecon.mvps_process_stack(stack)
+		mesecon.mvps_move_objects(np, dir, oldstack)
+	end
+end
+
+local piston_off = function(pos, node)
+	local pistonspec = minetest.registered_nodes[node.name].mesecons_piston
+	minetest.add_node(pos, {param2 = node.param2, name = pistonspec.offname})
+	piston_remove_pusher(pos, node)
+
+	if pistonspec.sticky then
+		local maxpull = mesecon.setting("piston_max_pull", 15)
+		local dir = piston_get_direction(pistonspec.dir, node)
+		local pullpos = vector.add(pos, vector.multiply(dir, 2))
+		local stack = mesecon.mvps_pull_single(pullpos, vector.multiply(dir, -1), maxpull)
+		mesecon.mvps_process_stack(pos, dir, stack)
+	end
+end
+
+local piston_orientate = function(pos, placer)
+	-- not placed by player
+	if not placer then return end
+
+	-- placer pitch in degrees
+	local pitch = placer:get_look_pitch() * (180 / math.pi)
+
+	local node = minetest.get_node(pos)
+	local pistonspec = minetest.registered_nodes[node.name].mesecons_piston
+	if pitch > 55 then --looking upwards
+		minetest.add_node(pos, {name=pistonspec.piston_down})
+	elseif pitch < -55 then --looking downwards
+		minetest.add_node(pos, {name=pistonspec.piston_up})
+	end
+end
+
+
+-- Horizontal pistons
+
+local pt = 3/16 -- pusher thickness
+
+local piston_pusher_box = {
+	type = "fixed",
+	fixed = {
+		{-2/16, -2/16, -.5 + pt, 2/16, 2/16,  .5 + pt},
+		{-.5  , -.5  , -.5     , .5  , .5  , -.5 + pt},
+	}
+}
+
+local piston_on_box = {
+	type = "fixed",
+	fixed = {
+		{-.5, -.5, -.5 + pt, .5, .5, .5}
+	}
+}
+
+
+-- Normal (non-sticky) ones:
+
+local pistonspec_normal = {
+	offname = "mesecons_pistons:piston_normal_off",
+	onname = "mesecons_pistons:piston_normal_on",
+	dir = piston_facedir_direction,
+	pusher = "mesecons_pistons:piston_pusher_normal",
+	piston_down = "mesecons_pistons:piston_down_normal_off",
+	piston_up   = "mesecons_pistons:piston_up_normal_off",
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_normal_off", {
+	description = "Piston",
+	tiles = {
+		"mesecons_piston_top.png",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_pusher_front.png"
+		},
+	groups = {cracky = 3},
+	paramtype2 = "facedir",
+	after_place_node = piston_orientate,
+	mesecons_piston = pistonspec_normal,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_get_rules
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_normal_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_top.png",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_on_front.png"
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_on_box,
+	selection_box = piston_on_box,
+	mesecons_piston = pistonspec_normal,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_get_rules
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_pusher_normal", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_top.png",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_left.png",
+		"mesecons_piston_pusher_right.png",
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_front.png"
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_normal_on",
+	selection_box = piston_pusher_box,
+	node_box = piston_pusher_box,
+})
+
+-- Sticky ones
+
+local pistonspec_sticky = {
+	offname = "mesecons_pistons:piston_sticky_off",
+	onname = "mesecons_pistons:piston_sticky_on",
+	dir = piston_facedir_direction,
+	pusher = "mesecons_pistons:piston_pusher_sticky",
+	sticky = true,
+	piston_down = "mesecons_pistons:piston_down_sticky_off",
+	piston_up   = "mesecons_pistons:piston_up_sticky_off",
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_sticky_off", {
+	description = "Sticky Piston",
+	tiles = {
+		"mesecons_piston_top.png",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_pusher_front_sticky.png"
+		},
+	groups = {cracky = 3},
+	paramtype2 = "facedir",
+	after_place_node = piston_orientate,
+	mesecons_piston = pistonspec_sticky,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_get_rules
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_sticky_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_top.png",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_left.png",
+		"mesecons_piston_right.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_on_front.png"
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_sticky_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_on_box,
+	selection_box = piston_on_box,
+	mesecons_piston = pistonspec_sticky,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_get_rules
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_top.png",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_left.png",
+		"mesecons_piston_pusher_right.png",
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_front_sticky.png"
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_sticky_on",
+	selection_box = piston_pusher_box,
+	node_box = piston_pusher_box,
+})
+
+--
+--
+-- UP
+--
+--
+
+local piston_up_pusher_box = {
+	type = "fixed",
+	fixed = {
+		{-2/16, -.5 - pt, -2/16, 2/16, .5 - pt, 2/16},
+		{-.5  ,  .5 - pt, -.5  , .5  , .5     ,   .5},
+	}
+}
+
+local piston_up_on_box = {
+	type = "fixed",
+	fixed = {
+		{-.5, -.5, -.5 , .5, .5-pt, .5}
+	}
+}
+
+-- Normal
+
+local pistonspec_normal_up = {
+	offname = "mesecons_pistons:piston_up_normal_off",
+	onname = "mesecons_pistons:piston_up_normal_on",
+	dir = {x = 0, y = 1, z = 0},
+	pusher = "mesecons_pistons:piston_up_pusher_normal"
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_up_normal_off", {
+	tiles = {
+		"mesecons_piston_pusher_front.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_left.png^[transformR270",
+		"mesecons_piston_right.png^[transformR90",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_top.png^[transformR180",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	mesecons_piston = pistonspec_normal_up,
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_up_rules,
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_up_normal_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_on_front.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_left.png^[transformR270",
+		"mesecons_piston_right.png^[transformR90",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_top.png^[transformR180",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_up_on_box,
+	selection_box = piston_up_on_box,
+	mesecons_piston = pistonspec_normal_up,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_up_rules,
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_up_pusher_normal", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_front.png",
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_left.png^[transformR270",
+		"mesecons_piston_pusher_right.png^[transformR90",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_top.png^[transformR180",
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_up_normal_on",
+	selection_box = piston_up_pusher_box,
+	node_box = piston_up_pusher_box,
+})
+
+
+
+-- Sticky
+
+
+local pistonspec_sticky_up = {
+	offname = "mesecons_pistons:piston_up_sticky_off",
+	onname = "mesecons_pistons:piston_up_sticky_on",
+	dir = {x = 0, y = 1, z = 0},
+	pusher = "mesecons_pistons:piston_up_pusher_sticky",
+	sticky = true
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_up_sticky_off", {
+	tiles = {
+		"mesecons_piston_pusher_front_sticky.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_left.png^[transformR270",
+		"mesecons_piston_right.png^[transformR90",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_top.png^[transformR180",
+		"mesecons_piston_tb.png"
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_sticky_off",
+	mesecons_piston = pistonspec_sticky_up,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_up_rules,
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_up_sticky_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_on_front.png",
+		"mesecons_piston_back.png",
+		"mesecons_piston_left.png^[transformR270",
+		"mesecons_piston_right.png^[transformR90",
+		"mesecons_piston_bottom.png",
+		"mesecons_piston_top.png^[transformR180",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_up_on_box,
+	selection_box = piston_up_on_box,
+	mesecons_piston = pistonspec_sticky_up,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_up_rules,
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_up_pusher_sticky", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_front_sticky.png",
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_left.png^[transformR270",
+		"mesecons_piston_pusher_right.png^[transformR90",
+		"mesecons_piston_pusher_bottom.png",
+		"mesecons_piston_pusher_top.png^[transformR180",
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_up_sticky_on",
+	selection_box = piston_up_pusher_box,
+	node_box = piston_up_pusher_box,
+})
+
+--
+--
+-- DOWN
+--
+--
+
+local piston_down_pusher_box = {
+	type = "fixed",
+	fixed = {
+		{-2/16, -.5 + pt, -2/16, 2/16,  .5 + pt, 2/16},
+		{-.5  , -.5     , -.5  , .5  , -.5 + pt,   .5},
+	}
+}
+
+local piston_down_on_box = {
+	type = "fixed",
+	fixed = {
+		{-.5, -.5+pt, -.5 , .5, .5, .5}
+	}
+}
+
+
+
+-- Normal
+
+local pistonspec_normal_down = {
+	offname = "mesecons_pistons:piston_down_normal_off",
+	onname = "mesecons_pistons:piston_down_normal_on",
+	dir = {x = 0, y = -1, z = 0},
+	pusher = "mesecons_pistons:piston_down_pusher_normal",
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_down_normal_off", {
+	tiles = {
+		"mesecons_piston_back.png",
+		"mesecons_piston_pusher_front.png",
+		"mesecons_piston_left.png^[transformR90",
+		"mesecons_piston_right.png^[transformR270",
+		"mesecons_piston_bottom.png^[transformR180",
+		"mesecons_piston_top.png",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	mesecons_piston = pistonspec_normal_down,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_down_rules,
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_down_normal_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_back.png",
+		"mesecons_piston_on_front.png",
+		"mesecons_piston_left.png^[transformR90",
+		"mesecons_piston_right.png^[transformR270",
+		"mesecons_piston_bottom.png^[transformR180",
+		"mesecons_piston_top.png",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_normal_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_down_on_box,
+	selection_box = piston_down_on_box,
+	mesecons_piston = pistonspec_normal_down,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_down_rules,
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_down_pusher_normal", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_front.png",
+		"mesecons_piston_pusher_left.png^[transformR90",
+		"mesecons_piston_pusher_right.png^[transformR270",
+		"mesecons_piston_pusher_bottom.png^[transformR180",
+		"mesecons_piston_pusher_top.png",
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_down_normal_on",
+	selection_box = piston_down_pusher_box,
+	node_box = piston_down_pusher_box,
+})
+
+-- Sticky
+
+local pistonspec_sticky_down = {
+	onname = "mesecons_pistons:piston_down_sticky_on",
+	offname = "mesecons_pistons:piston_down_sticky_off",
+	dir = {x = 0, y = -1, z = 0},
+	pusher = "mesecons_pistons:piston_down_pusher_sticky",
+	sticky = true
+}
+
+-- offstate
+minetest.register_node("mesecons_pistons:piston_down_sticky_off", {
+	tiles = {
+		"mesecons_piston_back.png",
+		"mesecons_piston_pusher_front_sticky.png",
+		"mesecons_piston_left.png^[transformR90",
+		"mesecons_piston_right.png^[transformR270",
+		"mesecons_piston_bottom.png^[transformR180",
+		"mesecons_piston_top.png",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_sticky_off",
+	mesecons_piston = pistonspec_sticky_down,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_on = piston_on,
+		rules = piston_down_rules,
+	}}
+})
+
+-- onstate
+minetest.register_node("mesecons_pistons:piston_down_sticky_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_back.png",
+		"mesecons_piston_on_front.png",
+		"mesecons_piston_left.png^[transformR90",
+		"mesecons_piston_right.png^[transformR270",
+		"mesecons_piston_bottom.png^[transformR180",
+		"mesecons_piston_top.png",
+		},
+	inventory_image = "mesecons_piston_top.png",
+	wield_image = "mesecons_piston_top.png",
+	groups = {cracky = 3, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	drop = "mesecons_pistons:piston_sticky_off",
+	after_dig_node = piston_remove_pusher,
+	node_box = piston_down_on_box,
+	selection_box = piston_down_on_box,
+	mesecons_piston = pistonspec_sticky_down,
+	sounds = default.node_sound_wood_defaults(),
+	mesecons = {effector={
+		action_off = piston_off,
+		rules = piston_down_rules,
+	}}
+})
+
+-- pusher
+minetest.register_node("mesecons_pistons:piston_down_pusher_sticky", {
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_piston_pusher_back.png",
+		"mesecons_piston_pusher_front_sticky.png",
+		"mesecons_piston_pusher_left.png^[transformR90",
+		"mesecons_piston_pusher_right.png^[transformR270",
+		"mesecons_piston_pusher_bottom.png^[transformR180",
+		"mesecons_piston_pusher_top.png",
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	diggable = false,
+	corresponding_piston = "mesecons_pistons:piston_down_sticky_on",
+	selection_box = piston_down_pusher_box,
+	node_box = piston_down_pusher_box,
+})
+
+
+-- Register pushers as stoppers if they would be seperated from the piston
+local piston_pusher_get_stopper = function (node, dir, stack, stackid)
+	if (stack[stackid + 1]
+	and stack[stackid + 1].node.name   == minetest.registered_nodes[node.name].corresponding_piston
+	and stack[stackid + 1].node.param2 == node.param2)
+	or (stack[stackid - 1]
+	and stack[stackid - 1].node.name   == minetest.registered_nodes[node.name].corresponding_piston
+	and stack[stackid - 1].node.param2 == node.param2) then
+		return false
+	end
+	return true
+end
+
+local piston_pusher_up_down_get_stopper = function (node, dir, stack, stackid)
+	if (stack[stackid + 1]
+	and stack[stackid + 1].node.name   == minetest.registered_nodes[node.name].corresponding_piston)
+	or (stack[stackid - 1]
+	and stack[stackid - 1].node.name   == minetest.registered_nodes[node.name].corresponding_piston) then
+		return false
+	end
+	return true
+end
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_pusher_normal", piston_pusher_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_pusher_sticky", piston_pusher_get_stopper)
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_up_pusher_normal", piston_pusher_up_down_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_up_pusher_sticky", piston_pusher_up_down_get_stopper)
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_down_pusher_normal", piston_pusher_up_down_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_down_pusher_sticky", piston_pusher_up_down_get_stopper)
+
+
+-- Register pistons as stoppers if they would be seperated from the stopper
+local piston_up_down_get_stopper = function (node, dir, stack, stackid)
+	if (stack[stackid + 1]
+	and stack[stackid + 1].node.name   == minetest.registered_nodes[node.name].mesecons_piston.pusher)
+	or (stack[stackid - 1]
+	and stack[stackid - 1].node.name   == minetest.registered_nodes[node.name].mesecons_piston.pusher) then
+		return false
+	end
+	return true
+end
+
+local piston_get_stopper = function (node, dir, stack, stackid)
+	pistonspec = minetest.registered_nodes[node.name].mesecons_piston
+	dir = piston_get_direction(pistonspec.dir, node)
+	local pusherpos  = mesecon.addPosRule(stack[stackid].pos, dir)
+	local pushernode = minetest.get_node(pusherpos)
+
+	if minetest.registered_nodes[node.name].mesecons_piston.pusher == pushernode.name then
+		for _, s in ipairs(stack) do
+			if  mesecon.cmpPos(s.pos, pusherpos) -- pusher is also to be pushed
+			and s.node.param2 == node.param2 then
+				return false
+			end
+		end
+	end
+	return true
+end
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_normal_on", piston_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_sticky_on", piston_get_stopper)
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_up_normal_on", piston_up_down_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_up_sticky_on", piston_up_down_get_stopper)
+
+mesecon.register_mvps_stopper("mesecons_pistons:piston_down_normal_on", piston_up_down_get_stopper)
+mesecon.register_mvps_stopper("mesecons_pistons:piston_down_sticky_on", piston_up_down_get_stopper)
+
+--craft recipes
+minetest.register_craft({
+	output = "mesecons_pistons:piston_normal_off 2",
+	recipe = {
+		{"group:wood", "group:wood", "group:wood"},
+		{"default:cobble", "default:steel_ingot", "default:cobble"},
+		{"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"},
+	}
+})
+
+minetest.register_craft({
+	output = "mesecons_pistons:piston_sticky_off",
+	recipe = {
+		{"mesecons_materials:glue"},
+		{"mesecons_pistons:piston_normal_off"},
+	}
+})
diff --git a/mesecons/mesecons_pistons/sounds/piston_extend.ogg b/mesecons/mesecons_pistons/sounds/piston_extend.ogg
new file mode 100644
index 0000000..e234ad9
--- /dev/null
+++ b/mesecons/mesecons_pistons/sounds/piston_extend.ogg
diff --git a/mesecons/mesecons_pistons/sounds/piston_retract.ogg b/mesecons/mesecons_pistons/sounds/piston_retract.ogg
new file mode 100644
index 0000000..feb9f04
--- /dev/null
+++ b/mesecons/mesecons_pistons/sounds/piston_retract.ogg
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_back.png b/mesecons/mesecons_pistons/textures/mesecons_piston_back.png
new file mode 100644
index 0000000..6a57dce
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_back.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png b/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png
new file mode 100644
index 0000000..5a3af9b
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_bottom.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_left.png b/mesecons/mesecons_pistons/textures/mesecons_piston_left.png
new file mode 100644
index 0000000..215dd73
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_left.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_on_front.png b/mesecons/mesecons_pistons/textures/mesecons_piston_on_front.png
new file mode 100644
index 0000000..0ade67e
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_on_front.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_back.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_back.png
new file mode 100644
index 0000000..fe87943
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_back.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png
new file mode 100644
index 0000000..87c4e81
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front.png
new file mode 100644
index 0000000..8ec9dc6
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png
new file mode 100644
index 0000000..e38b4e6
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png
new file mode 100644
index 0000000..bc5495b
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_left.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png
new file mode 100644
index 0000000..32ee32f
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_right.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_top.png b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_top.png
new file mode 100644
index 0000000..72f04e9
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_pusher_top.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_right.png b/mesecons/mesecons_pistons/textures/mesecons_piston_right.png
new file mode 100644
index 0000000..176463c
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_right.png
diff --git a/mesecons/mesecons_pistons/textures/mesecons_piston_top.png b/mesecons/mesecons_pistons/textures/mesecons_piston_top.png
new file mode 100644
index 0000000..5c8bace
--- /dev/null
+++ b/mesecons/mesecons_pistons/textures/mesecons_piston_top.png
diff --git a/mesecons/mesecons_powerplant/depends.txt b/mesecons/mesecons_powerplant/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_powerplant/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_powerplant/doc/powerplant/description.html b/mesecons/mesecons_powerplant/doc/powerplant/description.html
new file mode 100644
index 0000000..12abbbb
--- /dev/null
+++ b/mesecons/mesecons_powerplant/doc/powerplant/description.html
@@ -0,0 +1 @@
+A power plant is a receptor that is always turned on: It provides energy.
diff --git a/mesecons/mesecons_powerplant/doc/powerplant/preview.png b/mesecons/mesecons_powerplant/doc/powerplant/preview.png
new file mode 100644
index 0000000..473d15c
--- /dev/null
+++ b/mesecons/mesecons_powerplant/doc/powerplant/preview.png
diff --git a/mesecons/mesecons_powerplant/doc/powerplant/recipe.png b/mesecons/mesecons_powerplant/doc/powerplant/recipe.png
new file mode 100644
index 0000000..04a4002
--- /dev/null
+++ b/mesecons/mesecons_powerplant/doc/powerplant/recipe.png
diff --git a/mesecons/mesecons_powerplant/init.lua b/mesecons/mesecons_powerplant/init.lua
new file mode 100644
index 0000000..a5e3327
--- /dev/null
+++ b/mesecons/mesecons_powerplant/init.lua
@@ -0,0 +1,31 @@
+-- The POWER_PLANT
+-- Just emits power. always.
+
+minetest.register_node("mesecons_powerplant:power_plant", {
+	drawtype = "plantlike",
+	visual_scale = 1,
+	tiles = {"jeija_power_plant.png"},
+	inventory_image = "jeija_power_plant.png",
+	paramtype = "light",
+	walkable = false,
+	groups = {dig_immediate=3, mesecon = 2},
+	light_source = default.LIGHT_MAX-9,
+    	description="Power Plant",
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},
+	},
+	sounds = default.node_sound_leaves_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.on
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_powerplant:power_plant 1",
+	recipe = {
+		{"group:mesecon_conductor_craftable"},
+		{"group:mesecon_conductor_craftable"},
+		{"group:sapling"},
+	}
+})
diff --git a/mesecons/mesecons_powerplant/textures/jeija_power_plant.png b/mesecons/mesecons_powerplant/textures/jeija_power_plant.png
new file mode 100644
index 0000000..edc8891
--- /dev/null
+++ b/mesecons/mesecons_powerplant/textures/jeija_power_plant.png
diff --git a/mesecons/mesecons_pressureplates/depends.txt b/mesecons/mesecons_pressureplates/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_stone/description.html b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/description.html
new file mode 100644
index 0000000..3edc95b
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/description.html
@@ -0,0 +1 @@
+This receptor turns on if there's an object above it. And object can be a player, an item, a mob...
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png
new file mode 100644
index 0000000..235ffc4
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/preview.png
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png
new file mode 100644
index 0000000..62acf45
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_stone/recipe.png
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_wood/description.html b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/description.html
new file mode 100644
index 0000000..3edc95b
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/description.html
@@ -0,0 +1 @@
+This receptor turns on if there's an object above it. And object can be a player, an item, a mob...
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png
new file mode 100644
index 0000000..7063cb0
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/preview.png
diff --git a/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png
new file mode 100644
index 0000000..429d491
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/doc/pressureplate_wood/recipe.png
diff --git a/mesecons/mesecons_pressureplates/init.lua b/mesecons/mesecons_pressureplates/init.lua
new file mode 100644
index 0000000..b00db9a
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/init.lua
@@ -0,0 +1,94 @@
+local pp_box_off = {
+	type = "fixed",
+	fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
+}
+
+local pp_box_on = {
+	type = "fixed",
+	fixed = { -7/16, -8/16, -7/16, 7/16, -7.5/16, 7/16 },
+}
+
+pp_on_timer = function (pos, elapsed)
+	local node = minetest.get_node(pos)
+	local basename = minetest.registered_nodes[node.name].pressureplate_basename
+
+	-- This is a workaround for a strange bug that occurs when the server is started
+	-- For some reason the first time on_timer is called, the pos is wrong
+	if not basename then return end
+
+	local objs   = minetest.get_objects_inside_radius(pos, 1)
+	local two_below = mesecon.addPosRule(pos, {x = 0, y = -2, z = 0})
+
+	if objs[1] == nil and node.name == basename .. "_on" then
+		minetest.add_node(pos, {name = basename .. "_off"})
+		mesecon.receptor_off(pos, mesecon.rules.pplate)
+	elseif node.name == basename .. "_off" then
+		for k, obj in pairs(objs) do
+			local objpos = obj:getpos()
+			if objpos.y > pos.y-1 and objpos.y < pos.y then
+				minetest.add_node(pos, {name = basename .. "_on"})
+				mesecon.receptor_on(pos, mesecon.rules.pplate )
+			end
+		end
+	end
+	return true
+end
+
+-- Register a Pressure Plate
+-- offstate:	name of the pressure plate when inactive
+-- onstate:	name of the pressure plate when active
+-- description:	description displayed in the player's inventory
+-- tiles_off:	textures of the pressure plate when inactive
+-- tiles_on:	textures of the pressure plate when active
+-- image:	inventory and wield image of the pressure plate
+-- recipe:	crafting recipe of the pressure plate
+
+function mesecon.register_pressure_plate(basename, description, textures_off, textures_on, image_w, image_i, recipe)
+	mesecon.register_node(basename, {
+		drawtype = "nodebox",
+		inventory_image = image_i,
+		wield_image = image_w,
+		paramtype = "light",
+	    	description = description,
+		pressureplate_basename = basename,
+		on_timer = pp_on_timer,
+		on_construct = function(pos)
+			minetest.get_node_timer(pos):start(mesecon.setting("pplate_interval", 0.1))
+		end,
+	},{
+		mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.pplate }},
+		node_box = pp_box_off,
+		selection_box = pp_box_off,
+		groups = {snappy = 2, oddly_breakable_by_hand = 3},
+		tiles = textures_off
+	},{
+		mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.pplate }},
+		node_box = pp_box_on,
+		selection_box = pp_box_on,
+		groups = {snappy = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1},
+		tiles = textures_on
+	})
+
+	minetest.register_craft({
+		output = basename .. "_off",
+		recipe = recipe,
+	})
+end
+
+mesecon.register_pressure_plate(
+	"mesecons_pressureplates:pressure_plate_wood",
+	"Wooden Pressure Plate",
+	{"jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off_edges.png"},
+	{"jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on_edges.png"},
+	"jeija_pressure_plate_wood_wield.png",
+	"jeija_pressure_plate_wood_inv.png",
+	{{"group:wood", "group:wood"}})
+
+mesecon.register_pressure_plate(
+	"mesecons_pressureplates:pressure_plate_stone",
+	"Stone Pressure Plate",
+	{"jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off_edges.png"},
+	{"jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on_edges.png"},
+	"jeija_pressure_plate_stone_wield.png",
+	"jeija_pressure_plate_stone_inv.png",
+	{{"default:cobble", "default:cobble"}})
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png
new file mode 100644
index 0000000..bfe5a1d
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png
new file mode 100644
index 0000000..46140da
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png
new file mode 100644
index 0000000..2ad9acc
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png
new file mode 100644
index 0000000..dc64931
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png
new file mode 100644
index 0000000..51add95
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png
new file mode 100644
index 0000000..c533567
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png
new file mode 100644
index 0000000..36dacd0
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png
new file mode 100644
index 0000000..ca98757
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png
new file mode 100644
index 0000000..665ae97
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png
new file mode 100644
index 0000000..e1a7d8e
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png
new file mode 100644
index 0000000..358f2ea
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png
diff --git a/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png
new file mode 100644
index 0000000..50b321d
--- /dev/null
+++ b/mesecons/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png
diff --git a/mesecons/mesecons_random/depends.txt b/mesecons/mesecons_random/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_random/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_random/doc/ghoststone/description.html b/mesecons/mesecons_random/doc/ghoststone/description.html
new file mode 100644
index 0000000..138a2b3
--- /dev/null
+++ b/mesecons/mesecons_random/doc/ghoststone/description.html
@@ -0,0 +1 @@
+Ghoststones disappear when powered, just like Removestones. But in contrast to Removestones, they Reappear again when not powered anymore and they are also conductive.
diff --git a/mesecons/mesecons_random/doc/ghoststone/preview.png b/mesecons/mesecons_random/doc/ghoststone/preview.png
new file mode 100644
index 0000000..4ab33fb
--- /dev/null
+++ b/mesecons/mesecons_random/doc/ghoststone/preview.png
diff --git a/mesecons/mesecons_random/doc/ghoststone/recipe.png b/mesecons/mesecons_random/doc/ghoststone/recipe.png
new file mode 100644
index 0000000..3bd385d
--- /dev/null
+++ b/mesecons/mesecons_random/doc/ghoststone/recipe.png
diff --git a/mesecons/mesecons_random/doc/removestone/description.html b/mesecons/mesecons_random/doc/removestone/description.html
new file mode 100644
index 0000000..d540fe9
--- /dev/null
+++ b/mesecons/mesecons_random/doc/removestone/description.html
@@ -0,0 +1 @@
+Removestones are propably the simplest effectors possible. They simply disappear when powered.
diff --git a/mesecons/mesecons_random/doc/removestone/preview.png b/mesecons/mesecons_random/doc/removestone/preview.png
new file mode 100644
index 0000000..15caf3f
--- /dev/null
+++ b/mesecons/mesecons_random/doc/removestone/preview.png
diff --git a/mesecons/mesecons_random/doc/removestone/recipe.png b/mesecons/mesecons_random/doc/removestone/recipe.png
new file mode 100644
index 0000000..f271963
--- /dev/null
+++ b/mesecons/mesecons_random/doc/removestone/recipe.png
diff --git a/mesecons/mesecons_random/init.lua b/mesecons/mesecons_random/init.lua
new file mode 100644
index 0000000..0136309
--- /dev/null
+++ b/mesecons/mesecons_random/init.lua
@@ -0,0 +1,85 @@
+-- REMOVESTONE
+
+minetest.register_node("mesecons_random:removestone", {
+	tiles = {"jeija_removestone.png"},
+	inventory_image = minetest.inventorycube("jeija_removestone_inv.png"),
+	groups = {cracky=3},
+	description="Removestone",
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {effector = {
+		action_on = function (pos, node)
+			minetest.remove_node(pos)
+			mesecon.update_autoconnect(pos)
+		end
+	}}
+})
+
+minetest.register_craft({
+	output = 'mesecons_random:removestone 4',
+	recipe = {
+		{"", "default:cobble", ""},
+		{"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"},
+		{"", "default:cobble", ""},
+	}
+})
+
+-- GHOSTSTONE
+
+minetest.register_node("mesecons_random:ghoststone", {
+	description="ghoststone",
+	tiles = {"jeija_ghoststone.png"},
+	is_ground_content = true,
+	inventory_image = minetest.inventorycube("jeija_ghoststone_inv.png"),
+	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		rules = { --axes
+			{x = -1, y = 0, z = 0},
+			{x = 1, y = 0, z = 0},
+			{x = 0, y = -1, z = 0},
+			{x = 0, y = 1, z = 0},
+			{x = 0, y = 0, z = -1},
+			{x = 0, y = 0, z = 1},
+		},
+		onstate = "mesecons_random:ghoststone_active"
+	}}
+})
+
+minetest.register_node("mesecons_random:ghoststone_active", {
+	drawtype = "airlike",
+	pointable = false,
+	walkable = false,
+	diggable = false,
+	sunlight_propagates = true,
+	paramtype = "light",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		rules = {
+			{x = -1, y = 0, z = 0},
+			{x = 1, y = 0, z = 0},
+			{x = 0, y = -1, z = 0},
+			{x = 0, y = 1, z = 0},
+			{x = 0, y = 0, z = -1},
+			{x = 0, y = 0, z = 1},
+		},
+		offstate = "mesecons_random:ghoststone"
+	}},
+	on_construct = function(pos)
+		--remove shadow
+		pos2 = {x = pos.x, y = pos.y + 1, z = pos.z}
+		if ( minetest.get_node(pos2).name == "air" ) then
+			minetest.dig_node(pos2)
+		end
+	end
+})
+
+
+minetest.register_craft({
+	output = 'mesecons_random:ghoststone 4',
+	recipe = {
+		{"default:steel_ingot", "default:cobble", "default:steel_ingot"},
+		{"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"},
+		{"default:steel_ingot", "default:cobble", "default:steel_ingot"},
+	}
+})
diff --git a/mesecons/mesecons_random/textures/jeija_ghoststone.png b/mesecons/mesecons_random/textures/jeija_ghoststone.png
new file mode 100644
index 0000000..1917b7c
--- /dev/null
+++ b/mesecons/mesecons_random/textures/jeija_ghoststone.png
diff --git a/mesecons/mesecons_random/textures/jeija_ghoststone_inv.png b/mesecons/mesecons_random/textures/jeija_ghoststone_inv.png
new file mode 100644
index 0000000..c715d7f
--- /dev/null
+++ b/mesecons/mesecons_random/textures/jeija_ghoststone_inv.png
diff --git a/mesecons/mesecons_random/textures/jeija_removestone.png b/mesecons/mesecons_random/textures/jeija_removestone.png
new file mode 100644
index 0000000..1917b7c
--- /dev/null
+++ b/mesecons/mesecons_random/textures/jeija_removestone.png
diff --git a/mesecons/mesecons_random/textures/jeija_removestone_inv.png b/mesecons/mesecons_random/textures/jeija_removestone_inv.png
new file mode 100644
index 0000000..c715d7f
--- /dev/null
+++ b/mesecons/mesecons_random/textures/jeija_removestone_inv.png
diff --git a/mesecons/mesecons_receiver/depends.txt b/mesecons/mesecons_receiver/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_receiver/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_receiver/init.lua b/mesecons/mesecons_receiver/init.lua
new file mode 100644
index 0000000..4d60365
--- /dev/null
+++ b/mesecons/mesecons_receiver/init.lua
@@ -0,0 +1,158 @@
+rcvboxes = {
+	{ -3/16, -3/16, -8/16       , 3/16,  3/16  , -13/32       }, -- the smaller bump
+	{ -1/32, -1/32, -3/2        , 1/32,  1/32  , -1/2         }, -- the wire through the block
+	{ -2/32, -1/2 , -.5         , 2/32,  0     , -.5002+3/32  }, -- the vertical wire bit
+	{ -2/32, -1/2 , -7/16+0.002 , 2/32,  -14/32,  16/32+0.001 }  -- the horizontal wire
+}
+
+local receiver_get_rules = function (node)
+	local rules = {	{x =  1, y = 0, z = 0},
+			{x = -2, y = 0, z = 0}}
+	if node.param2 == 2 then
+		rules = mesecon.rotate_rules_left(rules)
+	elseif node.param2 == 3 then
+		rules = mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
+	elseif node.param2 == 0 then
+		rules = mesecon.rotate_rules_right(rules)
+	end
+	return rules
+end
+
+minetest.register_node("mesecons_receiver:receiver_on", {
+	drawtype = "nodebox",
+	tiles = {
+		"receiver_top_on.png",
+		"receiver_bottom_on.png",
+		"receiver_lr_on.png",
+		"receiver_lr_on.png",
+		"receiver_fb_on.png",
+		"receiver_fb_on.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+             	type = "fixed",
+		fixed = { -3/16, -8/16, -8/16, 3/16, 3/16, 8/16 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = rcvboxes
+	},
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons:wire_00000000_off",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		rules = receiver_get_rules,
+		offstate = "mesecons_receiver:receiver_off"
+	}}
+})
+
+minetest.register_node("mesecons_receiver:receiver_off", {
+	drawtype = "nodebox",
+	description = "You hacker you",
+	tiles = {
+		"receiver_top_off.png",
+		"receiver_bottom_off.png",
+		"receiver_lr_off.png",
+		"receiver_lr_off.png",
+		"receiver_fb_off.png",
+		"receiver_fb_off.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+             	type = "fixed",
+		fixed = { -3/16, -8/16, -8/16, 3/16, 3/16, 8/16 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = rcvboxes
+	},
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons:wire_00000000_off",
+	mesecons = {conductor = {
+		state = mesecon.state.off,
+		rules = receiver_get_rules,
+		onstate = "mesecons_receiver:receiver_on"
+	}}
+})
+
+function mesecon.receiver_get_pos_from_rcpt(pos, param2)
+	local rules = {{x = 2,  y = 0, z = 0}}
+	if param2 == nil then param2 = minetest.get_node(pos).param2 end
+	if param2 == 2 then
+		rules = mesecon.rotate_rules_left(rules)
+	elseif param2 == 3 then
+		rules = mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
+	elseif param2 == 0 then
+		rules = mesecon.rotate_rules_right(rules)
+	end
+	local np = {	x = pos.x + rules[1].x,
+			y = pos.y + rules[1].y,
+			z = pos.z + rules[1].z}
+	return np
+end
+
+function mesecon.receiver_place(rcpt_pos)
+	local node = minetest.get_node(rcpt_pos)
+	local pos = mesecon.receiver_get_pos_from_rcpt(rcpt_pos, node.param2)
+	local nn = minetest.get_node(pos)
+
+	if string.find(nn.name, "mesecons:wire_") ~= nil then
+		minetest.dig_node(pos)
+		if mesecon.is_power_on(rcpt_pos) then
+			minetest.add_node(pos, {name = "mesecons_receiver:receiver_on", param2 = node.param2})
+			mesecon.receptor_on(pos, receiver_get_rules(node))
+		else
+			minetest.add_node(pos, {name = "mesecons_receiver:receiver_off", param2 = node.param2})
+		end
+		mesecon.update_autoconnect(pos)
+	end
+end
+
+function mesecon.receiver_remove(rcpt_pos, dugnode)
+	local pos = mesecon.receiver_get_pos_from_rcpt(rcpt_pos, dugnode.param2)
+	local nn = minetest.get_node(pos)
+	if string.find(nn.name, "mesecons_receiver:receiver_") ~=nil then
+		minetest.dig_node(pos)
+		local node = {name = "mesecons:wire_00000000_off"}
+		minetest.add_node(pos, node)
+		mesecon.update_autoconnect(pos)
+		mesecon.on_placenode(pos, node)
+	end
+end
+
+minetest.register_on_placenode(function (pos, node)
+	if minetest.get_item_group(node.name, "mesecon_needs_receiver") == 1 then
+		mesecon.receiver_place(pos)
+	end
+end)
+
+minetest.register_on_dignode(function(pos, node)
+	if minetest.get_item_group(node.name, "mesecon_needs_receiver") == 1 then
+		mesecon.receiver_remove(pos, node)
+	end
+end)
+
+minetest.register_on_placenode(function (pos, node)
+	if string.find(node.name, "mesecons:wire_") ~=nil then
+		local rules = {	{x = 2,  y = 0, z = 0},
+				{x =-2,  y = 0, z = 0},
+				{x = 0,  y = 0, z = 2},
+				{x = 0,  y = 0, z =-2}}
+		local i = 1
+		while rules[i] ~= nil do
+			local np = {	x = pos.x + rules[i].x,
+					y = pos.y + rules[i].y,
+					z = pos.z + rules[i].z}
+			if minetest.get_item_group(minetest.get_node(np).name, "mesecon_needs_receiver") == 1 then
+				mesecon.receiver_place(np)
+			end
+			i = i + 1
+		end
+	end
+end)
diff --git a/mesecons/mesecons_receiver/textures/receiver_bottom_off.png b/mesecons/mesecons_receiver/textures/receiver_bottom_off.png
new file mode 100644
index 0000000..b95903e
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_bottom_off.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_bottom_on.png b/mesecons/mesecons_receiver/textures/receiver_bottom_on.png
new file mode 100644
index 0000000..d0b7006
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_bottom_on.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_fb_off.png b/mesecons/mesecons_receiver/textures/receiver_fb_off.png
new file mode 100644
index 0000000..aed3008
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_fb_off.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_fb_on.png b/mesecons/mesecons_receiver/textures/receiver_fb_on.png
new file mode 100644
index 0000000..0916736
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_fb_on.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_lr_off.png b/mesecons/mesecons_receiver/textures/receiver_lr_off.png
new file mode 100644
index 0000000..1fb2b3a
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_lr_off.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_lr_on.png b/mesecons/mesecons_receiver/textures/receiver_lr_on.png
new file mode 100644
index 0000000..087c0b4
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_lr_on.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_top_off.png b/mesecons/mesecons_receiver/textures/receiver_top_off.png
new file mode 100644
index 0000000..ae50106
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_top_off.png
diff --git a/mesecons/mesecons_receiver/textures/receiver_top_on.png b/mesecons/mesecons_receiver/textures/receiver_top_on.png
new file mode 100644
index 0000000..5b48cac
--- /dev/null
+++ b/mesecons/mesecons_receiver/textures/receiver_top_on.png
diff --git a/mesecons/mesecons_solarpanel/depends.txt b/mesecons/mesecons_solarpanel/depends.txt
new file mode 100644
index 0000000..bc7b062
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_materials
diff --git a/mesecons/mesecons_solarpanel/doc/solarpanel/description.html b/mesecons/mesecons_solarpanel/doc/solarpanel/description.html
new file mode 100644
index 0000000..f8e7450
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/doc/solarpanel/description.html
@@ -0,0 +1 @@
+Solar Panel are light receptors: they turn on if there is enough light.
diff --git a/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png b/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png
new file mode 100644
index 0000000..b773195
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/doc/solarpanel/preview.png
diff --git a/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png b/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png
new file mode 100644
index 0000000..3a3d799
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/doc/solarpanel/recipe.png
diff --git a/mesecons/mesecons_solarpanel/init.lua b/mesecons/mesecons_solarpanel/init.lua
new file mode 100644
index 0000000..bc5a408
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/init.lua
@@ -0,0 +1,95 @@
+-- Solar Panel
+minetest.register_node("mesecons_solarpanel:solar_panel_on", {
+	drawtype = "nodebox",
+	tiles = { "jeija_solar_panel.png", },
+	inventory_image = "jeija_solar_panel.png",
+	wield_image = "jeija_solar_panel.png",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	is_ground_content = true,
+	node_box = {
+		type = "wallmounted",
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
+	},
+	selection_box = {
+		type = "wallmounted",
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
+	},
+	drop = "mesecons_solarpanel:solar_panel_off",
+	groups = {dig_immediate=3, not_in_creative_inventory = 1},
+	sounds = default.node_sound_glass_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.on
+	}}
+})
+
+-- Solar Panel
+minetest.register_node("mesecons_solarpanel:solar_panel_off", {
+	drawtype = "nodebox",
+	tiles = { "jeija_solar_panel.png", },
+	inventory_image = "jeija_solar_panel.png",
+	wield_image = "jeija_solar_panel.png",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	is_ground_content = true,
+	node_box = {
+		type = "wallmounted",
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
+	},
+	selection_box = {
+		type = "wallmounted",
+		wall_bottom = { -7/16, -8/16, -7/16,  7/16, -7/16, 7/16 },
+		wall_top    = { -7/16,  7/16, -7/16,  7/16,  8/16, 7/16 },
+		wall_side   = { -8/16, -7/16, -7/16, -7/16,  7/16, 7/16 },
+	},
+	groups = {dig_immediate=3},
+    	description="Solar Panel",
+	sounds = default.node_sound_glass_defaults(),
+	mesecons = {receptor = {
+		state = mesecon.state.off
+	}}
+})
+
+minetest.register_craft({
+	output = "mesecons_solarpanel:solar_panel_off 1",
+	recipe = {
+		{"mesecons_materials:silicon", "mesecons_materials:silicon"},
+		{"mesecons_materials:silicon", "mesecons_materials:silicon"},
+	}
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_solarpanel:solar_panel_off"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local light = minetest.get_node_light(pos, nil)
+
+		if light >= 12 then
+			minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_on", param2=node.param2})
+			mesecon.receptor_on(pos)
+		end
+	end,
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_solarpanel:solar_panel_on"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local light = minetest.get_node_light(pos, nil)
+
+		if light < 12 then
+			minetest.set_node(pos, {name="mesecons_solarpanel:solar_panel_off", param2=node.param2})
+			mesecon.receptor_off(pos)
+		end
+	end,
+})
diff --git a/mesecons/mesecons_solarpanel/textures/jeija_solar_panel.png b/mesecons/mesecons_solarpanel/textures/jeija_solar_panel.png
new file mode 100644
index 0000000..a7b0f75
--- /dev/null
+++ b/mesecons/mesecons_solarpanel/textures/jeija_solar_panel.png
diff --git a/mesecons/mesecons_stickyblocks/depends.txt b/mesecons/mesecons_stickyblocks/depends.txt
new file mode 100644
index 0000000..01f085b
--- /dev/null
+++ b/mesecons/mesecons_stickyblocks/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_mvps
diff --git a/mesecons/mesecons_stickyblocks/init.lua b/mesecons/mesecons_stickyblocks/init.lua
new file mode 100644
index 0000000..659a227
--- /dev/null
+++ b/mesecons/mesecons_stickyblocks/init.lua
@@ -0,0 +1,16 @@
+-- Sticky blocks can be used together with pistons or movestones to push / pull
+-- structures that are "glued" together using sticky blocks
+
+-- All sides sticky block
+minetest.register_node("mesecons_stickyblocks:sticky_block_all", {
+	description = "All-sides sticky block",
+	tiles = {"default_grass.png^default_footprint.png"},
+	groups = {dig_immediate=2},
+	mvps_sticky = function (pos, node)
+		local connected = {}
+		for _, r in ipairs(mesecon.rules.alldirs) do
+			table.insert(connected, vector.add(pos, r))
+		end
+		return connected
+	end
+})
diff --git a/mesecons/mesecons_switch/depends.txt b/mesecons/mesecons_switch/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_switch/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_switch/doc/switch/description.html b/mesecons/mesecons_switch/doc/switch/description.html
new file mode 100644
index 0000000..3ef4ace
--- /dev/null
+++ b/mesecons/mesecons_switch/doc/switch/description.html
@@ -0,0 +1 @@
+The switch is a receptor. It changes its state as when punched.
diff --git a/mesecons/mesecons_switch/doc/switch/preview.png b/mesecons/mesecons_switch/doc/switch/preview.png
new file mode 100644
index 0000000..0a0487d
--- /dev/null
+++ b/mesecons/mesecons_switch/doc/switch/preview.png
diff --git a/mesecons/mesecons_switch/doc/switch/recipe.png b/mesecons/mesecons_switch/doc/switch/recipe.png
new file mode 100644
index 0000000..6db6464
--- /dev/null
+++ b/mesecons/mesecons_switch/doc/switch/recipe.png
diff --git a/mesecons/mesecons_switch/init.lua b/mesecons/mesecons_switch/init.lua
new file mode 100644
index 0000000..3d59c0a
--- /dev/null
+++ b/mesecons/mesecons_switch/init.lua
@@ -0,0 +1,35 @@
+-- mesecons_switch
+
+mesecon.register_node("mesecons_switch:mesecon_switch", {
+	paramtype2="facedir",
+	description="Switch",
+	sounds = default.node_sound_stone_defaults(),
+	on_rightclick = function (pos, node)
+		if(mesecon.flipstate(pos, node) == "on") then
+			mesecon.receptor_on(pos)
+		else
+			mesecon.receptor_off(pos)
+		end
+		minetest.sound_play("mesecons_switch", {pos=pos})
+	end
+},{
+	groups = {dig_immediate=2},
+	tiles = {	"mesecons_switch_side.png", "mesecons_switch_side.png",
+				"mesecons_switch_side.png", "mesecons_switch_side.png",
+				"mesecons_switch_side.png", "mesecons_switch_off.png"},
+	mesecons = {receptor = { state = mesecon.state.off }}
+},{
+	groups = {dig_immediate=2, not_in_creative_inventory=1},
+	tiles = {	"mesecons_switch_side.png", "mesecons_switch_side.png",
+				"mesecons_switch_side.png", "mesecons_switch_side.png",
+				"mesecons_switch_side.png", "mesecons_switch_on.png"},
+	mesecons = {receptor = { state = mesecon.state.on }}
+})
+
+minetest.register_craft({
+	output = "mesecons_switch:mesecon_switch_off 2",
+	recipe = {
+		{"default:steel_ingot", "default:cobble", "default:steel_ingot"},
+		{"group:mesecon_conductor_craftable","", "group:mesecon_conductor_craftable"},
+	}
+})
diff --git a/mesecons/mesecons_switch/sounds/mesecons_switch.ogg b/mesecons/mesecons_switch/sounds/mesecons_switch.ogg
new file mode 100644
index 0000000..53d45c1
--- /dev/null
+++ b/mesecons/mesecons_switch/sounds/mesecons_switch.ogg
diff --git a/mesecons/mesecons_switch/textures/mesecons_switch_off.png b/mesecons/mesecons_switch/textures/mesecons_switch_off.png
new file mode 100644
index 0000000..2a75ef3
--- /dev/null
+++ b/mesecons/mesecons_switch/textures/mesecons_switch_off.png
diff --git a/mesecons/mesecons_switch/textures/mesecons_switch_on.png b/mesecons/mesecons_switch/textures/mesecons_switch_on.png
new file mode 100644
index 0000000..9df3450
--- /dev/null
+++ b/mesecons/mesecons_switch/textures/mesecons_switch_on.png
diff --git a/mesecons/mesecons_switch/textures/mesecons_switch_side.png b/mesecons/mesecons_switch/textures/mesecons_switch_side.png
new file mode 100644
index 0000000..fb5db33
--- /dev/null
+++ b/mesecons/mesecons_switch/textures/mesecons_switch_side.png
diff --git a/mesecons/mesecons_torch/depends.txt b/mesecons/mesecons_torch/depends.txt
new file mode 100644
index 0000000..acaa924
--- /dev/null
+++ b/mesecons/mesecons_torch/depends.txt
@@ -0,0 +1 @@
+mesecons
diff --git a/mesecons/mesecons_torch/doc/torch/description.html b/mesecons/mesecons_torch/doc/torch/description.html
new file mode 100644
index 0000000..da7f19c
--- /dev/null
+++ b/mesecons/mesecons_torch/doc/torch/description.html
@@ -0,0 +1 @@
+The torch is an inverter, it may take up to 1 second until the signal has passed through. The input is 2 blocks away in the direction of the stick, outputs are around the mesecon glow.
diff --git a/mesecons/mesecons_torch/doc/torch/preview.png b/mesecons/mesecons_torch/doc/torch/preview.png
new file mode 100644
index 0000000..fa32543
--- /dev/null
+++ b/mesecons/mesecons_torch/doc/torch/preview.png
diff --git a/mesecons/mesecons_torch/doc/torch/recipe.png b/mesecons/mesecons_torch/doc/torch/recipe.png
new file mode 100644
index 0000000..529d99f
--- /dev/null
+++ b/mesecons/mesecons_torch/doc/torch/recipe.png
diff --git a/mesecons/mesecons_torch/init.lua b/mesecons/mesecons_torch/init.lua
new file mode 100644
index 0000000..5d1ad8f
--- /dev/null
+++ b/mesecons/mesecons_torch/init.lua
@@ -0,0 +1,118 @@
+--MESECON TORCHES
+
+local rotate_torch_rules = function (rules, param2)
+	if param2 == 5 then
+		return mesecon.rotate_rules_right(rules)
+	elseif param2 == 2 then
+		return mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules)) --180 degrees
+	elseif param2 == 4 then
+		return mesecon.rotate_rules_left(rules)
+	elseif param2 == 1 then
+		return mesecon.rotate_rules_down(rules)
+	elseif param2 == 0 then
+		return mesecon.rotate_rules_up(rules)
+	else
+		return rules
+	end
+end
+
+local torch_get_output_rules = function(node)
+	local rules = {
+		{x = 1,  y = 0, z = 0},
+		{x = 0,  y = 0, z = 1},
+		{x = 0,  y = 0, z =-1},
+		{x = 0,  y = 1, z = 0},
+		{x = 0,  y =-1, z = 0}}
+
+	return rotate_torch_rules(rules, node.param2)
+end
+
+local torch_get_input_rules = function(node)
+	local rules = 	{{x = -2, y = 0, z = 0},
+				 {x = -1, y = 1, z = 0}}
+
+	return rotate_torch_rules(rules, node.param2)
+end
+
+minetest.register_craft({
+	output = "mesecons_torch:mesecon_torch_on 4",
+	recipe = {
+	{"group:mesecon_conductor_craftable"},
+	{"default:stick"},}
+})
+
+local torch_selectionbox =
+{
+	type = "wallmounted",
+	wall_top = {-0.1, 0.5-0.6, -0.1, 0.1, 0.5, 0.1},
+	wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
+	wall_side = {-0.5, -0.1, -0.1, -0.5+0.6, 0.1, 0.1},
+}
+
+minetest.register_node("mesecons_torch:mesecon_torch_off", {
+	drawtype = "torchlike",
+	tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"},
+	inventory_image = "jeija_torches_off.png",
+	paramtype = "light",
+	walkable = false,
+	paramtype2 = "wallmounted",
+	selection_box = torch_selectionbox,
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	drop = "mesecons_torch:mesecon_torch_on",
+	mesecons = {receptor = {
+		state = mesecon.state.off,
+		rules = torch_get_output_rules
+	}}
+})
+
+minetest.register_node("mesecons_torch:mesecon_torch_on", {
+	drawtype = "torchlike",
+	tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"},
+	inventory_image = "jeija_torches_on.png",
+	wield_image = "jeija_torches_on.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	paramtype2 = "wallmounted",
+	selection_box = torch_selectionbox,
+	groups = {dig_immediate=3},
+	light_source = default.LIGHT_MAX-5,
+	description="Mesecon Torch",
+	mesecons = {receptor = {
+		state = mesecon.state.on,
+		rules = torch_get_output_rules
+	}},
+})
+
+minetest.register_abm({
+	nodenames = {"mesecons_torch:mesecon_torch_off","mesecons_torch:mesecon_torch_on"},
+	interval = 1,
+	chance = 1,
+	action = function(pos, node)
+		local is_powered = false
+		for _, rule in ipairs(torch_get_input_rules(node)) do
+			local src = mesecon.addPosRule(pos, rule)
+			if mesecon.is_power_on(src) then
+				is_powered = true
+			end
+		end
+
+		if is_powered then
+			if node.name == "mesecons_torch:mesecon_torch_on" then
+				minetest.swap_node(pos, {name = "mesecons_torch:mesecon_torch_off", param2 = node.param2})
+				mesecon.receptor_off(pos, torch_get_output_rules(node))
+			end
+		elseif node.name == "mesecons_torch:mesecon_torch_off" then
+			minetest.swap_node(pos, {name = "mesecons_torch:mesecon_torch_on", param2 = node.param2})
+			mesecon.receptor_on(pos, torch_get_output_rules(node))
+		end
+	end
+})
+
+-- Param2 Table (Block Attached To)
+-- 5 = z-1
+-- 3 = x-1
+-- 4 = z+1
+-- 2 = x+1
+-- 0 = y+1
+-- 1 = y-1
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_off.png b/mesecons/mesecons_torch/textures/jeija_torches_off.png
new file mode 100644
index 0000000..537920c
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_off.png
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png
new file mode 100644
index 0000000..3934e6e
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_off_ceiling.png
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_off_side.png b/mesecons/mesecons_torch/textures/jeija_torches_off_side.png
new file mode 100644
index 0000000..ecb2951
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_off_side.png
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_on.png b/mesecons/mesecons_torch/textures/jeija_torches_on.png
new file mode 100644
index 0000000..a93dcc2
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_on.png
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png b/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png
new file mode 100644
index 0000000..24fe201
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_on_ceiling.png
diff --git a/mesecons/mesecons_torch/textures/jeija_torches_on_side.png b/mesecons/mesecons_torch/textures/jeija_torches_on_side.png
new file mode 100644
index 0000000..fe7dfd2
--- /dev/null
+++ b/mesecons/mesecons_torch/textures/jeija_torches_on_side.png
diff --git a/mesecons/mesecons_walllever/depends.txt b/mesecons/mesecons_walllever/depends.txt
new file mode 100644
index 0000000..19c798c
--- /dev/null
+++ b/mesecons/mesecons_walllever/depends.txt
@@ -0,0 +1,2 @@
+mesecons
+mesecons_receiver
diff --git a/mesecons/mesecons_walllever/doc/walllever/description.html b/mesecons/mesecons_walllever/doc/walllever/description.html
new file mode 100644
index 0000000..ea5a0ed
--- /dev/null
+++ b/mesecons/mesecons_walllever/doc/walllever/description.html
@@ -0,0 +1 @@
+A receptor just like a switch, but it can be attached to walls.
diff --git a/mesecons/mesecons_walllever/doc/walllever/preview.png b/mesecons/mesecons_walllever/doc/walllever/preview.png
new file mode 100644
index 0000000..e8d2015
--- /dev/null
+++ b/mesecons/mesecons_walllever/doc/walllever/preview.png
diff --git a/mesecons/mesecons_walllever/doc/walllever/recipe.png b/mesecons/mesecons_walllever/doc/walllever/recipe.png
new file mode 100644
index 0000000..0ad7c92
--- /dev/null
+++ b/mesecons/mesecons_walllever/doc/walllever/recipe.png
diff --git a/mesecons/mesecons_walllever/init.lua b/mesecons/mesecons_walllever/init.lua
new file mode 100644
index 0000000..9ae0655
--- /dev/null
+++ b/mesecons/mesecons_walllever/init.lua
@@ -0,0 +1,61 @@
+-- WALL LEVER
+-- Basically a switch that can be attached to a wall
+-- Powers the block 2 nodes behind (using a receiver)
+mesecon.register_node("mesecons_walllever:wall_lever", {
+	description="Lever",
+	drawtype = "mesh",
+	inventory_image = "jeija_wall_lever_inv.png",
+	wield_image = "jeija_wall_lever_inv.png",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
+	},
+	sounds = default.node_sound_wood_defaults(),
+	on_rightclick = function (pos, node)
+		if(mesecon.flipstate(pos, node) == "on") then
+			mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
+		else
+			mesecon.receptor_off(pos, mesecon.rules.buttonlike_get(node))
+		end
+		minetest.sound_play("mesecons_lever", {pos=pos})
+	end
+},{
+	tiles = {
+		"jeija_wall_lever_lever_light_off.png",
+		"jeija_wall_lever_front.png",
+		"jeija_wall_lever_front_bump.png",
+		"jeija_wall_lever_back_edges.png"
+	},
+	mesh="jeija_wall_lever_off.obj",
+	mesecons = {receptor = {
+		rules = mesecon.rules.buttonlike_get,
+		state = mesecon.state.off
+	}},
+	groups = {dig_immediate = 2, mesecon_needs_receiver = 1}
+},{
+	tiles = {
+		"jeija_wall_lever_lever_light_on.png",
+		"jeija_wall_lever_front.png",
+		"jeija_wall_lever_front_bump.png",
+		"jeija_wall_lever_back_edges.png"
+	},
+	mesh="jeija_wall_lever_on.obj",
+	mesecons = {receptor = {
+		rules = mesecon.rules.buttonlike_get,
+		state = mesecon.state.on
+	}},
+	groups = {dig_immediate = 2, mesecon_needs_receiver = 1, not_in_creative_inventory = 1}
+})
+
+minetest.register_craft({
+	output = "mesecons_walllever:wall_lever_off 2",
+	recipe = {
+	    {"group:mesecon_conductor_craftable"},
+		{"default:stone"},
+		{"default:stick"},
+	}
+})
diff --git a/mesecons/mesecons_walllever/models/jeija_wall_lever_off.obj b/mesecons/mesecons_walllever/models/jeija_wall_lever_off.obj
new file mode 100644
index 0000000..334b54b
--- /dev/null
+++ b/mesecons/mesecons_walllever/models/jeija_wall_lever_off.obj
@@ -0,0 +1,216 @@
+# Blender v2.73 (sub 0) OBJ File: 'mesecons-wall-lever-off.blend'
+# www.blender.org
+o nodebox-5
+v 0.281250 0.156250 0.312500
+v -0.375000 0.375000 0.375000
+v -0.375000 -0.375000 0.375000
+v 0.343751 0.218750 0.375000
+v 0.343751 -0.218752 0.375000
+v 0.375000 0.375000 0.375000
+v 0.375000 -0.375000 0.375000
+v 0.281250 -0.156250 0.312500
+v -0.062500 -0.055586 0.191789
+v -0.062500 -0.087939 0.312529
+v -0.062500 -0.413939 0.225178
+v -0.062500 -0.381586 0.104437
+v -0.343751 0.218750 0.375000
+v 0.062500 -0.055586 0.191789
+v 0.062500 -0.087939 0.312529
+v -0.343751 -0.218752 0.375000
+v 0.062500 -0.413939 0.225178
+v 0.062500 -0.381586 0.104437
+v 0.375000 -0.375000 0.500000
+v 0.375000 0.375000 0.500000
+v -0.375000 -0.375000 0.500000
+v -0.375000 0.375000 0.500000
+v -0.281250 0.156250 0.312500
+v -0.281250 -0.156250 0.312500
+v -0.250000 0.125000 0.312500
+v -0.250000 -0.125000 0.312500
+v 0.250000 0.125000 0.312500
+v 0.250000 -0.125000 0.312500
+v -0.250000 0.125000 0.250000
+v -0.250000 -0.125000 0.250000
+v 0.250000 0.125000 0.250000
+v 0.250000 -0.125000 0.250000
+v 0.125000 -0.062500 0.187500
+v 0.125000 0.062500 0.187500
+v -0.125000 -0.062500 0.187500
+v -0.125000 0.062500 0.187500
+v 0.062500 -0.031251 0.176992
+v 0.062500 0.031250 0.176992
+v -0.062498 -0.031251 0.176992
+v -0.062498 0.031250 0.176992
+v -0.187500 -0.093750 0.208750
+v 0.187500 0.093750 0.208750
+v 0.187500 -0.093750 0.208750
+v -0.187500 0.093750 0.208750
+v -0.375000 0.375000 0.375000
+v -0.375000 -0.375000 0.375000
+v 0.375000 0.375000 0.375000
+v 0.375000 -0.375000 0.375000
+v 0.375000 -0.375000 0.500000
+v 0.375000 0.375000 0.500000
+v -0.375000 -0.375000 0.500000
+v -0.375000 0.375000 0.500000
+vt 0.312500 0.437500
+vt 0.312500 0.000000
+vt 0.437500 0.000000
+vt 0.437500 0.437500
+vt 0.687500 0.187500
+vt 0.812500 0.187500
+vt 0.812500 0.312500
+vt 0.687500 0.312500
+vt 0.187500 0.437500
+vt 0.062500 0.437500
+vt 0.062500 0.000000
+vt 0.187500 0.000000
+vt 0.875000 0.796875
+vt 0.375000 0.796875
+vt 0.343750 0.765625
+vt 0.906250 0.765625
+vt 0.203125 0.875000
+vt 0.203125 0.625000
+vt 0.234375 0.593750
+vt 0.234375 0.906250
+vt 0.875000 0.890625
+vt 0.906250 0.921875
+vt 0.343750 0.921875
+vt 0.375000 0.890625
+vt 0.109375 0.875000
+vt 0.078125 0.906250
+vt 0.078125 0.593750
+vt 0.109375 0.625000
+vt 0.562500 0.437500
+vt 0.562500 0.000000
+vt 0.218880 0.343823
+vt 0.218880 0.656178
+vt 0.156408 0.718649
+vt 0.156408 0.281350
+vt 0.968592 0.718649
+vt 0.968592 0.281350
+vt 0.999827 0.125174
+vt 0.999827 0.874827
+vt 0.781120 0.656178
+vt 0.843592 0.718649
+vt 0.843592 0.281350
+vt 0.781120 0.343823
+vt 0.843592 0.156350
+vt 0.156408 0.156350
+vt 0.125173 0.000174
+vt 0.874827 0.000174
+vt 0.031408 0.718649
+vt 0.000173 0.874827
+vt 0.000173 0.125174
+vt 0.031408 0.281350
+vt 0.843592 0.843649
+vt 0.874827 0.999827
+vt 0.125173 0.999827
+vt 0.156408 0.843649
+vt 0.250000 0.625000
+vt 0.750000 0.625000
+vt 0.750000 0.687500
+vt 0.250000 0.687500
+vt 0.250000 0.375000
+vt 0.250000 0.312500
+vt 0.750000 0.312500
+vt 0.750000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 0.625000
+vt 0.187500 0.625000
+vt 0.187500 0.375000
+vt 0.625000 0.562500
+vt 0.562500 0.531250
+vt 0.562500 0.468750
+vt 0.625000 0.437500
+vt 0.437500 0.468750
+vt 0.437500 0.531250
+vt 0.375000 0.437500
+vt 0.375000 0.562500
+vt 0.312500 0.406250
+vt 0.687500 0.406250
+vt 0.312500 0.593750
+vt 0.687500 0.593750
+vt 1.000000 0.000000
+vt 1.000000 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.000000
+vt 0.000000 0.875000
+vt 0.000000 0.000000
+vt 1.000000 1.000000
+vt 0.125000 1.000000
+vn 0.000000 -0.258800 0.965900
+vn 0.000000 -0.965900 -0.258800
+vn 0.000000 0.258800 -0.965900
+vn 0.000000 0.000000 -1.000000
+vn -1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.707100 0.000000 -0.707100
+vn 0.000000 0.707100 -0.707100
+vn 0.000000 -0.707100 -0.707100
+vn -0.707100 0.000000 -0.707100
+vn 0.000000 1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn -0.141100 0.273900 -0.951300
+vn -0.054600 0.137500 -0.989000
+vn -0.054600 -0.137500 -0.989000
+vn -0.141100 -0.273900 -0.951300
+vn 0.054600 -0.137500 -0.989000
+vn 0.054600 0.137500 -0.989000
+vn 0.141100 -0.273900 -0.951300
+vn 0.141100 0.273900 -0.951300
+vn 0.269900 -0.421500 -0.865700
+vn -0.269900 -0.421500 -0.865700
+vn 0.269900 0.421500 -0.865700
+vn -0.269900 0.421500 -0.865700
+vn -0.395600 0.336800 -0.854500
+vn 0.395600 0.336800 -0.854500
+vn 0.395600 -0.336800 -0.854500
+vn -0.395600 -0.336800 -0.854500
+vn 0.000000 -0.000000 1.000000
+g nodebox-5_nodebox-5_lever-light
+s off
+f 17/1/1 15/2/1 10/3/1 11/4/1
+f 18/5/2 17/6/2 11/7/2 12/8/2
+f 18/9/3 12/10/3 9/11/3 14/12/3
+f 26/13/4 28/14/4 8/15/4 24/16/4
+f 25/17/4 26/18/4 24/19/4 23/20/4
+f 25/21/4 23/22/4 1/23/4 27/24/4
+f 27/25/4 1/26/4 8/27/4 28/28/4
+f 12/29/5 11/4/5 10/3/5 9/30/5
+f 18/9/6 14/12/6 15/2/6 17/1/6
+g nodebox-5_nodebox-5_front
+f 8/31/7 1/32/7 4/33/7 5/34/7
+f 13/35/4 16/36/4 3/37/4 2/38/4
+f 1/32/8 23/39/8 13/40/8 4/33/8
+f 8/31/9 5/34/9 16/41/9 24/42/9
+f 24/42/10 16/41/10 13/40/10 23/39/10
+f 16/43/4 5/44/4 7/45/4 3/46/4
+f 4/47/4 6/48/4 7/49/4 5/50/4
+f 13/51/4 2/52/4 6/53/4 4/54/4
+g nodebox-5_nodebox-5_front-bump
+f 31/55/11 29/56/11 25/57/11 27/58/11
+f 32/59/12 28/60/12 26/61/12 30/62/12
+f 30/62/5 26/63/5 25/64/5 29/56/5
+f 32/59/6 31/55/6 27/65/6 28/66/6
+s 1
+f 36/67/13 40/68/14 39/69/15 35/70/16
+f 37/71/17 39/69/15 40/68/14 38/72/18
+f 35/70/16 39/69/15 37/71/17 33/73/19
+f 33/73/19 37/71/17 38/72/18 34/74/20
+f 34/74/20 38/72/18 40/68/14 36/67/13
+f 33/73/19 43/75/21 41/76/22 35/70/16
+f 33/73/19 34/74/20 42/77/23 43/75/21
+f 35/70/16 41/76/22 44/78/24 36/67/13
+f 42/77/23 44/78/24 29/56/25 31/55/26
+f 43/75/21 32/59/27 30/62/28 41/76/22
+f 43/75/21 42/77/23 31/55/26 32/59/27
+f 41/76/22 30/62/28 29/56/25 44/78/24
+f 34/74/20 36/67/13 44/78/24 42/77/23
+g nodebox-5_nodebox-5_back-edges
+s off
+f 19/79/29 20/80/29 22/81/29 21/82/29
+f 7/82/6 6/81/6 20/83/6 19/84/6
+f 3/82/5 21/84/5 22/83/5 2/81/5
+f 48/85/12 49/80/12 51/81/12 46/86/12
+f 47/85/11 45/86/11 52/81/11 50/80/11
diff --git a/mesecons/mesecons_walllever/models/jeija_wall_lever_on.obj b/mesecons/mesecons_walllever/models/jeija_wall_lever_on.obj
new file mode 100644
index 0000000..a806be8
--- /dev/null
+++ b/mesecons/mesecons_walllever/models/jeija_wall_lever_on.obj
@@ -0,0 +1,216 @@
+# Blender v2.73 (sub 0) OBJ File: 'mesecons-wall-lever.blend'
+# www.blender.org
+o nodebox-5
+v 0.281250 0.156250 0.312500
+v -0.375000 0.375000 0.375000
+v -0.375000 -0.375000 0.375000
+v 0.343751 0.218750 0.375000
+v 0.343751 -0.218752 0.375000
+v 0.375000 0.375000 0.375000
+v 0.375000 -0.375000 0.375000
+v 0.281250 -0.156250 0.312500
+v -0.062500 0.075354 0.315617
+v -0.062500 0.043002 0.194876
+v -0.062500 0.369002 0.107525
+v -0.062500 0.401354 0.228266
+v -0.343751 0.218750 0.375000
+v 0.062500 0.075354 0.315617
+v 0.062500 0.043002 0.194876
+v -0.343751 -0.218752 0.375000
+v 0.062500 0.369002 0.107525
+v 0.062500 0.401354 0.228266
+v 0.375000 -0.375000 0.500000
+v 0.375000 0.375000 0.500000
+v -0.375000 -0.375000 0.500000
+v -0.375000 0.375000 0.500000
+v -0.281250 0.156250 0.312500
+v -0.281250 -0.156250 0.312500
+v -0.250000 0.125000 0.312500
+v -0.250000 -0.125000 0.312500
+v 0.250000 0.125000 0.312500
+v 0.250000 -0.125000 0.312500
+v -0.250000 0.125000 0.250000
+v -0.250000 -0.125000 0.250000
+v 0.250000 0.125000 0.250000
+v 0.250000 -0.125000 0.250000
+v 0.125000 -0.062500 0.187500
+v 0.125000 0.062500 0.187500
+v -0.125000 -0.062500 0.187500
+v -0.125000 0.062500 0.187500
+v 0.062500 -0.031251 0.176992
+v 0.062500 0.031250 0.176992
+v -0.062498 -0.031251 0.176992
+v -0.062498 0.031250 0.176992
+v -0.187500 -0.093750 0.208750
+v 0.187500 0.093750 0.208750
+v 0.187500 -0.093750 0.208750
+v -0.187500 0.093750 0.208750
+v -0.375000 0.375000 0.375000
+v -0.375000 -0.375000 0.375000
+v 0.375000 0.375000 0.375000
+v 0.375000 -0.375000 0.375000
+v 0.375000 -0.375000 0.500000
+v 0.375000 0.375000 0.500000
+v -0.375000 -0.375000 0.500000
+v -0.375000 0.375000 0.500000
+vt 0.312500 0.437500
+vt 0.312500 0.000000
+vt 0.437500 0.000000
+vt 0.437500 0.437500
+vt 0.687500 0.187500
+vt 0.812500 0.187500
+vt 0.812500 0.312500
+vt 0.687500 0.312500
+vt 0.187500 0.437500
+vt 0.062500 0.437500
+vt 0.062500 0.000000
+vt 0.187500 0.000000
+vt 0.875000 0.796875
+vt 0.375000 0.796875
+vt 0.343750 0.765625
+vt 0.906250 0.765625
+vt 0.203125 0.875000
+vt 0.203125 0.625000
+vt 0.234375 0.593750
+vt 0.234375 0.906250
+vt 0.875000 0.890625
+vt 0.906250 0.921875
+vt 0.343750 0.921875
+vt 0.375000 0.890625
+vt 0.109375 0.875000
+vt 0.078125 0.906250
+vt 0.078125 0.593750
+vt 0.109375 0.625000
+vt 0.562500 0.437500
+vt 0.562500 0.000000
+vt 0.218880 0.343823
+vt 0.218880 0.656178
+vt 0.156408 0.718649
+vt 0.156408 0.281350
+vt 0.968592 0.718649
+vt 0.968592 0.281350
+vt 0.999827 0.125174
+vt 0.999827 0.874827
+vt 0.781120 0.656178
+vt 0.843592 0.718649
+vt 0.843592 0.281350
+vt 0.781120 0.343823
+vt 0.843592 0.156350
+vt 0.156408 0.156350
+vt 0.125173 0.000174
+vt 0.874827 0.000174
+vt 0.031408 0.718649
+vt 0.000173 0.874827
+vt 0.000173 0.125174
+vt 0.031408 0.281350
+vt 0.843592 0.843649
+vt 0.874827 0.999827
+vt 0.125173 0.999827
+vt 0.156408 0.843649
+vt 0.250000 0.625000
+vt 0.750000 0.625000
+vt 0.750000 0.687500
+vt 0.250000 0.687500
+vt 0.250000 0.375000
+vt 0.250000 0.312500
+vt 0.750000 0.312500
+vt 0.750000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 0.625000
+vt 0.187500 0.625000
+vt 0.187500 0.375000
+vt 0.625000 0.562500
+vt 0.562500 0.531250
+vt 0.562500 0.468750
+vt 0.625000 0.437500
+vt 0.437500 0.468750
+vt 0.437500 0.531250
+vt 0.375000 0.437500
+vt 0.375000 0.562500
+vt 0.312500 0.406250
+vt 0.687500 0.406250
+vt 0.312500 0.593750
+vt 0.687500 0.593750
+vt 1.000000 0.000000
+vt 1.000000 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.000000
+vt 0.000000 0.875000
+vt 0.000000 0.000000
+vt 1.000000 1.000000
+vt 0.125000 1.000000
+vn 0.000000 -0.258800 -0.965900
+vn 0.000000 0.965900 -0.258800
+vn 0.000000 0.258800 0.965900
+vn 0.000000 0.000000 -1.000000
+vn -1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.707100 0.000000 -0.707100
+vn 0.000000 0.707100 -0.707100
+vn 0.000000 -0.707100 -0.707100
+vn -0.707100 0.000000 -0.707100
+vn 0.000000 1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn -0.141100 0.273900 -0.951300
+vn -0.054600 0.137500 -0.989000
+vn -0.054600 -0.137500 -0.989000
+vn -0.141100 -0.273900 -0.951300
+vn 0.054600 -0.137500 -0.989000
+vn 0.054600 0.137500 -0.989000
+vn 0.141100 -0.273900 -0.951300
+vn 0.141100 0.273900 -0.951300
+vn 0.269900 -0.421500 -0.865700
+vn -0.269900 -0.421500 -0.865700
+vn 0.269900 0.421500 -0.865700
+vn -0.269900 0.421500 -0.865700
+vn -0.395600 0.336800 -0.854500
+vn 0.395600 0.336800 -0.854500
+vn 0.395600 -0.336800 -0.854500
+vn -0.395600 -0.336800 -0.854500
+vn 0.000000 -0.000000 1.000000
+g nodebox-5_nodebox-5_lever-light
+s off
+f 17/1/1 15/2/1 10/3/1 11/4/1
+f 18/5/2 17/6/2 11/7/2 12/8/2
+f 18/9/3 12/10/3 9/11/3 14/12/3
+f 26/13/4 28/14/4 8/15/4 24/16/4
+f 25/17/4 26/18/4 24/19/4 23/20/4
+f 25/21/4 23/22/4 1/23/4 27/24/4
+f 27/25/4 1/26/4 8/27/4 28/28/4
+f 12/29/5 11/4/5 10/3/5 9/30/5
+f 18/9/6 14/12/6 15/2/6 17/1/6
+g nodebox-5_nodebox-5_front
+f 8/31/7 1/32/7 4/33/7 5/34/7
+f 13/35/4 16/36/4 3/37/4 2/38/4
+f 1/32/8 23/39/8 13/40/8 4/33/8
+f 8/31/9 5/34/9 16/41/9 24/42/9
+f 24/42/10 16/41/10 13/40/10 23/39/10
+f 16/43/4 5/44/4 7/45/4 3/46/4
+f 4/47/4 6/48/4 7/49/4 5/50/4
+f 13/51/4 2/52/4 6/53/4 4/54/4
+g nodebox-5_nodebox-5_front-bump
+f 31/55/11 29/56/11 25/57/11 27/58/11
+f 32/59/12 28/60/12 26/61/12 30/62/12
+f 30/62/5 26/63/5 25/64/5 29/56/5
+f 32/59/6 31/55/6 27/65/6 28/66/6
+s 1
+f 36/67/13 40/68/14 39/69/15 35/70/16
+f 37/71/17 39/69/15 40/68/14 38/72/18
+f 35/70/16 39/69/15 37/71/17 33/73/19
+f 33/73/19 37/71/17 38/72/18 34/74/20
+f 34/74/20 38/72/18 40/68/14 36/67/13
+f 33/73/19 43/75/21 41/76/22 35/70/16
+f 33/73/19 34/74/20 42/77/23 43/75/21
+f 35/70/16 41/76/22 44/78/24 36/67/13
+f 42/77/23 44/78/24 29/56/25 31/55/26
+f 43/75/21 32/59/27 30/62/28 41/76/22
+f 43/75/21 42/77/23 31/55/26 32/59/27
+f 41/76/22 30/62/28 29/56/25 44/78/24
+f 34/74/20 36/67/13 44/78/24 42/77/23
+g nodebox-5_nodebox-5_back-edges
+s off
+f 19/79/29 20/80/29 22/81/29 21/82/29
+f 7/82/6 6/81/6 20/83/6 19/84/6
+f 3/82/5 21/84/5 22/83/5 2/81/5
+f 48/85/12 49/80/12 51/81/12 46/86/12
+f 47/85/11 45/86/11 52/81/11 50/80/11
diff --git a/mesecons/mesecons_walllever/sounds/mesecons_lever.ogg b/mesecons/mesecons_walllever/sounds/mesecons_lever.ogg
new file mode 100644
index 0000000..53d45c1
--- /dev/null
+++ b/mesecons/mesecons_walllever/sounds/mesecons_lever.ogg
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_back_edges.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_back_edges.png
new file mode 100644
index 0000000..936b454
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_back_edges.png
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_front.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_front.png
new file mode 100644
index 0000000..1bd747a
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_front.png
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_front_bump.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_front_bump.png
new file mode 100644
index 0000000..5c2a88a
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_front_bump.png
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_inv.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_inv.png
new file mode 100644
index 0000000..474f8c1
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_inv.png
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png
new file mode 100644
index 0000000..2b47c7d
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_off.png
diff --git a/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png b/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png
new file mode 100644
index 0000000..83b83a0
--- /dev/null
+++ b/mesecons/mesecons_walllever/textures/jeija_wall_lever_lever_light_on.png
diff --git a/mesecons/modpack.txt b/mesecons/modpack.txt
new file mode 100644
index 0000000..33d91f5
--- /dev/null
+++ b/mesecons/modpack.txt
@@ -0,0 +1 @@
+The presence of this file indicates that the current folder is a modpack.
\ No newline at end of file