Skip to content

Commit 9810044

Browse files
authored
[packs] 1.21 Update: Alternate Dyes And Paletteless Dyes (#48)
1 parent f874174 commit 9810044

File tree

61 files changed

+39
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+39
-14
lines changed

README.md

Lines changed: 3 additions & 3 deletions

jsons/packs/compatibilities.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,11 @@
540540
"location": "compatibilities/fun/sus_sand_and_old_gravel",
541541
"overwrite": false
542542
},
543+
{
544+
"merge": ["AlternateDyes", "PalettelessDyes"],
545+
"location": "compatibilities/world_of_color/alternate_paletteless_dyes",
546+
"overwrite": false
547+
},
543548
{
544549
"merge": ["BlackSlime", "SolidSlime"],
545550
"location": "compatibilities/colored_solid_slime/black_solid_slime",

jsons/packs/retro.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@
232232
{
233233
"pack_id": "OldDyes",
234234
"pack_name": "Old Dyes",
235-
"pack_description": "Reverts the textures of Dyes to their pre-1.21.110 textures"
235+
"pack_description": "Reverts the textures of Dyes to their pre-1.21.110 textures",
236+
"obvious_conflict": ["AlternateDyes", "PalettelessDyes"]
236237
}
237238
]
238239
}

jsons/packs/world_of_color.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
"location": "world_of_color",
55
"packs": [
66
{
7-
"pack_id": "UniqueDyes",
8-
"pack_name": "Unique Dyes",
9-
"pack_description": "Adds variation to dyes by making each one different.",
10-
"priority": 1
7+
"pack_id": "AlternateDyes",
8+
"pack_name": "Alternate Dyes",
9+
"pack_description": "Retextures dyes to make them even more unique to each other.",
10+
"obvious_conflict": ["OldDyes"]
11+
},
12+
{
13+
"pack_id": "PalettelessDyes",
14+
"pack_name": "Paletteless Dyes",
15+
"pack_description": "Removes the palettes from under all dyes.",
16+
"obvious_conflict": ["OldDyes"]
1117
}
1218
]
1319
}
465 Bytes
469 Bytes
461 Bytes
480 Bytes
472 Bytes
477 Bytes

0 commit comments

Comments
 (0)