Joonas Rikkonen 2ef3184574 4fb2439...4d2bcb1 ...

commit 4d2bcb1ad79f552c5c79a6b93a483c0410cf8531
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Thu Mar 21 20:39:14 2019 +0200

    Changelog additions

commit 5339b414bef868639641e5a92697d1eea4de9f5c
Merge: e07db1ab1 69a6cdb6a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Thu Mar 21 20:17:01 2019 +0200

    Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

commit e07db1ab1d4c2627a74b1318822b79fcfd69e072
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Thu Mar 21 20:16:44 2019 +0200

    Fixed dedicated server crashing when typing in more text than can fit on one line. Closes #1321

commit 69a6cdb6a7d1b8f2f2e819145ced9ae4fcc38f28
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Thu Mar 21 16:46:32 2019 +0200

    Made crafting materials combinable

2019-03-21 20:58:24 +02:00

..

BarotraumaClient

58005a8...01f115d

2019-03-21 14:52:00 +02:00

BarotraumaServer

4fb2439...4d2bcb1

2019-03-21 20:58:24 +02:00

BarotraumaShared

4fb2439...4d2bcb1

2019-03-21 20:58:24 +02:00

Launcher

2f107db...5202af9

2019-03-18 21:42:26 +02:00