Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Cooperative Cuisine Environment
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Looking for advice? Join the Matrix channel for GitLab users in Bielefeld!

bf30e271

Commit bf30e271 authored 1 year ago by Fabian Heinrich

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into 106-screens-update

# Conflicts:
#	cooperative_cuisine/counters.py

parents a6cf5cbf 97539d86

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cooperative_cuisine/action.py 16 additions, 0 deletions

cooperative_cuisine/action.py
cooperative_cuisine/counters.py 45 additions, 14 deletions

cooperative_cuisine/counters.py
cooperative_cuisine/effects.py 1 addition, 1 deletion

cooperative_cuisine/effects.py
cooperative_cuisine/environment.py 1 addition, 1 deletion

cooperative_cuisine/environment.py
cooperative_cuisine/items.py 47 additions, 31 deletions

cooperative_cuisine/items.py
cooperative_cuisine/orders.py 8 additions, 11 deletions

cooperative_cuisine/orders.py
cooperative_cuisine/server_results.py 2 additions, 2 deletions

cooperative_cuisine/server_results.py
cooperative_cuisine/state_representation.py 34 additions, 27 deletions

cooperative_cuisine/state_representation.py

with 154 additions and 87 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment