search

BlackJar72 / DoomlikeDungeons

A procedural multi-room dungeon generator for Minecraft
https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-mods/1293843-doomlike-dungeons
MIT License
23 stars 12 forks source link

[1.8.2] There are conflict markers in your generated config files #1

Closed jesmores closed 8 years ago

jesmores commented 8 years ago

chests.cfg as well as the themes config files have conflict markers that look like >>>>> HEAD and <<<<< origin/master - I don't think that was intentional? The dungeons still generate, surprisingly enough, but the loot generation is messed up

jesmores commented 8 years ago

Still present in the 1.8.3 release from curse

BlackJar72 commented 8 years ago

This probably wouldn't have been there until very recently, when it might have been added to versions for 1.8 and 1.6. I'll fix it.

BlackJar72 commented 8 years ago

Ok, I see what happened, though I don't know how -- some how the chests file for Minecraft 1.6.4 got merged with the one for 1.7.10 -- I don't know how this happened since I develop for 1.7.10 and then merge that into the 1.6 and 1.8 versions, and don't merge those into the 1.7.10 version. But I'll change fix it. I'll have to mention it on the forums too, since people will need to delete the old chests.cfg to make it install. Thanks for reporting this -- I would never have suspected that being there.

BlackJar72 commented 8 years ago

There, should be fixed.

jesmores commented 8 years ago

did you fix the themes files too? it wasn't just the chests.cfg that had the conflict markers

BlackJar72 commented 8 years ago

Well, I did now.

jesmores commented 8 years ago

Awesome, I'm testing it now - will report back :)

jesmores commented 8 years ago

Looks like it worked. Conflict markers are gone, and dungeons are generating as expected.

BlackJar72 commented 8 years ago

Thanks -- finally. This was not something I expected to deal with yesterday.