Merge branch 'v1.2' into 'master'

V1.2 See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!125
2021-01-22 16:19:40 +00:00 · 2021-01-22 16:19:40 +00:00 · bce2514058
commit bce2514058
parent d7bf41f859 6341d2f3b0
271 changed files with 7507 additions and 3280 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+.vscode/settings.json
+todo.txt
+todo.md
--- a/icons/alchimie/recette_alchimique_bitume.webp
+++ b/icons/alchimie/recette_alchimique_bitume.webp
--- a/icons/alchimie/recette_alchimique_cristal.webp
+++ b/icons/alchimie/recette_alchimique_cristal.webp
--- a/icons/alchimie/recette_alchimique_disruption.webp
+++ b/icons/alchimie/recette_alchimique_disruption.webp
--- a/icons/alchimie/recette_alchimique_elixir.webp
+++ b/icons/alchimie/recette_alchimique_elixir.webp
--- a/icons/alchimie/recette_alchimique_geleeroyale.webp
+++ b/icons/alchimie/recette_alchimique_geleeroyale.webp
--- a/icons/alchimie/recette_alchimique_huileselikanthe.webp
+++ b/icons/alchimie/recette_alchimique_huileselikanthe.webp
--- a/icons/alchimie/recette_alchimique_laitdelune.webp
+++ b/icons/alchimie/recette_alchimique_laitdelune.webp
--- a/icons/alchimie/recette_alchimique_liqueur.webp
+++ b/icons/alchimie/recette_alchimique_liqueur.webp
--- a/icons/alchimie/recette_alchimique_mirobolant.webp
+++ b/icons/alchimie/recette_alchimique_mirobolant.webp
--- a/icons/alchimie/recette_alchimique_perle.webp
+++ b/icons/alchimie/recette_alchimique_perle.webp
--- a/icons/alchimie/recette_alchimique_potiondexterite.webp
+++ b/icons/alchimie/recette_alchimique_potiondexterite.webp
--- a/icons/alchimie/recette_alchimique_potionforce.webp
+++ b/icons/alchimie/recette_alchimique_potionforce.webp
--- a/icons/alchimie/recette_alchimique_potionsoin.webp
+++ b/icons/alchimie/recette_alchimique_potionsoin.webp
--- a/icons/alchimie/recette_alchimique_pulverisation.webp
+++ b/icons/alchimie/recette_alchimique_pulverisation.webp
--- a/icons/alchimie/recette_alchimique_reliquefaction.webp
+++ b/icons/alchimie/recette_alchimique_reliquefaction.webp
--- a/icons/alchimie/recette_alchimique_sable.webp
+++ b/icons/alchimie/recette_alchimique_sable.webp
--- a/icons/alchimie/recette_alchimique_teinture.webp
+++ b/icons/alchimie/recette_alchimique_teinture.webp
--- a/icons/alchimie/recette_alchimique_topazoine.webp
+++ b/icons/alchimie/recette_alchimique_topazoine.webp
--- a/icons/alchimie/recette_alchimique_tournegraisse.webp
+++ b/icons/alchimie/recette_alchimique_tournegraisse.webp
--- a/icons/compcreature-beak.webp
+++ b/icons/compcreature-beak.webp
--- a/icons/compcreature-brasbouche.webp
+++ b/icons/compcreature-brasbouche.webp
--- a/icons/compcreature-contre.webp
+++ b/icons/compcreature-contre.webp
--- a/icons/compcreature-corne.webp
+++ b/icons/compcreature-corne.webp
--- a/icons/compcreature-coup_de_pied.webp
+++ b/icons/compcreature-coup_de_pied.webp
--- a/icons/compcreature-crete.webp
+++ b/icons/compcreature-crete.webp
--- a/icons/compcreature-griffes.webp
+++ b/icons/compcreature-griffes.webp
--- a/icons/compcreature-mandibules.webp
+++ b/icons/compcreature-mandibules.webp
--- a/icons/compcreature-morsure.webp
+++ b/icons/compcreature-morsure.webp
--- a/icons/compcreature-pierrelancee.webp
+++ b/icons/compcreature-pierrelancee.webp
--- a/icons/compcreature-pierretenue.webp
+++ b/icons/compcreature-pierretenue.webp
--- a/icons/compcreature-pietinement.webp
+++ b/icons/compcreature-pietinement.webp
--- a/icons/compcreature-pinces.webp
+++ b/icons/compcreature-pinces.webp
--- a/icons/compcreature-serres.webp
+++ b/icons/compcreature-serres.webp
--- a/icons/compcreature-tentacule.webp
+++ b/icons/compcreature-tentacule.webp
--- a/icons/compcreature-tronconneuse.webp
+++ b/icons/compcreature-tronconneuse.webp
--- a/icons/compcreature-vol.webp
+++ b/icons/compcreature-vol.webp
--- a/icons/compcreature_empoignade.webp
+++ b/icons/compcreature_empoignade.webp
--- a/icons/competence_acrobatie.webp
+++ b/icons/competence_acrobatie.webp
--- a/icons/competence_alchimie.webp
+++ b/icons/competence_alchimie.webp
--- a/icons/competence_arbalete.webp
+++ b/icons/competence_arbalete.webp
--- a/icons/competence_arc.webp
+++ b/icons/competence_arc.webp
--- a/icons/competence_armes_hast.webp
+++ b/icons/competence_armes_hast.webp
--- a/icons/competence_astrologie.webp
+++ b/icons/competence_astrologie.webp
--- a/icons/competence_botanique.webp
+++ b/icons/competence_botanique.webp
--- a/icons/competence_bouclier.webp
+++ b/icons/competence_bouclier.webp
--- a/icons/competence_bricolage.webp
+++ b/icons/competence_bricolage.webp
--- a/icons/competence_chant.webp
+++ b/icons/competence_chant.webp
--- a/icons/competence_charpenterie.webp
+++ b/icons/competence_charpenterie.webp
--- a/icons/competence_chirurgie.webp
+++ b/icons/competence_chirurgie.webp
--- a/icons/competence_comedie.webp
+++ b/icons/competence_comedie.webp
--- a/icons/competence_corps_a_corps.webp
+++ b/icons/competence_corps_a_corps.webp
--- a/icons/competence_course.webp
+++ b/icons/competence_course.webp
--- a/icons/competence_cuisine.webp
+++ b/icons/competence_cuisine.webp
--- a/icons/competence_dague.webp
+++ b/icons/competence_dague.webp
--- a/icons/competence_dague_jet.webp
+++ b/icons/competence_dague_jet.webp
--- a/icons/competence_danse.webp
+++ b/icons/competence_danse.webp
--- a/icons/competence_defaut.webp
+++ b/icons/competence_defaut.webp
--- a/icons/competence_dessin.webp
+++ b/icons/competence_dessin.webp
--- a/icons/competence_discretion.webp
+++ b/icons/competence_discretion.webp
--- a/icons/competence_ecriture.webp
+++ b/icons/competence_ecriture.webp
--- a/icons/competence_epee_1_main.webp
+++ b/icons/competence_epee_1_main.webp
--- a/icons/competence_epee_2_mains.webp
+++ b/icons/competence_epee_2_mains.webp
--- a/icons/competence_equitation.webp
+++ b/icons/competence_equitation.webp
--- a/icons/competence_escalade.webp
+++ b/icons/competence_escalade.webp
--- a/icons/competence_esquive.webp
+++ b/icons/competence_esquive.webp
--- a/icons/competence_fleau.webp
+++ b/icons/competence_fleau.webp
--- a/icons/competence_fouet.webp
+++ b/icons/competence_fouet.webp
--- a/icons/competence_fronde.webp
+++ b/icons/competence_fronde.webp
--- a/icons/competence_grouine.webp
+++ b/icons/competence_grouine.webp
--- a/icons/competence_hache_a_1_main.webp
+++ b/icons/competence_hache_a_1_main.webp
--- a/icons/competence_hache_a_2_mains.webp
+++ b/icons/competence_hache_a_2_mains.webp
--- a/icons/competence_hypnos.webp
+++ b/icons/competence_hypnos.webp
--- a/icons/competence_javelot.webp
+++ b/icons/competence_javelot.webp
--- a/icons/competence_jeu.webp
+++ b/icons/competence_jeu.webp
--- a/icons/competence_jonglerie.webp
+++ b/icons/competence_jonglerie.webp
--- a/icons/competence_lance.webp
+++ b/icons/competence_lance.webp
--- a/icons/competence_legendes.webp
+++ b/icons/competence_legendes.webp
--- a/icons/competence_maconnerie.webp
+++ b/icons/competence_maconnerie.webp
--- a/icons/competence_maroquinerie.webp
+++ b/icons/competence_maroquinerie.webp
--- a/icons/competence_masse_1_main.webp
+++ b/icons/competence_masse_1_main.webp
--- a/icons/competence_masse_2_mains.webp
+++ b/icons/competence_masse_2_mains.webp
--- a/icons/competence_medecine.webp
+++ b/icons/competence_medecine.webp
--- a/icons/competence_metallurgie.webp
+++ b/icons/competence_metallurgie.webp
--- a/icons/competence_musique.webp
+++ b/icons/competence_musique.webp
--- a/icons/competence_narcos.webp
+++ b/icons/competence_narcos.webp
--- a/icons/competence_natation.webp
+++ b/icons/competence_natation.webp
--- a/icons/competence_navigation.webp
+++ b/icons/competence_navigation.webp
--- a/icons/competence_oniros.webp
+++ b/icons/competence_oniros.webp
--- a/icons/competence_orfevrerie.webp
+++ b/icons/competence_orfevrerie.webp
--- a/icons/competence_pickpocket.webp
+++ b/icons/competence_pickpocket.webp
--- a/icons/competence_saut.webp
+++ b/icons/competence_saut.webp
--- a/icons/competence_seduction.webp
+++ b/icons/competence_seduction.webp
--- a/icons/competence_serrurerie.webp
+++ b/icons/competence_serrurerie.webp
--- a/icons/competence_survie_cite.webp
+++ b/icons/competence_survie_cite.webp
--- a/icons/competence_survie_desert.webp
+++ b/icons/competence_survie_desert.webp
--- a/icons/competence_survie_exterieur.webp
+++ b/icons/competence_survie_exterieur.webp
--- a/icons/competence_survie_foret.webp
+++ b/icons/competence_survie_foret.webp
--- a/icons/competence_survie_glace.webp
+++ b/icons/competence_survie_glace.webp
--- a/icons/competence_survie_marais.webp
+++ b/icons/competence_survie_marais.webp
--- a/Show More
+++ b/Show More