summaryrefslogtreecommitdiff
path: root/Equipment
diff options
context:
space:
mode:
Diffstat (limited to 'Equipment')
-rw-r--r--Equipment/3D-Drucker.mdwn (renamed from Equipment/3D-Drucker/index.mdwn)0
-rw-r--r--Equipment/Bohrstaender.mdwn (renamed from Equipment/Bohrstaender/index.mdwn)0
-rw-r--r--Equipment/Buegeleisen.mdwn (renamed from Equipment/Buegeleisen/index.mdwn)0
-rw-r--r--Equipment/Dekupiersaege.mdwn (renamed from Equipment/Dekupiersaege/index.mdwn)0
-rw-r--r--Equipment/Dremel-staubsaugerfraese.mdwn (renamed from Equipment/Dremel-staubsaugerfraese/index.mdwn)0
-rw-r--r--Equipment/Drucker.mdwn (renamed from Equipment/Drucker/index.mdwn)0
-rw-r--r--Equipment/Feinbohrschleifer.mdwn (renamed from Equipment/Feinbohrschleifer/index.mdwn)0
-rw-r--r--Equipment/Heissluftpistole.mdwn (renamed from Equipment/Heissluftpistole/index.mdwn)0
-rw-r--r--Equipment/Holzarbeit/Bohrmaschine.mdwn (renamed from Equipment/Holzarbeit/Bohrmaschine/index.mdwn)0
-rw-r--r--Equipment/Holzarbeit/Kreissaege.mdwn (renamed from Equipment/Holzarbeit/Kreissaege/index.mdwn)0
-rw-r--r--Equipment/IT.mdwn (renamed from Equipment/IT/index.mdwn)0
-rw-r--r--Equipment/Labeldrucker.mdwn (renamed from Equipment/Labeldrucker/index.mdwn)0
-rw-r--r--Equipment/Lightbox.mdwn (renamed from Equipment/Lightbox/index.mdwn)0
-rw-r--r--Equipment/Loetstation.mdwn (renamed from Equipment/Loetstation/index.mdwn)0
-rw-r--r--Equipment/Minilaser.mdwn (renamed from Equipment/Minilaser/index.mdwn)0
-rw-r--r--Equipment/Naehmaschine.mdwn (renamed from Equipment/Naehmaschine/index.mdwn)0
-rw-r--r--Equipment/Portalfraese_3D-Drucker.mdwn (renamed from Equipment/Portalfraese_3D-Drucker/index.mdwn)0
-rw-r--r--Equipment/T-Shirt_Druck.mdwn (renamed from Equipment/T-Shirt_Druck/index.mdwn)0
-rw-r--r--Equipment/T-Shirt_Druck/Schneidplotter.mdwn (renamed from Equipment/T-Shirt_Druck/Schneidplotter/index.mdwn)0
-rw-r--r--Equipment/T-Shirt_Druck/T-Shirt-Presse.mdwn (renamed from Equipment/T-Shirt_Druck/T-Shirt-Presse/index.mdwn)0
-rw-r--r--Equipment/WireBender.mdwn (renamed from Equipment/WireBender/index.mdwn)0
-rw-r--r--Equipment/Xbox_Kinect.mdwn (renamed from Equipment/Xbox_Kinect/index.mdwn)0
-rw-r--r--Equipment/index.mdwn88
23 files changed, 0 insertions, 88 deletions
diff --git a/Equipment/3D-Drucker/index.mdwn b/Equipment/3D-Drucker.mdwn
index 1c009949..1c009949 100644
--- a/Equipment/3D-Drucker/index.mdwn
+++ b/Equipment/3D-Drucker.mdwn
diff --git a/Equipment/Bohrstaender/index.mdwn b/Equipment/Bohrstaender.mdwn
index b771e7fd..b771e7fd 100644
--- a/Equipment/Bohrstaender/index.mdwn
+++ b/Equipment/Bohrstaender.mdwn
diff --git a/Equipment/Buegeleisen/index.mdwn b/Equipment/Buegeleisen.mdwn
index 05ed1934..05ed1934 100644
--- a/Equipment/Buegeleisen/index.mdwn
+++ b/Equipment/Buegeleisen.mdwn
diff --git a/Equipment/Dekupiersaege/index.mdwn b/Equipment/Dekupiersaege.mdwn
index 0453514e..0453514e 100644
--- a/Equipment/Dekupiersaege/index.mdwn
+++ b/Equipment/Dekupiersaege.mdwn
diff --git a/Equipment/Dremel-staubsaugerfraese/index.mdwn b/Equipment/Dremel-staubsaugerfraese.mdwn
index 85ae5212..85ae5212 100644
--- a/Equipment/Dremel-staubsaugerfraese/index.mdwn
+++ b/Equipment/Dremel-staubsaugerfraese.mdwn
diff --git a/Equipment/Drucker/index.mdwn b/Equipment/Drucker.mdwn
index f7d4daea..f7d4daea 100644
--- a/Equipment/Drucker/index.mdwn
+++ b/Equipment/Drucker.mdwn
diff --git a/Equipment/Feinbohrschleifer/index.mdwn b/Equipment/Feinbohrschleifer.mdwn
index 1ef8392e..1ef8392e 100644
--- a/Equipment/Feinbohrschleifer/index.mdwn
+++ b/Equipment/Feinbohrschleifer.mdwn
diff --git a/Equipment/Heissluftpistole/index.mdwn b/Equipment/Heissluftpistole.mdwn
index 3b766d90..3b766d90 100644
--- a/Equipment/Heissluftpistole/index.mdwn
+++ b/Equipment/Heissluftpistole.mdwn
diff --git a/Equipment/Holzarbeit/Bohrmaschine/index.mdwn b/Equipment/Holzarbeit/Bohrmaschine.mdwn
index 078bd8e5..078bd8e5 100644
--- a/Equipment/Holzarbeit/Bohrmaschine/index.mdwn
+++ b/Equipment/Holzarbeit/Bohrmaschine.mdwn
diff --git a/Equipment/Holzarbeit/Kreissaege/index.mdwn b/Equipment/Holzarbeit/Kreissaege.mdwn
index c9740e52..c9740e52 100644
--- a/Equipment/Holzarbeit/Kreissaege/index.mdwn
+++ b/Equipment/Holzarbeit/Kreissaege.mdwn
diff --git a/Equipment/IT/index.mdwn b/Equipment/IT.mdwn
index c29274ba..c29274ba 100644
--- a/Equipment/IT/index.mdwn
+++ b/Equipment/IT.mdwn
diff --git a/Equipment/Labeldrucker/index.mdwn b/Equipment/Labeldrucker.mdwn
index 0dbd43a3..0dbd43a3 100644
--- a/Equipment/Labeldrucker/index.mdwn
+++ b/Equipment/Labeldrucker.mdwn
diff --git a/Equipment/Lightbox/index.mdwn b/Equipment/Lightbox.mdwn
index 674b35d4..674b35d4 100644
--- a/Equipment/Lightbox/index.mdwn
+++ b/Equipment/Lightbox.mdwn
diff --git a/Equipment/Loetstation/index.mdwn b/Equipment/Loetstation.mdwn
index 46452ed1..46452ed1 100644
--- a/Equipment/Loetstation/index.mdwn
+++ b/Equipment/Loetstation.mdwn
diff --git a/Equipment/Minilaser/index.mdwn b/Equipment/Minilaser.mdwn
index 263e1220..263e1220 100644
--- a/Equipment/Minilaser/index.mdwn
+++ b/Equipment/Minilaser.mdwn
diff --git a/Equipment/Naehmaschine/index.mdwn b/Equipment/Naehmaschine.mdwn
index 1ed7f126..1ed7f126 100644
--- a/Equipment/Naehmaschine/index.mdwn
+++ b/Equipment/Naehmaschine.mdwn
diff --git a/Equipment/Portalfraese_3D-Drucker/index.mdwn b/Equipment/Portalfraese_3D-Drucker.mdwn
index dd4a86fc..dd4a86fc 100644
--- a/Equipment/Portalfraese_3D-Drucker/index.mdwn
+++ b/Equipment/Portalfraese_3D-Drucker.mdwn
diff --git a/Equipment/T-Shirt_Druck/index.mdwn b/Equipment/T-Shirt_Druck.mdwn
index b15e49fe..b15e49fe 100644
--- a/Equipment/T-Shirt_Druck/index.mdwn
+++ b/Equipment/T-Shirt_Druck.mdwn
diff --git a/Equipment/T-Shirt_Druck/Schneidplotter/index.mdwn b/Equipment/T-Shirt_Druck/Schneidplotter.mdwn
index d9b189a3..d9b189a3 100644
--- a/Equipment/T-Shirt_Druck/Schneidplotter/index.mdwn
+++ b/Equipment/T-Shirt_Druck/Schneidplotter.mdwn
diff --git a/Equipment/T-Shirt_Druck/T-Shirt-Presse/index.mdwn b/Equipment/T-Shirt_Druck/T-Shirt-Presse.mdwn
index 64946cc6..64946cc6 100644
--- a/Equipment/T-Shirt_Druck/T-Shirt-Presse/index.mdwn
+++ b/Equipment/T-Shirt_Druck/T-Shirt-Presse.mdwn
diff --git a/Equipment/WireBender/index.mdwn b/Equipment/WireBender.mdwn
index bf2b9af3..bf2b9af3 100644
--- a/Equipment/WireBender/index.mdwn
+++ b/Equipment/WireBender.mdwn
diff --git a/Equipment/Xbox_Kinect/index.mdwn b/Equipment/Xbox_Kinect.mdwn
index 9bbf4769..9bbf4769 100644
--- a/Equipment/Xbox_Kinect/index.mdwn
+++ b/Equipment/Xbox_Kinect.mdwn
diff --git a/Equipment/index.mdwn b/Equipment/index.mdwn
deleted file mode 100644
index d20f93d3..00000000
--- a/Equipment/index.mdwn
+++ /dev/null
@@ -1,88 +0,0 @@
-[[!meta title="Equipment in der Starship Factory"]]
-
-# Geräte
-Wir haben im Moment folgende Geräte für die Arbeit zur Verfügung. Diese
-teilen sich in verschiedene Kategorien auf:
-
-[[!toc startlevel=1]]
-
-<div class="alert alert-info">Was wir leider nicht haben, uns aber wünschen, ist auf der <a href="https://wiki.starship-factory.ch/Wunschliste.html">Wunschliste</a> zu finden.</div>
-
-## 3D-Modellierung
-
-Die Starship Factory verfügt über eine 3D-Modellier- und -Druckwerkstatt. Diese ist auf die Produktion von Kleinteilen (bis zu 30 Zentimeter) aus Plastik und ähnlichen Materialien (ABS, PLA, Nylon, Harz, FilaFlex, etc.) ausgerichtet. Generell gilt aber: alles, was mit dem Werkzeug hergestellt werden kann, ohne es nachhaltig zu zerstören, ist in Ordnung.
-
-* [[Equipment/3D-Drucker]]
- * [[Ultimaker Original|Equipment/3D-Drucker/ultimaker1verein]]
- * [[Ultimaker 2|Equipment/3D-Drucker/ultimaker2]]
- * [[B9Creator|Equipment/3D-Drucker/b9creator]]
-
-## Textilarbeiten
-
-Ein weiterer Arbeitsbereich der Starship Factory ist die Textilecke. In diesem Arbeitsbereich soll es ermöglicht werden, Textilien selbst zusammen zu nähen, zu bedrucken, zu besticken oder elektronische Schaltkreise einzuarbeiten.
-
-* [[Equipment/T-Shirt_Druck]]:
- * [[Equipment/T-Shirt_Druck/T-Shirt-Presse]]
- * [[Equipment/T-Shirt_Druck/Schneidplotter]]
-* [[Nähmaschine|Equipment/Naehmaschine]]
-* [[Bügeleisen|Equipment/Buegeleisen]]
-
-## Elektronik
-
-In der Starship Factory gibt es ein sehr gut ausgestattetes Elektroniklabor. Zur Ausstattung gehören unter anderem:
-
-* [[Labornetzteil|Equipment/LaborNetzteil]]
-* [[Lötstation|Equipment/Loetstation]]
-* [[Bügeleisen|Equipment/Buegeleisen]]
-* [[Equipment/Heissluftpistole]]
-* Oszilloskope
-* Multimeter
-* Säurebad zum Ätzen von Platinen
-
-Zudem verfügen wir über ein Lager an [[Verbrauchsmaterial|Material/Elektronik]].
-
-## Holzwerkstatt
-
-Ebenfalls vertreten ist eine Ecke für Holzarbeiten. Im Rücksicht auf den Rest des Hackerspaces sind die Holzwerkzeuge tendentiell kleiner. Damit ist es möglich, darauf zu verzichten, alles mit Holzspänen zu verstauben. Die folgenden Geräte stehen für die Arbeit zur Verfügung:
-
-* [[Equipment/Minilaser]]
-* [[Kreissäge klein (KS230)|Equipment/Holzarbeit/Kreissaege]]
-* [[Equipment/Holzarbeit/Bohrmaschine]]
-* [[Bohrständer|Equipment/Bohrstaender]]
-* Schleifmaschine
-* Stichsäge
-* [[Proxxon Dekupiersäge|Equipment/Dekupiersaege]]
-* [[Proxxon Feinbohrschleifer|Equipment/Feinbohrschleifer]]
-* Akkuschrauber Makita
-
-## Sonstiges Equipment
-
-* [[Equipment/Labeldrucker]]
-* [[Equipment/Drucker]]
-* [[Equipment/Lightbox]]
-* [[Computer und Netzwerk|Equipment/IT]]
-
-# Werkzeuge
-
-Wir haben im Moment folgende Werkzeuge zur Verfügung
-(Sie gehören Teilweise nicht der Starship Factory und manche sind für die zukunft auch auf der [[Wunschliste]])
-
-* Grosser grober Werkzeugkasten
-* Fein-Schraubenzieher
-* Kompressor
-
-# Verbrauchsmaterial
-
-Da man ohne Verbrauchsmaterial nicht unbedingt gut arbeiten kann, halten wir auch davon einiges vor:
-
-## Elektronik
-
-[[!map pages="Material/Elektronik/* and !*.png and !*.svg and !*.jpg and !*.csv" show=title]]
-
-# Unvollständiges Werkzeug
-
-Einiges von unserem Werkzeug ist noch nicht fertig zusammen gebaut. Wer will, kann diese gerne fertig stellen.
-
-* [[Portalfräse/3D-Drucker|Equipment/Portalfraese 3D-Drucker]]
-* [[Equipment/WireBender]]
-* [[Equipment/Xbox Kinect]]