Skip to content
Permalink
Branch: master
Commits on Jan 24, 2018
  1. Revert last contribs from sara (#125)

    felipesanches committed Jan 24, 2018
    This places the repo's master branch back into the last working state (as it was used for manufacturing our last batch of Metamáquina 2 3D printers back in 2013). These 4 reverted commits contributed by Sara were experimental things we were working on back then, so we'll keep them in the git history for anyone who might want to take a look at them someday.
    
    Happy Hacking!
    Felipe Correa da Silva Sanches
    R&D director at Metamáquina
    
    * Revert "again"
    * Revert "final review of the original Metamaquina2 files"
    * Revert "New files extruders-clamp for our peek extruders-clamp-1 for seemecnc"
    * Revert "creating branch"
    
    This reverts commits 27b05b8, 7661948, 80f4559 and cb69a04.
Commits on Dec 22, 2013
  1. again

    sara-rodriguez committed Dec 22, 2013
Commits on Oct 31, 2013
Commits on Oct 30, 2013
  1. creating branch

    Sara Rodriguez
    Sara Rodriguez committed Oct 30, 2013
Commits on Aug 15, 2013
  1. production batch panels

    felipesanches committed Aug 15, 2013
Commits on Aug 9, 2013
  1. Inclusion of a guide to remove the carriage

    Sara Rodriguez
    Sara Rodriguez committed Aug 9, 2013
Commits on Aug 8, 2013
  1. Modified BillOfMaterials calls to include part ref.

    rodrigopitanga committed Jul 2, 2013
    Fixed belt modules naming and belt BOM calls
    Fix rods and bars size printed in BOM
    Fixed a few typos and parts naming
    
    	modified:   608zz_bearing.scad
    	modified:   Metamaquina2.scad
    	modified:   NEMA.scad
    	modified:   PowerSupply.scad
    	modified:   RAMBo.scad
    	modified:   ZLink.scad
    	modified:   bar-clamp.scad
    	modified:   belt-clamp.scad
    	modified:   bolts.scad
    	modified:   cable_clips.scad
    	modified:   coupling.scad
    	modified:   domed_cap_nuts.scad
    	modified:   endstop.scad
    	modified:   heated_bed.scad
    	modified:   jhead.scad
    	modified:   large_extruder_gear.scad
    	modified:   lasercut_extruder.scad
    	modified:   lm8uu_bearing.scad
    	modified:   nozzle.scad
    	modified:   nuts.scad
    	modified:   small_extruder_gear.scad
    	modified:   spacer.scad
    	modified:   tslot.scad
    	modified:   washers.scad
  2. wiring diagram revC

    rodrigopitanga committed Jun 28, 2013
Commits on Aug 6, 2013
  1. Merge branches 'master' and 'filamentspool' of https://github.com/Met…

    Sara Rodriguez
    Sara Rodriguez committed Aug 6, 2013
    …amaquina/Metamaquina2
    
    Conflicts:
    	jhead.scad
  2. exclusion of a rubber cilinder outside the J head

    Sara Rodriguez
    Sara Rodriguez committed Aug 6, 2013
  3. the real shape of the j head

    Sara Rodriguez
    Sara Rodriguez committed Aug 6, 2013
  4. New Metamaquina Project with 2 extruders

    Sara Rodriguez
    Sara Rodriguez committed Aug 6, 2013
  5. changing the format of the extruder

    Sara Rodriguez
    Sara Rodriguez committed Aug 6, 2013
Commits on Jul 31, 2013
  1. new realistic peep draw

    Sara Rodriguez
    Sara Rodriguez committed Jul 31, 2013
Commits on Jul 30, 2013
  1. Including 2 extruders in Metamaquina

    Sara Rodriguez
    Sara Rodriguez committed Jul 30, 2013
Commits on Jul 29, 2013
Commits on Jul 5, 2013
  1. Creation of Calibration Z Bars to be installed in the wall

    Sara Rodriguez
    Sara Rodriguez committed Jul 5, 2013
Commits on Jul 4, 2013
  1. inclusion of nuts and bolts and retired a don't functional part of th…

    Sara Rodriguez
    Sara Rodriguez committed Jul 4, 2013
    …e code
Commits on Jul 3, 2013
  1. retired the tab from the rear rule and changed the wrong print of the…

    Sara Rodriguez
    Sara Rodriguez committed Jul 3, 2013
    … rear bar
Commits on Jul 2, 2013
  1. Calibration rules files

    Sara Rodriguez
    Sara Rodriguez committed Jul 2, 2013
  2. finish the calibration rules - the file that ends in -conf shows the …

    Sara Rodriguez
    Sara Rodriguez committed Jul 2, 2013
    …rules in the 3D printer, without it shows only the front and rear rules
Commits on Jul 1, 2013
  1. calibration rules

    Sara Rodriguez
    Sara Rodriguez committed Jul 1, 2013
Commits on Jun 28, 2013
  1. exclusion of //

    Sara Rodriguez
    Sara Rodriguez committed Jun 28, 2013
  2. rotate the panel with M logo

    Sara Rodriguez
    Sara Rodriguez committed Jun 28, 2013
Commits on Jun 27, 2013
  1. lasercutter of the Filament Spool Holder

    Sara Rodriguez
    Sara Rodriguez committed Jun 27, 2013
  2. joining mmodifications by Juca and changing the bar to threaded metal…

    Sara Rodriguez
    Sara Rodriguez committed Jun 27, 2013
    … with domed caps
    
    Merge branch 'filamentspool' of https://github.com/Metamaquina/Metamaquina2 into filamentspool
    
    Conflicts:
    	FilamentSpoolHolder.scad
Commits on Jun 26, 2013
  1. top_cut adjust

    Sara Rodriguez
    Sara Rodriguez committed Jun 26, 2013
Older
You can’t perform that action at this time.