seefoe 908679551f Fixed faction restrictions for rest of armours ...

(cherry picked from commit 8e2c11d35deff66c4743fabe3deabceada5765a0)

2018-05-18 22:07:44 -04:00

..

bank

Fixed merge issues.

2018-03-26 01:21:00 +01:00

base

Fixed merge issues.

2018-03-26 01:21:00 +01:00

beta

Fixed merge issues.

2018-03-26 01:21:00 +01:00

bug_jar

Fixed merge issues.

2018-03-26 01:21:00 +01:00

buildout

Fixed merge issues.

2018-03-26 01:21:00 +01:00

camp

Fixed merge issues.

2018-03-26 01:21:00 +01:00

collection

Fixed merge issues.

2018-03-26 01:21:00 +01:00

component

Fixed merge issues.

2018-03-26 01:21:00 +01:00

container

Fixed merge issues.

2018-03-26 01:21:00 +01:00

content

Fixed merge issues.

2018-03-26 01:21:00 +01:00

crafting

Fixed merge issues.

2018-03-26 01:21:00 +01:00

creature_spawner

Fixed merge issues.

2018-03-26 01:21:00 +01:00

dance_prop

Fixed merge issues.

2018-03-26 01:21:00 +01:00

datapad

Fixed merge issues.

2018-03-26 01:21:00 +01:00

deed

Restored Snowspeeder ITV and Slave 1 Replica ITV

2018-05-17 06:36:02 +01:00

destructible

Fixed merge issues.

2018-03-26 01:21:00 +01:00

dice

Fixed merge issues.

2018-03-26 01:21:00 +01:00

door

Fixed merge issues.

2018-03-26 01:21:00 +01:00

droid

Fixed merge issues.

2018-03-26 01:21:00 +01:00

droid_battery

Fixed merge issues.

2018-03-26 01:21:00 +01:00

dungeon

Fixed merge issues.

2018-03-26 01:21:00 +01:00

encoded_disk

Fixed merge issues.

2018-03-26 01:21:00 +01:00

event_perk

Fixed merge issues.

2018-03-26 01:21:00 +01:00

faction_perk/faction_base_item

Fixed merge issues.

2018-03-26 01:21:00 +01:00

firework

Fixed merge issues.

2018-03-26 01:21:00 +01:00

fishing

Fixed merge issues.

2018-03-26 01:21:00 +01:00

food

Fixed merge issues.

2018-03-26 01:21:00 +01:00

furniture

Fixed merge issues.

2018-03-26 01:21:00 +01:00

gambling

Fixed merge issues.

2018-03-26 01:21:00 +01:00

gcw

Fixed merge issues.

2018-03-26 01:21:00 +01:00

gem

Fixed merge issues.

2018-03-26 01:21:00 +01:00

gravestone

Fixed merge issues.

2018-03-26 01:21:00 +01:00

ground_spawning

Fixed merge issues.

2018-03-26 01:21:00 +01:00

hair

Fixed merge issues.

2018-03-26 01:21:00 +01:00

harvesting

Fixed merge issues.

2018-03-26 01:21:00 +01:00

holiday

adds movie paintings, SMC tapestries and empire day Mara Jade poster

2018-05-04 13:01:56 -07:00

hologram

Fixed merge issues.

2018-03-26 01:21:00 +01:00

hopper

Fixed merge issues.

2018-03-26 01:21:00 +01:00

hq_destructible

Fixed merge issues.

2018-03-26 01:21:00 +01:00

hq_egg

Fixed merge issues.

2018-03-26 01:21:00 +01:00

instrument

Fixed merge issues.

2018-03-26 01:21:00 +01:00

inventory

Fixed merge issues.

2018-03-26 01:21:00 +01:00

item

Added Rare Loot System

2018-05-03 07:20:40 +01:00

jedi

Fixed merge issues.

2018-03-26 01:21:00 +01:00

lair

Fixed merge issues.

2018-03-26 01:21:00 +01:00

