Matthew 17c54eb136 Merge pull request #579 from iltar/retailer-in-crash-site ... Uses the retailer in crash site for markets		2018-12-30 17:21:46 -05:00
..
combined	Rename task and queue (#535)	2018-12-15 21:28:27 +01:00
data	Merge branch 'develop' into maps/christmas_tree_of_death	2018-12-14 17:32:46 +00:00
Diggy	Merge pull request #604 from plague006/use_color_presets	2018-12-30 17:20:15 -05:00
misc	Remove spaces in extant names and modify name function to remove spaces to prevent future mistakes (#581)	2018-12-29 02:20:23 +01:00
ores	Rename utils and fix requires	2018-11-27 17:08:26 -05:00
presets	Merge pull request #579 from iltar/retailer-in-crash-site	2018-12-30 17:21:46 -05:00
shape	All tabs to spaces	2018-11-21 08:42:39 -05:00
shared	Rename task and queue (#535)	2018-12-15 21:28:27 +01:00
terrain	All tabs to spaces	2018-11-21 08:42:39 -05:00