Dev inventory system - [merged]

[Togtja]

In GitLab by @Leonnc on Mar 30, 2020, 11:28

_Merges dev_inventorysystem -> master

Adds an initial inventory system, moves reproduction into leisure needs, introduces the concept of leisure needs, adds template strategies for dealing with adding and removing things from inventories

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:12

added 2 commits

• 5242c451 - #44 Create custom exception handler for Lua
• f1648dbf - Merge remote-tracking branch 'origin/dev_inventory_system' into dev_inventory_system

Compare with previous version

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:34

approved this merge request

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:37

added 17 commits

• f1648dbf...d5995dad - 16 commits from branch master
• 61186811 - Merge branch 'master' into 'dev_inventory_system'

Compare with previous version

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:37

approved this merge request

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:37

enabled an automatic merge when the pipeline for 611868111b73d649e0e255f36a5d3e0f74b74e6e succeeds

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:51

aborted the automatic merge because source branch was updated

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 12:51

added 1 commit

• 2ea0ab6a - #44 Fix merge issues

Compare with previous version

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 13:43

approved this merge request

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 13:43

mentioned in commit 05dac86ce079b754fe8e93ebd184f0201fd88ec0

[Togtja]

In GitLab by @carlfindahl on Mar 30, 2020, 13:43

merged