Merge remote-tracking branch 'upstream/master'

2020-05-13 19:18:09 +00:00
parent 6d3a97d37f d1d1d10689
commit 64aafe2425
5427 changed files with 0 additions and 0 deletions
--- a/appearance/lod/mun_yoda_fountain.lod
+++ b/appearance/lod/mun_yoda_fountain.lod
--- a/appearance/lod/speeder_usv5_s02.lod
+++ b/appearance/lod/speeder_usv5_s02.lod
--- a/appearance/mesh/yt1300_l0.msh
+++ b/appearance/mesh/yt1300_l0.msh
--- a/appearance/poi_all_impl_bunker_abandoned_s01.pob
+++ b/appearance/poi_all_impl_bunker_abandoned_s01.pob
--- a/appearance/pt_campfire_s02.prt
+++ b/appearance/pt_campfire_s02.prt
--- a/customization/asset_customization_manager.iff
+++ b/customization/asset_customization_manager.iff
--- a/datatables/appearance/door_style.iff
+++ b/datatables/appearance/door_style.iff
--- a/footprint/building/player/shared_player_house_tree_house_02.iff
+++ b/footprint/building/player/shared_player_house_tree_house_02.iff
--- a/footprint/building/player/shared_player_house_tree_house_02.sfp
+++ b/footprint/building/player/shared_player_house_tree_house_02.sfp
--- a/misc/object_template_crc_string_table.iff
+++ b/misc/object_template_crc_string_table.iff
--- a/object/building/player/construction/shared_construction_player_house_tree_house_02.iff
+++ b/object/building/player/construction/shared_construction_player_house_tree_house_02.iff
--- a/object/building/player/shared_player_house_tree_house_02.iff
+++ b/object/building/player/shared_player_house_tree_house_02.iff
--- a/object/tangible/deed/player_house_deed/shared_tree_house_02_deed.iff
+++ b/object/tangible/deed/player_house_deed/shared_tree_house_02_deed.iff
--- a/palette/wp_lightsaber.pal
+++ b/palette/wp_lightsaber.pal
--- a/string/en/aprilfools.stf
+++ b/string/en/aprilfools.stf
--- a/string/en/armor_rehue.stf
+++ b/string/en/armor_rehue.stf
--- a/string/en/att_bonus_n.stf
+++ b/string/en/att_bonus_n.stf
--- a/string/en/att_d.stf
+++ b/string/en/att_d.stf
--- a/string/en/att_n.stf
+++ b/string/en/att_n.stf
--- a/string/en/auction.stf
+++ b/string/en/auction.stf
--- a/string/en/auto_invasion.stf
+++ b/string/en/auto_invasion.stf
--- a/string/en/autostack.stf
+++ b/string/en/autostack.stf
--- a/string/en/badge_d.stf
+++ b/string/en/badge_d.stf
--- a/string/en/bar_e3_convo.stf
+++ b/string/en/bar_e3_convo.stf
--- a/string/en/barada.stf
+++ b/string/en/barada.stf
--- a/string/en/barc_repair.stf
+++ b/string/en/barc_repair.stf
--- a/string/en/bartender.stf
+++ b/string/en/bartender.stf
--- a/string/en/bartender_e3_convo.stf
+++ b/string/en/bartender_e3_convo.stf
--- a/string/en/battlefield.stf
+++ b/string/en/battlefield.stf
--- a/string/en/bestine.stf
+++ b/string/en/bestine.stf
--- a/string/en/beta.stf
+++ b/string/en/beta.stf
--- a/string/en/beta/droid_vendor.stf
+++ b/string/en/beta/droid_vendor.stf
--- a/string/en/beta/mount_vendor.stf
+++ b/string/en/beta/mount_vendor.stf
--- a/string/en/beta/vehicle_vendor.stf
+++ b/string/en/beta/vehicle_vendor.stf
--- a/string/en/bfnq2.stf
+++ b/string/en/bfnq2.stf
--- a/string/en/bib_newbie_quest_1.stf
+++ b/string/en/bib_newbie_quest_1.stf
--- a/string/en/bib_newbie_quest_2.stf
+++ b/string/en/bib_newbie_quest_2.stf
--- a/string/en/bib_newbie_quest_3.stf
+++ b/string/en/bib_newbie_quest_3.stf
--- a/string/en/bio_engineer.stf
+++ b/string/en/bio_engineer.stf
--- a/string/en/bombing_run.stf
+++ b/string/en/bombing_run.stf
--- a/string/en/bounty_hunter.stf
+++ b/string/en/bounty_hunter.stf
--- a/string/en/buff_builder.stf
+++ b/string/en/buff_builder.stf
--- a/string/en/building_lookat.stf
+++ b/string/en/building_lookat.stf
--- a/string/en/camp.stf
+++ b/string/en/camp.stf
--- a/string/en/cbt_spam.stf
+++ b/string/en/cbt_spam.stf
--- a/string/en/celebrity/boss_nass.stf
+++ b/string/en/celebrity/boss_nass.stf
--- a/string/en/celebrity/c3po.stf
+++ b/string/en/celebrity/c3po.stf
--- a/string/en/celebrity/captain_eso.stf
+++ b/string/en/celebrity/captain_eso.stf
--- a/string/en/celebrity/charal.stf
+++ b/string/en/celebrity/charal.stf
--- a/string/en/celebrity/chewbacca.stf
+++ b/string/en/celebrity/chewbacca.stf
--- a/string/en/celebrity/commander_byrne.stf
+++ b/string/en/celebrity/commander_byrne.stf
--- a/string/en/celebrity/corporal_sova.stf
+++ b/string/en/celebrity/corporal_sova.stf
--- a/string/en/celebrity/dera_darklighter.stf
+++ b/string/en/celebrity/dera_darklighter.stf
--- a/string/en/celebrity/diax.stf
+++ b/string/en/celebrity/diax.stf
--- a/string/en/celebrity/fath_hray.stf
+++ b/string/en/celebrity/fath_hray.stf
--- a/string/en/celebrity/fightmaster_jorak.stf
+++ b/string/en/celebrity/fightmaster_jorak.stf
--- a/string/en/celebrity/general_otto.stf
+++ b/string/en/celebrity/general_otto.stf
--- a/string/en/celebrity/gerrick_lond.stf
+++ b/string/en/celebrity/gerrick_lond.stf
--- a/string/en/celebrity/gethzerion.stf
+++ b/string/en/celebrity/gethzerion.stf
--- a/string/en/celebrity/gins_darone.stf
+++ b/string/en/celebrity/gins_darone.stf
--- a/string/en/celebrity/gorr_ebelt.stf
+++ b/string/en/celebrity/gorr_ebelt.stf
--- a/string/en/celebrity/han_solo.stf
+++ b/string/en/celebrity/han_solo.stf
--- a/string/en/celebrity/imperial_bribe.stf
+++ b/string/en/celebrity/imperial_bribe.stf
--- a/string/en/celebrity/jan_dodonna.stf
+++ b/string/en/celebrity/jan_dodonna.stf
--- a/string/en/celebrity/jinkins.stf
+++ b/string/en/celebrity/jinkins.stf
--- a/string/en/celebrity/kais.stf
+++ b/string/en/celebrity/kais.stf
--- a/string/en/celebrity/kardeer.stf
+++ b/string/en/celebrity/kardeer.stf
--- a/string/en/celebrity/king_terak.stf
+++ b/string/en/celebrity/king_terak.stf
--- a/string/en/celebrity/kole.stf
+++ b/string/en/celebrity/kole.stf
--- a/string/en/celebrity/lady_valarian.stf
+++ b/string/en/celebrity/lady_valarian.stf
--- a/string/en/celebrity/lerat_zom.stf
+++ b/string/en/celebrity/lerat_zom.stf
--- a/string/en/celebrity/librarian.stf
+++ b/string/en/celebrity/librarian.stf
--- a/string/en/celebrity/lok_engineer.stf
+++ b/string/en/celebrity/lok_engineer.stf
--- a/string/en/celebrity/lok_gambler.stf
+++ b/string/en/celebrity/lok_gambler.stf
--- a/string/en/celebrity/lok_hacker.stf
+++ b/string/en/celebrity/lok_hacker.stf
--- a/string/en/celebrity/luke_skywalker.stf
+++ b/string/en/celebrity/luke_skywalker.stf
--- a/string/en/celebrity/mara_jade.stf
+++ b/string/en/celebrity/mara_jade.stf
--- a/string/en/celebrity/megan_drlar.stf
+++ b/string/en/celebrity/megan_drlar.stf
--- a/string/en/celebrity/mon_mothma.stf
+++ b/string/en/celebrity/mon_mothma.stf
--- a/string/en/celebrity/morag.stf
+++ b/string/en/celebrity/morag.stf
--- a/string/en/celebrity/muftak.stf
+++ b/string/en/celebrity/muftak.stf
--- a/string/en/celebrity/nym.stf
+++ b/string/en/celebrity/nym.stf
--- a/string/en/celebrity/prefect_talmont.stf
+++ b/string/en/celebrity/prefect_talmont.stf
--- a/string/en/celebrity/ruwan_tokai.stf
+++ b/string/en/celebrity/ruwan_tokai.stf
--- a/string/en/celebrity/scholar_szingo.stf
+++ b/string/en/celebrity/scholar_szingo.stf
--- a/string/en/celebrity/wald.stf
+++ b/string/en/celebrity/wald.stf
--- a/string/en/character_transfer.stf
+++ b/string/en/character_transfer.stf
--- a/string/en/chassis_npc.stf
+++ b/string/en/chassis_npc.stf
--- a/string/en/chat_bubble_icon_types.stf
+++ b/string/en/chat_bubble_icon_types.stf
--- a/string/en/chat_format_abbrevs.stf
+++ b/string/en/chat_format_abbrevs.stf
--- a/string/en/chat_prepositions.stf
+++ b/string/en/chat_prepositions.stf
--- a/string/en/chat_tab_names.stf
+++ b/string/en/chat_tab_names.stf
--- a/string/en/chat_types.stf
+++ b/string/en/chat_types.stf
--- a/string/en/chatter_speech.stf
+++ b/string/en/chatter_speech.stf
--- a/string/en/city/bestine/terminal_items.stf
+++ b/string/en/city/bestine/terminal_items.stf
--- a/string/en/city/city.stf
+++ b/string/en/city/city.stf
--- a/string/en/click_respec.stf
+++ b/string/en/click_respec.stf
--- a/string/en/client.stf
+++ b/string/en/client.stf
--- a/string/en/clone_facility.stf
+++ b/string/en/clone_facility.stf
--- a/string/en/cmd_d.stf
+++ b/string/en/cmd_d.stf
--- a/Show More
+++ b/Show More