Skip to content

Commit

Permalink
Update palette.json
Browse files Browse the repository at this point in the history
  • Loading branch information
strubium authored Sep 28, 2023
1 parent 3abcd25 commit c81fd9f
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions src/main/resources/assets/lostcities/citydata/palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,22 +245,7 @@
{
"char": "@",
"block": "minecraft:double_stone_slab",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
"damaged": "minecraft:iron_bars"
>>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
=======
"damaged": "minecraft:iron_bars"
>>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
=======
"damaged": "minecraft:iron_bars"
>>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
=======
"damaged": "minecraft:iron_bars"
>>>>>>> parent of 54d4a62 (Tweeted damaged values for stone slabs)
"damaged": "minecraft:stone_slab"
}
]
},
Expand Down Expand Up @@ -602,4 +587,4 @@
}
]
}
]
]

0 comments on commit c81fd9f

Please sign in to comment.