seefo af60b08cb8 Fixed broken template from improper merge

2018-05-19 05:50:09 -04:00

..

battlefield_marker

Fixed merge issues.

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

building

restores all missing houses

2018-05-05 12:23:25 -07:00

cell

Fixed merge issues.

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

city

Fixed merge issues.

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

construction_contract

Fixed merge issues.

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

creature

Fixed merge issues.

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

draft_schematic

Fixed broken template from improper merge

2018-05-19 05:50:09 -04:00

factory

Fixed merge issues.

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

group

Fixed merge issues.

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

guild

Fixed merge issues.

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

installation

Fixed merge issues.

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

intangible

update to get the snow speeder familiar closer to being functional

2018-05-12 04:10:12 -07:00

jedi_manager

Fixed merge issues.

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

manufacture_schematic

Fixed merge issues.

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

mission

Fixed merge issues.

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

mobile

update to get the snow speeder familiar closer to being functional

2018-05-12 04:10:12 -07:00

object/base

Fixed merge issues.

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

path_waypoint

Fixed merge issues.

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

planet

Fixed merge issues.

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

player

Fixed merge issues.

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

player_quest

Fixed merge issues.

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

resource_container

Fixed merge issues.

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

ship

Fixed merge issues.

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

soundobject

Fixed merge issues.

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

static

restores the Cloud Car Speeder

2018-05-08 13:17:57 -07:00

tangible

Fixed Embroidered Sash, converted to container and added luck

2018-05-19 00:11:19 -04:00

token

Fixed merge issues.

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

universe

Fixed merge issues.

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

weapon

Added legendary weapons and draft schematics

2018-05-19 02:28:22 -04:00

working

Fixed merge issues.

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

battlefield_marker_object_template.tdf

Fixed merge issues.

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

building_object_template.tdf

Fixed merge issues.

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

cell_object_template.tdf

Fixed merge issues.

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

city_object_template.tdf

Fixed merge issues.

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

construction_contract_object_template.tdf

Fixed merge issues.

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

creature_object_template.tdf

Fixed merge issues.

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

draft_schematic_object_template.tdf

Fixed merge issues.

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

factory_object_template.tdf

Fixed merge issues.

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

group_object_template.tdf

Fixed merge issues.

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

guild_object_template.tdf

Fixed merge issues.

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

harvester_installation_object_template.tdf

Fixed merge issues.

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

installation_object_template.tdf

Fixed merge issues.

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

intangible_object_template.tdf

Fixed merge issues.

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

jedi_manager_object_template.tdf

Fixed merge issues.

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

manufacture_installation_object_template.tdf

Fixed merge issues.

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

manufacture_schematic_object_template.tdf

Fixed merge issues.

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

mission_board_object_template.tdf

Fixed merge issues.

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

mission_data_object_template.tdf

Fixed merge issues.

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

mission_list_entry_object_template.tdf

Fixed merge issues.

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

mission_object_template.tdf

Fixed merge issues.

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

object_template.tdf

Fixed merge issues.

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

planet_object_template.tdf

Fixed merge issues.

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

player_object_template.tdf

Fixed merge issues.

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

player_quest_object_template.tdf

Fixed merge issues.

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

resource_container_object_template.tdf

Fixed merge issues.

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

ship_object_template.tdf

Fixed merge issues.

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

static_object_template.tdf

Fixed merge issues.

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

tangible_object_template.tdf

Fixed merge issues.

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

token_object_template.tdf

Fixed merge issues.

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

universe_object_template.tdf

Fixed merge issues.

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

vehicle_object_template.tdf

Fixed merge issues.

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

weapon_object_template.tdf

Fixed merge issues.

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

xp_manager_object_template.tdf

Fixed merge issues.

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