Update

Afig-Asso · Nov 27, 2023 · b9001f3 · b9001f3
1 parent 6f0e348
commit b9001f3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -337,20 +337,19 @@ Après un push sur github, les éléments suivants sont mis à jours:
   * [_Jobs_](https://www.cybergroupstudios.com/about-us/#jobs)
 
 
-<<<<<<< HEAD
 * **[Dada! Animation](https://www.dada-animation.com/)**  
   * _Studio d'animation: Storytelling et conception créative, animation 3D, immersion et interactivité._
   * **Localisation**: Paris
   * **Domaine scientifique/technique**: Animation
   * **Domaine d'application**: Cinéma/Films d'Animation/VFX
-=======
+
+
 * **[Dark Matters](https://www.darkmatters.one/)**  
   * _Studio de films et VFX_
   * **Localisation**: France/Paris
   * **Domaine scientifique/technique**: Acquisition, Reconstruction
   * **Domaine d'application**: Cinéma/Films d'Animation/VFX
   * [_Jobs_](https://www.darkmatters.one/jobs/)
->>>>>>> 3beb8f70854729695c1e97bc3547fdfbc0512dd2
 
 
 * **[Dassault Systèmes](https://www.3ds.com/fr/)**   :red_circle: _[Entreprise majeure en Graphique avec R&D avancée en France]_
@@ -933,13 +932,6 @@ Après un push sur github, les éléments suivants sont mis à jours:
   * [_Jobs_](https://apply.workable.com/square-enix/)
 
 
-* **[Square Enix](https://www.square-enix-games.com/)**  
-  * _Développement de jeu vidéos_
-  * **Localisation**: France/Paris, International
-  * **Domaine scientifique/technique**: Animation, Synthèse d'image
-  * **Domaine d'application**: Jeu Vidéo
-
-
 * **[Stability AI](https://stability.ai/)**  
   * _IA générative pour le son, l'image et les modèles 3D._
   * **Localisation**: UK/London, Japan/Tokyo

diff --git a/json/data.json b/json/data.json
@@ -873,6 +873,18 @@
                 "Cin\u00e9ma/Films d'Animation/VFX"
             ]
         },
+        {
+            "Name": "Dada! Animation",
+            "url": "https://www.dada-animation.com/",
+            "Description": "Studio d'animation: Storytelling et conception cr\u00e9ative, animation 3D, immersion et interactivit\u00e9.",
+            "Place": "Paris",
+            "Scientific-domain": [
+                "Animation"
+            ],
+            "Application-domain": [
+                "Cin\u00e9ma/Films d'Animation/VFX"
+            ]
+        },
         {
             "Name": "Dark Matters",
             "Description": "Studio de films et VFX",
@@ -1611,6 +1623,19 @@
             ],
             "Employees": 1500
         },
+        {
+            "Name": "Left Angle",
+            "url": "https://www.left-angle.com/?language=en",
+            "Description": "D\u00e9veloppeur d'outils de VFX, Compositing et Motion Design",
+            "Note": "Soci\u00e9t\u00e9 et fondateur \u00e0 la base du projet Open Source de compositing <a href=\"https://natron.fr/\">Natron</a>.",
+            "Place": "Grenoble",
+            "Scientific-domain": [
+                "Animation"
+            ],
+            "Application-domain": [
+                "Cin\u00e9ma/Films d'Animation/VFX"
+            ]
+        },
         {
             "Name": "Les f\u00e9es sp\u00e9ciales",
             "url": "https://les-fees-speciales.coop/",
@@ -2437,27 +2462,6 @@
                 "Jeu Vid\u00e9o"
             ]
         },
-        {
-            "Name": "Square Enix",
-            "url": "https://www.square-enix-games.com/",
-            "Description": "D\u00e9veloppement de jeu vid\u00e9os",
-            "Place": [
-                {
-                    "Country": "France",
-                    "City": "Paris"
-                },
-                {
-                    "International": true
-                }
-            ],
-            "Scientific-domain": [
-                "Animation",
-                "Synth\u00e8se d'image"
-            ],
-            "Application-domain": [
-                "Jeu Vid\u00e9o"
-            ]
-        },
         {
             "Name": "Stability AI",
             "url": "https://stability.ai/",
@@ -2532,6 +2536,27 @@
                 "Jeu Vid\u00e9o"
             ]
         },
+        {
+            "Name": "Superprod Animation",
+            "url": "https://www.superprod.net/fr",
+            "Description": "Producteur ind\u00e9pendant europ\u00e9en de films et des s\u00e9ries d'animation et de fiction.",
+            "Place": [
+                {
+                    "Country": "France",
+                    "City": "Paris"
+                },
+                {
+                    "Country": "France",
+                    "City": "Angoul\u00eame"
+                }
+            ],
+            "Scientific-domain": [
+                "Animation"
+            ],
+            "Application-domain": [
+                "Cin\u00e9ma/Films d'Animation/VFX"
+            ]
+        },
         {
             "Name": "SysNav",
             "url": "https://www.sysnav.fr/",
@@ -3147,52 +3172,6 @@
             "Application-domain": [
                 "G\u00e9n\u00e9rique"
             ]
-        },
-        {
-            "Name": "Superprod Animation",
-            "url": "https://www.superprod.net/fr",
-            "Description": "Producteur ind\u00e9pendant europ\u00e9en de films et des s\u00e9ries d'animation et de fiction.",
-            "Place": [
-                {
-                    "Country": "France",
-                    "City": "Paris"
-                },
-                {
-                    "Country": "France",
-                    "City": "Angoul\u00eame"
-                }
-            ],
-            "Scientific-domain": [
-                "Animation"
-            ],
-            "Application-domain": [
-                "Cin\u00e9ma/Films d'Animation/VFX"
-            ]
-        },
-        {
-            "Name": "Left Angle",
-            "url": "https://www.left-angle.com/?language=en",
-            "Description": "D\u00e9veloppeur d'outils de VFX, Compositing et Motion Design",
-            "Note": "Soci\u00e9t\u00e9 et fondateur \u00e0 la base du projet Open Source de compositing <a href=\"https://natron.fr/\">Natron</a>.",
-            "Place": "Grenoble",
-            "Scientific-domain": [
-                "Animation"
-            ],
-            "Application-domain": [
-                "Cin\u00e9ma/Films d'Animation/VFX"
-            ]
-        },
-        {
-            "Name": "Dada! Animation",
-            "url": "https://www.dada-animation.com/",
-            "Description": "Studio d'animation: Storytelling et conception cr\u00e9ative, animation 3D, immersion et interactivit\u00e9.",
-            "Place": "Paris",
-            "Scientific-domain": [
-                "Animation"
-            ],
-            "Application-domain": [
-                "Cin\u00e9ma/Films d'Animation/VFX"
-            ]
         }
     ]
 }