/* Projektschritt 1: Erstellung von OpenSCAD-Objekten */ +Bemerkung

[stratum0-wiki.git] / Anime_Referat.mw

diff --git a/Anime_Referat.mw b/Anime_Referat.mw
index 8ddb3d4..de281d3 100644 (file)
--- a/Anime_Referat.mw
+++ b/Anime_Referat.mw
@@ -27,31 +27,32 @@ Mögliche Genres können sein:
 ==Aktuell laufende Serien==
 {| border="1" cellpadding="2" cellspacing="0" style="text-align:center;"
 |-
-! Titel !! Status !! Kategorie !! Kommentare !! Studio !! Director
+! Titel !! Status !! Kategorie !! Studio !! Director !! Composition !! Original Work !! noteworthy
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=9541 進撃の巨人 attack on titan]
-| <div align="center">{{Composition bar|08|25|red}}</div>
-| Action, Shonen<br>Gore || Original Work (Manga):<br>by Isayama Hajime || Wit Studio<br>Production IG || Araki Tetsurou
+| <div align="center">{{Composition bar|14|25|red}}</div>
+| Action, Shonen<br>Gore || Wit Studio<br>Production IG || Araki Tetsurou || || (Manga):<br>by Isayama Hajime
 |-
-| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=247 Ghost in the Shell: Stand Alone Complex]
-| <div align="center">{{Composition bar|22|26|darkblue}}</div>
-| SciFi<br>Transhumanism || || ~Production IG~ || Kamiyama Kenji<br> Original Work: Masamune Shirou
+| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1176 Ghost in the Shell: Stand Alone Complex 2nd Gig]
+| <div align="center">{{Composition bar|2|26|darkblue}}</div>
+| SciFi<br>Transhumanism || ~Production IG~ || Kamiyama Kenji || Kamiyama Kenji || Masamune Shirou
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=3654 怪~ayakashi~ JAPANESE CLASSIC HORROR]
-| <div align="center">{{Composition bar|02|11|brown}}<div>
-| historical<br>horror || Prequel: Mononoke<br>Original Work:<br>Tsuruya Nanboku<br>Izumi Kyouka || Toei Animation || Imazawa Tetsuo<br>Nakamura Kenji
+| <div align="center">{{Composition bar|06|11|brown}}</div>
+| historical<br>horror || Toei Animation || Imazawa Tetsuo<br>Nakamura Kenji || || Tsuruya Nanboku<br>Izumi Kyouka || Prequel: Mononoke
 |-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=106 Azumanga Daioh]
-| <div align="center">{{Composition bar|20|26|lightpink}}</div>
-| 4koma<br>comedy || || ~JC Staff~ || Nishikiori Hiroshi
+| <div align="center">{{Composition bar|24|26|lightpink}}</div>
+| 4koma<br>comedy || ~JC Staff~ || Nishikiori Hiroshi || ||
 |-
 |}
 
 ==Abstimmungen==
 all new:<br>
-https://dudle.inf.tu-dresden.de/Aniref2014-Slot3/
+https://dudle.inf.tu-dresden.de/Aniref2014-Slot2/
 
 old & busted:<br>
+https://dudle.inf.tu-dresden.de/Aniref2014-Slot3/
 https://dudle.inf.tu-dresden.de/Aniref2014-0/ Ghost in the Shell<br>
 https://dudle.inf.tu-dresden.de/Aniref2014-1/ Alles und der Rest<br>
 http://doodle.com/63h2isyckhepx2ce
@@ -136,6 +137,10 @@ http://doodle.com/63h2isyckhepx2ce
 |- !
 ! Titel !! Status !! Kategorie !! Studio !! Director !! Composition !! Original Work !! noteworthy
 |-
+| [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=247 Ghost in the Shell: Stand Alone Complex]
+| <div align="center">{{Composition bar|26|26|darkblue}}</div>
+| SciFi<br>Transhumanism || ~Production IG~ || Kamiyama Kenji || || Masamune Shirou
+|-
 | [http://anidb.net/perl-bin/animedb.pl?show=anime&aid=1265 Paranoia Agent]
 | <div align="center">{{Composition bar|13|13|magenta}}</div>
 | Brainfuck, Thriller || Madhouse || [http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=54 Satoshi Kon] || || [http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=54 Satoshi Kon] || Music<br>[http://anidb.net/perl-bin/animedb.pl?show=creator&creatorid=2974 Suzumu Hirasawa]