loadbeacon

Fixed merge issues.

2018-03-26 01:21:00 +01:00

location

Fixed merge issues.

2018-03-26 01:21:00 +01:00

loot

Fixed merge issues.

2018-03-26 01:21:00 +01:00

magic_eight_ball

Fixed merge issues.

2018-03-26 01:21:00 +01:00

meatlump

Fixed merge issues.

2018-03-26 01:21:00 +01:00

medicine

Fixed merge issues.

2018-03-26 01:21:00 +01:00

microphone

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission_bag

Fixed merge issues.

2018-03-26 01:21:00 +01:00

newbie_tutorial

Fixed merge issues.

2018-03-26 01:21:00 +01:00

npc

Fixed merge issues.

2018-03-26 01:21:00 +01:00

npe

Fixed merge issues.

2018-03-26 01:21:00 +01:00

painting

adds movie paintings, SMC tapestries and empire day Mara Jade poster

2018-05-04 13:01:56 -07:00

parrot_cage

Fixed merge issues.

2018-03-26 01:21:00 +01:00

planet_map_location

Fixed merge issues.

2018-03-26 01:21:00 +01:00

poi

Fixed merge issues.

2018-03-26 01:21:00 +01:00

powerup

Fixed merge issues.

2018-03-26 01:21:00 +01:00

quest

Fixed merge issues.

2018-03-26 01:21:00 +01:00

recycler

Fixed merge issues.

2018-03-26 01:21:00 +01:00

region

Fixed merge issues.

2018-03-26 01:21:00 +01:00

saga_system

Fixed merge issues.

2018-03-26 01:21:00 +01:00

scout

Fixed merge issues.

2018-03-26 01:21:00 +01:00

ship

Fixed merge issues.

2018-03-26 01:21:00 +01:00

shipcontrol

Fixed merge issues.

2018-03-26 01:21:00 +01:00

sign

Fixed merge issues.

2018-03-26 01:21:00 +01:00

skill_buff

Fixed merge issues.

2018-03-26 01:21:00 +01:00

skill_trainer

Fixed merge issues.

2018-03-26 01:21:00 +01:00

slicing

Fixed merge issues.

2018-03-26 01:21:00 +01:00

smuggler

Fixed merge issues.

2018-03-26 01:21:00 +01:00

space

Fixed Sorosuub Yacht Deed so it can be claimed without issue as well as be placed on vendors.

2018-05-11 16:51:51 +01:00

space_mining

Fixed merge issues.

2018-03-26 01:21:00 +01:00

spawning

Fixed merge issues.

2018-03-26 01:21:00 +01:00

speaker

Fixed merge issues.

2018-03-26 01:21:00 +01:00

storyteller

Fixed merge issues.

2018-03-26 01:21:00 +01:00

structure_decor

Fixed merge issues.

2018-03-26 01:21:00 +01:00

survey_tool

Fixed merge issues.

2018-03-26 01:21:00 +01:00

tcg

fix to stop the AT-AT Head ITV disappearing after the owner logs out

2018-05-18 18:27:45 -07:00

terminal

Restored Snowspeeder ITV and Slave 1 Replica ITV

2018-05-17 06:36:02 +01:00

test

Fixed merge issues.

2018-03-26 01:21:00 +01:00

theme_park

Fixed merge issues.

2018-03-26 01:21:00 +01:00

transport

Fixed merge issues.

2018-03-26 01:21:00 +01:00

travel

Fixed merge issues.

2018-03-26 01:21:00 +01:00

treasure_map

Fixed merge issues.

2018-03-26 01:21:00 +01:00

vendor

Fixed merge issues.

2018-03-26 01:21:00 +01:00

veteran_reward

Fixed merge issues.

2018-03-26 01:21:00 +01:00

wearables

Fixed faction restrictions for rest of armours

2018-05-18 22:07:44 -04:00

weather_object

Fixed merge issues.

2018-03-26 01:21:00 +01:00