Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xdecor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

59de30e4

Commit 59de30e4 authored 8 years ago by Milan

Downloads
- Plain Diff

fix mergeconflicts

parents 14407e56 c64ea477

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.luacheckrc 1 addition, 0 deletions

.luacheckrc
LICENSE 13 additions, 13 deletions

LICENSE
src/chess.lua 8 additions, 8 deletions

src/chess.lua
src/cooking.lua 1 addition, 1 deletion

src/cooking.lua
src/enchanting.lua 15 additions, 11 deletions

src/enchanting.lua
src/mailbox.lua 7 additions, 7 deletions

src/mailbox.lua
src/mechanisms.lua 8 additions, 11 deletions

src/mechanisms.lua
src/nodes.lua 49 additions, 40 deletions

src/nodes.lua
src/workbench.lua 57 additions, 49 deletions

src/workbench.lua

with 159 additions and 140 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