skull132 8b5c7bc2c5 Conflict resolution ...

Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt

2016-03-25 22:25:41 +02:00

..

lib_items.dm

Renamed knives.

2015-05-16 20:54:34 +09:30

lib_machines.dm

Conflict resolution

2016-03-25 22:25:41 +02:00

lib_readme.dm

…