# Conflicts:
#	overcooked_simulator/game_content/layouts/basic.layout
#	overcooked_simulator/game_items.py
#	overcooked_simulator/overcooked_environment.py

Resolve "Rule based ingredient processing"

Closes #43

See merge request scs/cocosy/overcooked-simulator!11

Stack plates in sink.

plate dispenser without manager. plates disappear for a time and then appear on the plate dispenser. You can now add stuff on the plates on the dispenser.

New lock for gui and environment.

Added game mechanic washing dishes. Served plates return in the plate return, can be washed in sink. TODO can wash multiple plates in the sink by holding interact button

add also simple burger assets and pan.

Add logging

Closes #9

See merge request scs/cocosy/overcooked-simulator!5

Resolve "Sizes relative to world grid size instead of absolute pixels"

Closes #47

See merge request scs/cocosy/overcooked-simulator!17

Merge branch '45-fix-player-collision-can-push-other-players-into-each-others-can-push-players-out-of-the-world' into 'main'

Resolve "Fix player collision: Can push other players into each others, can push players out of the world"

Closes #45

See merge request scs/cocosy/overcooked-simulator!16

Resolve "Cashe loaded gui images"

Closes #46

See merge request scs/cocosy/overcooked-simulator!14

Resolve "Better exiting the programm and all threads"

Closes #39

See merge request scs/cocosy/overcooked-simulator!15

Merge branch '40-follow-up-from-draft-resolve-pot-and-stove-and-cooking-tomato-soup-visualisierungsregeln' into 'main'

40-visualisierungsregeln

Closes #40

See merge request scs/cocosy/overcooked-simulator!13

Merge remote-tracking branch 'origin/40-follow-up-from-draft-resolve-pot-and-stove-and-cooking-tomato-soup-visualisierungsregeln' into 40-follow-up-from-draft-resolve-pot-and-stove-and-cooking-tomato-soup-visualisierungsregeln

plate is now cooking equipment. Color red is now a red1