Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

09f5dac5

Commit 09f5dac5 authored 7 years ago by Milan

Downloads
- Plain Diff

solve mergeconflicts

parents 5c5d2b00 2c249619

No related branches found

No related tags found

No related merge requests found

Changes 39

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 0 deletions

README.md
bonemeal.lua 55 additions, 0 deletions

bonemeal.lua
crystal.lua 15 additions, 10 deletions

crystal.lua
depends.txt 2 additions, 0 deletions

depends.txt
dirt.lua 28 additions, 6 deletions

dirt.lua
extra.lua 7 additions, 4 deletions

extra.lua
fishing.lua 4 additions, 4 deletions

fishing.lua
food.lua 4 additions, 12 deletions

food.lua
init.lua 30 additions, 8 deletions

init.lua
leaves.lua 97 additions, 15 deletions

leaves.lua
lucky_block.lua 59 additions, 0 deletions

lucky_block.lua
mapgen.lua 197 additions, 6 deletions

mapgen.lua
plantlife.lua 9 additions, 10 deletions

plantlife.lua
plantpack.lua 5 additions, 4 deletions

plantpack.lua
sapling.lua 17 additions, 8 deletions

sapling.lua
schematics/waterlily.lua 6 additions, 3 deletions

schematics/waterlily.lua
sealife.lua 6 additions, 4 deletions

sealife.lua
settings.conf_example 41 additions, 0 deletions

settings.conf_example
stairs.lua 17 additions, 16 deletions

stairs.lua
textures/bucket_cactus.png 0 additions, 0 deletions

textures/bucket_cactus.png

with 600 additions and 110 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