Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0

2020-05-30 18:52:02 +03:00

..

drinks

merge conflict and job/dept discounts support.

2020-05-03 02:11:05 +02:00

food

Removing unused files and fixing some stuff. (#12250)

2020-05-15 07:15:15 -07:00

kitchen_machinery

Merge conflict fix

2020-05-13 12:37:18 +03:00

recipes

nested (#12381)

2020-05-28 14:12:58 +02:00

autobottler.dm

Corrects evey storge with storage (#12220)

2020-05-13 21:21:11 +02:00

food.dm

Backward 512 compatibility removal.

2020-04-23 00:59:23 +02:00

pizzabox.dm

Backward 512 compatibility removal.

2020-04-23 00:59:23 +02:00