Merge branch 'master' of https://git.crystalyx.net/camelia-studio/Moisson-Rouge

.drone.yml

@@ -13,4 +13,7 @@ steps:
     HOST:
       from_secret: shelter-host
   commands:
-    - lftp -c "set cmd:fail-exit yes; set ftp:ssl-allow no;set dns:order \"inet inet6\"; open -u $USERNAME,$PASSWORD $HOST; cd cila.camelia-studio.org/moisson-rouge; mirror -Rpnevvv --parallel=10 --exclude .git/"
+  - lftp -c "set cmd:fail-exit yes; set ftp:ssl-allow no;set dns:order \"inet inet6\"; open -u $USERNAME,$PASSWORD $HOST; cd cila.camelia-studio.org/moisson-rouge; mirror -Rpnevvv --parallel=10 --exclude .git/"
+  when:
+    branch:
+    - master

app.js

@@ -196,7 +196,7 @@
             }
         };
 
-        $http.get('https://raw.githubusercontent.com/Mopolo/Eternelle-Moisson/gh-pages/monsters.json').then(function(res) {
+        $http.get('monsters.json').then(function(res) {
             vm.monsters = res.data;
             vm.monsters.forEach(monster => {
                 monster.owned = vm.saveData?.find(el => el[0] === monster.id) ? vm.saveData.find(el => el[0] === monster.id)[1] : 0