Merge branch 'master' into 'v1.3'

# Conflicts: # module/actor.js # module/rdd-combat.js # module/rdd-resolution-table.js # module/rdd-roll.js # system.json # templates/chat-resultat-parade.html
Merge branch 'v1.3' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon into v1.3
2021-02-27 22:06:27 +00:00 · 2021-02-27 23:02:52 +01:00 · 2021-02-27 22:59:10 +01:00 · 2021-02-26 23:54:17 +01:00 · 2021-02-26 20:31:07 +00:00 · 2021-02-26 20:46:46 +01:00
423 changed files with 13548 additions and 4781 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+.vscode/settings.json
+todo.txt
+todo.md
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@ Pseudo : LeRatierBretonnien
 # Contributeurs (Pseudo sur Discord Foundry FR) : 

 Mainteneur/Développeur : LeRatierBretonnien
-Développeur : VincentMK
+Développeur : VincentVk
 Tests, Compendiums, Données: Fred, Fab, Grendel
 Styles/CSS : Mandar

--- 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/arts/chant_0.webp
+++ b/icons/arts/chant_0.webp
--- a/icons/arts/chant_1.webp
+++ b/icons/arts/chant_1.webp
--- a/icons/arts/chant_2.webp
+++ b/icons/arts/chant_2.webp
--- a/icons/arts/chant_3.webp
+++ b/icons/arts/chant_3.webp
--- a/icons/arts/chant_4.webp
+++ b/icons/arts/chant_4.webp
--- a/icons/arts/chant_5.webp
+++ b/icons/arts/chant_5.webp
--- a/icons/arts/chant_6.webp
+++ b/icons/arts/chant_6.webp
--- a/icons/arts/chant_7.webp
+++ b/icons/arts/chant_7.webp
--- a/icons/arts/chant_8.webp
+++ b/icons/arts/chant_8.webp
--- a/icons/arts/danseS_2.webp
+++ b/icons/arts/danseS_2.webp
--- a/icons/arts/danse_0.webp
+++ b/icons/arts/danse_0.webp
--- a/icons/arts/danse_1.webp
+++ b/icons/arts/danse_1.webp
--- a/icons/arts/danse_2.webp
+++ b/icons/arts/danse_2.webp
--- a/icons/arts/danse_3.webp
+++ b/icons/arts/danse_3.webp
--- a/icons/arts/danse_4.webp
+++ b/icons/arts/danse_4.webp
--- a/icons/arts/danse_5.webp
+++ b/icons/arts/danse_5.webp
--- a/icons/arts/danse_6.webp
+++ b/icons/arts/danse_6.webp
--- a/icons/arts/danse_sol_1.webp
+++ b/icons/arts/danse_sol_1.webp
--- a/icons/arts/danse_sol_2.webp
+++ b/icons/arts/danse_sol_2.webp
--- a/icons/arts/danse_sol_4.webp
+++ b/icons/arts/danse_sol_4.webp
--- a/icons/arts/danse_sol_5.webp
+++ b/icons/arts/danse_sol_5.webp
--- a/icons/arts/danse_sol_6.webp
+++ b/icons/arts/danse_sol_6.webp
--- a/icons/arts/danse_sol_8.webp
+++ b/icons/arts/danse_sol_8.webp
--- a/icons/arts/jeux_brasdefer.webp
+++ b/icons/arts/jeux_brasdefer.webp
--- a/icons/arts/jeux_calculs.webp
+++ b/icons/arts/jeux_calculs.webp
--- a/icons/arts/jeux_doublon.webp
+++ b/icons/arts/jeux_doublon.webp
--- a/icons/arts/jeux_flechettes.webp
+++ b/icons/arts/jeux_flechettes.webp
--- a/icons/arts/jeux_petasse.webp
+++ b/icons/arts/jeux_petasse.webp
--- a/icons/arts/jeux_plumette.webp
+++ b/icons/arts/jeux_plumette.webp
--- a/icons/arts/jeux_tisonnier.webp
+++ b/icons/arts/jeux_tisonnier.webp
--- a/icons/arts/recette_cuisine_1.webp
+++ b/icons/arts/recette_cuisine_1.webp
--- a/icons/arts/recette_cuisine_2.webp
+++ b/icons/arts/recette_cuisine_2.webp
--- a/icons/arts/recette_cuisine_3.webp
+++ b/icons/arts/recette_cuisine_3.webp
--- a/icons/arts/recette_cuisine_4.webp
+++ b/icons/arts/recette_cuisine_4.webp
--- a/icons/arts/recette_cuisine_6.webp
+++ b/icons/arts/recette_cuisine_6.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/Show More
+++ b/Show More