Remnants of a Git Merge?
KAfable opened this issue ยท 3 comments
I'm not too familiar with Git overall but I think the mesa.cfg in themes has remnants of a Git Merge?
<<<<<<< HEAD
liquid = minecraft:water, minecraft:lava, minecraft:air, minecraft:air, minecraft:sand
=======
liquid = minecraft:water, minecraft:water, minecraft:lava, minecraft:air, minecraft:air, minecraft:sand
liquid = minecraft:water, minecraft:lava, minecraft:air, minecraft:sand, minecraft:sand
>>>>>>> origin/master
Also, this cfg file seems to have multiple ceilings, floors, walls, and etc. for its entries - does this add more complexity or choices for generating the dungeon? Or was this also unintentional?
What game version that from -- yeah, that is why I stopped using git when moving features between game versions, but I can't believe some of it has persisted this long.
As for multiples -- these are lists of blocks, so more to choose from. As for any duplications, it uses a very simple system where each entry is one chance, so the same thing in more than one entry is how things are given different weights.