Merge remote-tracking branch 'upstream/master'

2019-02-20 16:58:33 -06:00
parent 0a4d6ea505 436f064f3c
commit aae561d710
34096 changed files with 0 additions and 445538 deletions
--- a/abstract/slot/arrangement/appearance_inventory_arrangement.iff
+++ b/abstract/slot/arrangement/appearance_inventory_arrangement.iff
--- a/abstract/slot/arrangement/arrangement_ammo_cartridge.iff
+++ b/abstract/slot/arrangement/arrangement_ammo_cartridge.iff
--- a/abstract/slot/arrangement/arrangement_bank.iff
+++ b/abstract/slot/arrangement/arrangement_bank.iff
--- a/abstract/slot/arrangement/arrangement_crafting_components.iff
+++ b/abstract/slot/arrangement/arrangement_crafting_components.iff
--- a/abstract/slot/arrangement/arrangement_datapad.iff
+++ b/abstract/slot/arrangement/arrangement_datapad.iff
--- a/abstract/slot/arrangement/arrangement_default_weapon.iff
+++ b/abstract/slot/arrangement/arrangement_default_weapon.iff
--- a/abstract/slot/arrangement/arrangement_default_weapon_am.iff
+++ b/abstract/slot/arrangement/arrangement_default_weapon_am.iff
--- a/abstract/slot/arrangement/arrangement_door.iff
+++ b/abstract/slot/arrangement/arrangement_door.iff
--- a/abstract/slot/arrangement/arrangement_hangar.iff
+++ b/abstract/slot/arrangement/arrangement_hangar.iff
--- a/abstract/slot/arrangement/arrangement_ingredient_hopper.iff
+++ b/abstract/slot/arrangement/arrangement_ingredient_hopper.iff
--- a/abstract/slot/arrangement/arrangement_manf_schematic.iff
+++ b/abstract/slot/arrangement/arrangement_manf_schematic.iff
--- a/abstract/slot/arrangement/arrangement_mission_bag.iff
+++ b/abstract/slot/arrangement/arrangement_mission_bag.iff
--- a/abstract/slot/arrangement/arrangement_output_hopper.iff
+++ b/abstract/slot/arrangement/arrangement_output_hopper.iff
--- a/abstract/slot/arrangement/arrangement_player_object.iff
+++ b/abstract/slot/arrangement/arrangement_player_object.iff
--- a/abstract/slot/arrangement/arrangement_ship.iff
+++ b/abstract/slot/arrangement/arrangement_ship.iff
--- a/abstract/slot/arrangement/arrangement_structure.iff
+++ b/abstract/slot/arrangement/arrangement_structure.iff
--- a/abstract/slot/arrangement/arrangement_strut_a.iff
+++ b/abstract/slot/arrangement/arrangement_strut_a.iff
--- a/abstract/slot/arrangement/arrangement_strut_b.iff
+++ b/abstract/slot/arrangement/arrangement_strut_b.iff
--- a/abstract/slot/arrangement/arrangement_strut_c.iff
+++ b/abstract/slot/arrangement/arrangement_strut_c.iff
--- a/abstract/slot/arrangement/arrangement_test_cartridge_am.iff
+++ b/abstract/slot/arrangement/arrangement_test_cartridge_am.iff
--- a/abstract/slot/arrangement/arrangement_test_prototype.iff
+++ b/abstract/slot/arrangement/arrangement_test_prototype.iff
--- a/abstract/slot/arrangement/arrangement_token.iff
+++ b/abstract/slot/arrangement/arrangement_token.iff
--- a/abstract/slot/arrangement/arrangement_transport.iff
+++ b/abstract/slot/arrangement/arrangement_transport.iff
--- a/abstract/slot/arrangement/droid.iff
+++ b/abstract/slot/arrangement/droid.iff
--- a/abstract/slot/arrangement/inventory_arrangement.iff
+++ b/abstract/slot/arrangement/inventory_arrangement.iff
--- a/abstract/slot/arrangement/player.iff
+++ b/abstract/slot/arrangement/player.iff
--- a/abstract/slot/arrangement/saber_inv_arrangement.iff
+++ b/abstract/slot/arrangement/saber_inv_arrangement.iff
--- a/abstract/slot/arrangement/wearables/back.iff
+++ b/abstract/slot/arrangement/wearables/back.iff
--- a/abstract/slot/arrangement/wearables/bandolier.iff
+++ b/abstract/slot/arrangement/wearables/bandolier.iff
--- a/abstract/slot/arrangement/wearables/belt.iff
+++ b/abstract/slot/arrangement/wearables/belt.iff
--- a/abstract/slot/arrangement/wearables/bicep_both.iff
+++ b/abstract/slot/arrangement/wearables/bicep_both.iff
--- a/abstract/slot/arrangement/wearables/bicep_l.iff
+++ b/abstract/slot/arrangement/wearables/bicep_l.iff
--- a/abstract/slot/arrangement/wearables/bicep_r.iff
+++ b/abstract/slot/arrangement/wearables/bicep_r.iff
--- a/abstract/slot/arrangement/wearables/bracer_both.iff
+++ b/abstract/slot/arrangement/wearables/bracer_both.iff
--- a/abstract/slot/arrangement/wearables/bracer_l.iff
+++ b/abstract/slot/arrangement/wearables/bracer_l.iff
--- a/abstract/slot/arrangement/wearables/bracer_r.iff
+++ b/abstract/slot/arrangement/wearables/bracer_r.iff
--- a/abstract/slot/arrangement/wearables/bracer_upper_both.iff
+++ b/abstract/slot/arrangement/wearables/bracer_upper_both.iff
--- a/abstract/slot/arrangement/wearables/bracer_upper_l.iff
+++ b/abstract/slot/arrangement/wearables/bracer_upper_l.iff
--- a/abstract/slot/arrangement/wearables/bracer_upper_r.iff
+++ b/abstract/slot/arrangement/wearables/bracer_upper_r.iff
--- a/abstract/slot/arrangement/wearables/cape.iff
+++ b/abstract/slot/arrangement/wearables/cape.iff
--- a/abstract/slot/arrangement/wearables/cloak.iff
+++ b/abstract/slot/arrangement/wearables/cloak.iff
--- a/abstract/slot/arrangement/wearables/cloak_hooded.iff
+++ b/abstract/slot/arrangement/wearables/cloak_hooded.iff
--- a/abstract/slot/arrangement/wearables/cloak_noback.iff
+++ b/abstract/slot/arrangement/wearables/cloak_noback.iff
--- a/abstract/slot/arrangement/wearables/costume_allow_jewelry.iff
+++ b/abstract/slot/arrangement/wearables/costume_allow_jewelry.iff
--- a/abstract/slot/arrangement/wearables/costume_full.iff
+++ b/abstract/slot/arrangement/wearables/costume_full.iff
--- a/abstract/slot/arrangement/wearables/cowl_long_closed_mouth.iff
+++ b/abstract/slot/arrangement/wearables/cowl_long_closed_mouth.iff
--- a/abstract/slot/arrangement/wearables/cowl_long_open_mouth.iff
+++ b/abstract/slot/arrangement/wearables/cowl_long_open_mouth.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_arm_l.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_arm_l.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_arm_r.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_arm_r.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_forearm_l.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_forearm_l.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_forearm_r.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_forearm_r.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_hand_l.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_hand_l.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_hand_r.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_hand_r.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_leg.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_leg.iff
--- a/abstract/slot/arrangement/wearables/cybernetic_torso.iff
+++ b/abstract/slot/arrangement/wearables/cybernetic_torso.iff
--- a/abstract/slot/arrangement/wearables/dress.iff
+++ b/abstract/slot/arrangement/wearables/dress.iff
--- a/abstract/slot/arrangement/wearables/dress_formal.iff
+++ b/abstract/slot/arrangement/wearables/dress_formal.iff
--- a/abstract/slot/arrangement/wearables/dress_formal_gloved.iff
+++ b/abstract/slot/arrangement/wearables/dress_formal_gloved.iff
--- a/abstract/slot/arrangement/wearables/dress_formal_hooded.iff
+++ b/abstract/slot/arrangement/wearables/dress_formal_hooded.iff
--- a/abstract/slot/arrangement/wearables/dress_longsleeve.iff
+++ b/abstract/slot/arrangement/wearables/dress_longsleeve.iff
--- a/abstract/slot/arrangement/wearables/dress_poofysleeve_allow_gauntlets.iff
+++ b/abstract/slot/arrangement/wearables/dress_poofysleeve_allow_gauntlets.iff
--- a/abstract/slot/arrangement/wearables/dress_poofysleeve_full.iff
+++ b/abstract/slot/arrangement/wearables/dress_poofysleeve_full.iff
--- a/abstract/slot/arrangement/wearables/dress_poofysleeve_lower.iff
+++ b/abstract/slot/arrangement/wearables/dress_poofysleeve_lower.iff
--- a/abstract/slot/arrangement/wearables/dress_poofysleeve_upper.iff
+++ b/abstract/slot/arrangement/wearables/dress_poofysleeve_upper.iff
--- a/abstract/slot/arrangement/wearables/ear_both.iff
+++ b/abstract/slot/arrangement/wearables/ear_both.iff
--- a/abstract/slot/arrangement/wearables/ear_either.iff
+++ b/abstract/slot/arrangement/wearables/ear_either.iff
--- a/abstract/slot/arrangement/wearables/ear_l.iff
+++ b/abstract/slot/arrangement/wearables/ear_l.iff
--- a/abstract/slot/arrangement/wearables/ear_r.iff
+++ b/abstract/slot/arrangement/wearables/ear_r.iff
--- a/abstract/slot/arrangement/wearables/empty.iff
+++ b/abstract/slot/arrangement/wearables/empty.iff
--- a/abstract/slot/arrangement/wearables/eyes.iff
+++ b/abstract/slot/arrangement/wearables/eyes.iff
--- a/abstract/slot/arrangement/wearables/gauntlets.iff
+++ b/abstract/slot/arrangement/wearables/gauntlets.iff
--- a/abstract/slot/arrangement/wearables/gauntlets_long.iff
+++ b/abstract/slot/arrangement/wearables/gauntlets_long.iff
--- a/abstract/slot/arrangement/wearables/gloves.iff
+++ b/abstract/slot/arrangement/wearables/gloves.iff
--- a/abstract/slot/arrangement/wearables/gloves_long.iff
+++ b/abstract/slot/arrangement/wearables/gloves_long.iff
--- a/abstract/slot/arrangement/wearables/hair.iff
+++ b/abstract/slot/arrangement/wearables/hair.iff
--- a/abstract/slot/arrangement/wearables/hat.iff
+++ b/abstract/slot/arrangement/wearables/hat.iff
--- a/abstract/slot/arrangement/wearables/helmet_closed_eyes.iff
+++ b/abstract/slot/arrangement/wearables/helmet_closed_eyes.iff
--- a/abstract/slot/arrangement/wearables/helmet_closed_full.iff
+++ b/abstract/slot/arrangement/wearables/helmet_closed_full.iff
--- a/abstract/slot/arrangement/wearables/helmet_closed_full_ventilated.iff
+++ b/abstract/slot/arrangement/wearables/helmet_closed_full_ventilated.iff
--- a/abstract/slot/arrangement/wearables/helmet_closed_mouth.iff
+++ b/abstract/slot/arrangement/wearables/helmet_closed_mouth.iff
--- a/abstract/slot/arrangement/wearables/helmet_open.iff
+++ b/abstract/slot/arrangement/wearables/helmet_open.iff
--- a/abstract/slot/arrangement/wearables/hold_both.iff
+++ b/abstract/slot/arrangement/wearables/hold_both.iff
--- a/abstract/slot/arrangement/wearables/hold_door.iff
+++ b/abstract/slot/arrangement/wearables/hold_door.iff
--- a/abstract/slot/arrangement/wearables/hold_l.iff
+++ b/abstract/slot/arrangement/wearables/hold_l.iff
--- a/abstract/slot/arrangement/wearables/hold_r.iff
+++ b/abstract/slot/arrangement/wearables/hold_r.iff
--- a/abstract/slot/arrangement/wearables/hold_strut_a.iff
+++ b/abstract/slot/arrangement/wearables/hold_strut_a.iff
--- a/abstract/slot/arrangement/wearables/hold_strut_b.iff
+++ b/abstract/slot/arrangement/wearables/hold_strut_b.iff
--- a/abstract/slot/arrangement/wearables/hold_strut_c.iff
+++ b/abstract/slot/arrangement/wearables/hold_strut_c.iff
--- a/abstract/slot/arrangement/wearables/hold_transport.iff
+++ b/abstract/slot/arrangement/wearables/hold_transport.iff
--- a/abstract/slot/arrangement/wearables/jacket_halfsleeve.iff
+++ b/abstract/slot/arrangement/wearables/jacket_halfsleeve.iff
--- a/abstract/slot/arrangement/wearables/jacket_longsleeve.iff
+++ b/abstract/slot/arrangement/wearables/jacket_longsleeve.iff
--- a/abstract/slot/arrangement/wearables/jacket_shortsleeve.iff
+++ b/abstract/slot/arrangement/wearables/jacket_shortsleeve.iff
--- a/abstract/slot/arrangement/wearables/jedi_jumpsuit.iff
+++ b/abstract/slot/arrangement/wearables/jedi_jumpsuit.iff
--- a/abstract/slot/arrangement/wearables/jedi_jumpsuit_02.iff
+++ b/abstract/slot/arrangement/wearables/jedi_jumpsuit_02.iff
--- a/abstract/slot/arrangement/wearables/jedi_robe.iff
+++ b/abstract/slot/arrangement/wearables/jedi_robe.iff
--- a/abstract/slot/arrangement/wearables/jewelry_set.iff
+++ b/abstract/slot/arrangement/wearables/jewelry_set.iff
--- a/abstract/slot/arrangement/wearables/jumpsuit.iff
+++ b/abstract/slot/arrangement/wearables/jumpsuit.iff
--- a/abstract/slot/arrangement/wearables/jumpsuit_gloved.iff
+++ b/abstract/slot/arrangement/wearables/jumpsuit_gloved.iff
--- a/abstract/slot/arrangement/wearables/jumpsuit_longsleeve.iff
+++ b/abstract/slot/arrangement/wearables/jumpsuit_longsleeve.iff
--- a/abstract/slot/arrangement/wearables/jumpsuit_shortsleeve.iff
+++ b/abstract/slot/arrangement/wearables/jumpsuit_shortsleeve.iff
--- a/Show More
+++ b/Show More