Merge remote-tracking branch 'upstream/master'

2019-04-05 18:47:47 -05:00
parent 741e061a14 e7d8e11208
commit 826f14fbe1
29 changed files with 0 additions and 0 deletions
--- a/appearance/mesh/robe_prefect_talmont_m_hat_noir.lmg
+++ b/appearance/mesh/robe_prefect_talmont_m_hat_noir.lmg
--- a/appearance/mesh/robe_prefect_talmont_m_l0_hat_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l0_hat_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l0_pantalon_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l0_pantalon_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l0_tout_blanc.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l0_tout_blanc.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l0_tout_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l0_tout_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l1_hat_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l1_hat_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l1_pantalon_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l1_pantalon_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l1_tout_blanc.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l1_tout_blanc.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l1_tout_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l1_tout_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l2_hat_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l2_hat_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l2_pantalon_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l2_pantalon_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l2_tout_blanc.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l2_tout_blanc.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l2_tout_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l2_tout_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l3_hat_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l3_hat_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l3_pantalon_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l3_pantalon_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l3_tout_blanc.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l3_tout_blanc.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_l3_tout_noir.mgn
+++ b/appearance/mesh/robe_prefect_talmont_m_l3_tout_noir.mgn
--- a/appearance/mesh/robe_prefect_talmont_m_pantalon_noir.lmg
+++ b/appearance/mesh/robe_prefect_talmont_m_pantalon_noir.lmg
--- a/appearance/mesh/robe_prefect_talmont_m_tout_blanc.lmg
+++ b/appearance/mesh/robe_prefect_talmont_m_tout_blanc.lmg
--- a/appearance/mesh/robe_prefect_talmont_m_tout_noir.lmg
+++ b/appearance/mesh/robe_prefect_talmont_m_tout_noir.lmg
--- a/appearance/robe_prefect_talmont_m_hat_noir.sat
+++ b/appearance/robe_prefect_talmont_m_hat_noir.sat
--- a/appearance/robe_prefect_talmont_m_pantalon_noir.sat
+++ b/appearance/robe_prefect_talmont_m_pantalon_noir.sat
--- a/appearance/robe_prefect_talmont_m_tout_blanc.sat
+++ b/appearance/robe_prefect_talmont_m_tout_blanc.sat
--- a/appearance/robe_prefect_talmont_m_tout_noir.sat
+++ b/appearance/robe_prefect_talmont_m_tout_noir.sat
--- a/string/en/mob/creature_names.stf
+++ b/string/en/mob/creature_names.stf
--- a/string/en/static_item_d.stf
+++ b/string/en/static_item_d.stf
--- a/string/en/static_item_n.stf
+++ b/string/en/static_item_n.stf
--- a/string/en/wearables_detail.stf
+++ b/string/en/wearables_detail.stf
--- a/string/en/wearables_name.stf
+++ b/string/en/wearables_name.stf