From 73b5914aec75190839fa93cfae6db286052d54b8 Mon Sep 17 00:00:00 2001 From: Freeman Date: Mon, 4 Dec 2023 23:08:43 +0100 Subject: [PATCH 1/3] mcl_trees colors --- colors/mc2.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/colors/mc2.txt b/colors/mc2.txt index ba20930..b956d72 100644 --- a/colors/mc2.txt +++ b/colors/mc2.txt @@ -187,18 +187,28 @@ mcl_comparators:comparator_off_sub 113 101 97 mcl_comparators:comparator_on_comp 115 101 97 mcl_comparators:comparator_on_sub 116 101 97 mcl_core:acacialeaves 141 136 76 +mcl_trees:acacialeaves 141 136 76 mcl_core:acaciasapling 109 92 59 +mcl_trees:acaciasapling 109 92 59 mcl_core:acaciatree 130 84 55 +mcl_trees:acaciatree 130 84 55 mcl_core:acaciatree_bark 105 91 74 +mcl_trees:acaciatree_bark 105 91 74 mcl_core:acaciawood 152 100 69 +mcl_trees:acaciawood 152 100 69 mcl_core:andesite 104 110 107 mcl_core:andesite_smooth 107 113 109 mcl_core:bedrock 91 77 66 mcl_core:birchleaves 47 97 47 +mcl_trees:birchleaves 47 97 47 mcl_core:birchsapling 78 110 74 +mcl_trees:birchsapling 78 110 74 mcl_core:birchtree 155 130 112 +mcl_trees:birchtree 155 130 112 mcl_core:birchtree_bark 194 184 174 +mcl_trees:birchtree_bark 194 184 174 mcl_core:birchwood 145 113 89 +mcl_trees:birchwood 145 113 89 mcl_core:bone_block 220 201 170 mcl_core:brick_block 139 87 75 mcl_core:cactus 77 99 49 @@ -208,10 +218,15 @@ mcl_core:coarse_dirt 117 92 76 mcl_core:cobble 113 106 104 mcl_core:cobweb 202 189 167 mcl_core:darkleaves 44 105 48 +mcl_trees:darkleaves 44 105 48 mcl_core:darksapling 69 92 80 +mcl_trees:darksapling 69 92 80 mcl_core:darktree 83 70 62 +mcl_trees:darktree 83 70 62 mcl_core:darktree_bark 74 62 55 +mcl_trees:darktree_bark 74 62 55 mcl_core:darkwood 87 74 62 +mcl_trees:darkwood 87 74 62 mcl_core:deadbush 118 88 69 mcl_core:diamondblock 92 160 200 mcl_core:diorite 153 149 146 @@ -249,15 +264,21 @@ mcl_core:gravel 112 105 99 mcl_core:ice 145 197 226 mcl_core:ironblock 159 151 151 mcl_core:jungleleaves 39 113 40 +mcl_trees:jungleleaves 39 113 40 mcl_core:junglesapling 64 88 39 +mcl_trees:junglesapling 64 88 39 mcl_core:jungletree 125 87 67 +mcl_trees:jungletree 125 87 67 mcl_core:jungletree_bark 86 58 45 +mcl_trees:jungletree_bark 86 58 45 mcl_core:junglewood 113 78 59 +mcl_trees:junglewood 113 78 59 mcl_core:ladder 83 64 50 mcl_core:lapisblock 50 92 162 mcl_core:lava_flowing 177 42 16 mcl_core:lava_source 178 45 17 mcl_core:leaves 50 102 50 +mcl_trees:leaves 50 102 50 mcl_core:mossycobble 100 105 94 mcl_core:mycelium 108 89 117 mcl_core:mycelium_snow 221 229 234 @@ -277,6 +298,7 @@ mcl_core:sandstonecarved 201 154 121 mcl_core:sandstonesmooth 201 154 121 mcl_core:sandstonesmooth2 201 154 121 mcl_core:sapling 62 90 45 +mcl_trees:sapling 62 90 45 mcl_core:slimeblock 93 157 86 mcl_core:snow 221 229 234 mcl_core:snowblock 221 229 234 @@ -289,9 +311,13 @@ mcl_core:snow_7 221 229 234 mcl_core:snow_8 221 229 234 mcl_core:spruceleaves 56 104 68 mcl_core:sprucesapling 55 72 53 +mcl_trees:sprucesapling 55 72 53 mcl_core:sprucetree 97 71 57 +mcl_trees:sprucetree 97 71 57 mcl_core:sprucetree_bark 66 51 44 +mcl_trees:sprucetree_bark 66 51 44 mcl_core:sprucewood 81 65 54 +mcl_trees:sprucewood 81 65 54 mcl_core:stone 130 122 118 mcl_core:stonebrick 97 89 86 mcl_core:stonebrickcarved 97 90 85 @@ -307,9 +333,13 @@ mcl_core:stone_with_lapis 111 113 125 mcl_core:stone_with_redstone 128 91 88 mcl_core:stone_with_redstone_lit 128 91 88 mcl_core:stripped_acacia 157 98 62 +mcl_trees:stripped_acacia 157 98 62 mcl_core:stripped_acacia_bark 151 90 57 +mcl_trees:stripped_acacia_bark 151 90 57 mcl_core:stripped_birch 170 135 108 +mcl_trees:stripped_birch 170 135 108 mcl_core:stripped_birch_bark 179 143 115 +mcl_trees:stripped_birch_bark 179 143 115 mcl_core:stripped_dark_oak 90 78 68 mcl_core:stripped_dark_oak_bark 91 78 70 mcl_core:stripped_jungle 170 113 83 @@ -317,13 +347,18 @@ mcl_core:stripped_jungle_bark 175 117 86 mcl_core:stripped_oak 153 115 80 mcl_core:stripped_oak_bark 162 122 84 mcl_core:stripped_spruce 107 79 64 +mcl_trees:stripped_spruce 107 79 64 mcl_core:stripped_spruce_bark 109 81 67 +mcl_trees:stripped_spruce_bark 109 81 67 mcl_core:tree 135 104 74 +mcl_trees:tree 135 104 74 mcl_core:tree_bark 95 75 57 +mcl_trees:tree_bark 95 75 57 mcl_core:vine 21 61 21 mcl_core:water_flowing 26 70 90 mcl_core:water_source 38 98 129 mcl_core:wood 113 87 67 +mcl_trees:wood 113 87 67 mcl_crafting_table:crafting_table 152 121 93 mcl_dispensers:dispenser 148 138 133 mcl_dispensers:dispenser_down 148 138 133 From e3b7fdc994c69191835ff9f64c20e0a5682ebc21 Mon Sep 17 00:00:00 2001 From: Freeman Date: Tue, 5 Dec 2023 14:55:10 +0100 Subject: [PATCH 2/3] fixed --- colors/mc2.txt | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/colors/mc2.txt b/colors/mc2.txt index b956d72..58359f5 100644 --- a/colors/mc2.txt +++ b/colors/mc2.txt @@ -187,28 +187,28 @@ mcl_comparators:comparator_off_sub 113 101 97 mcl_comparators:comparator_on_comp 115 101 97 mcl_comparators:comparator_on_sub 116 101 97 mcl_core:acacialeaves 141 136 76 -mcl_trees:acacialeaves 141 136 76 +mcl_trees:leaves_acacia 141 136 76 mcl_core:acaciasapling 109 92 59 -mcl_trees:acaciasapling 109 92 59 +mcl_trees:sapling_acacia 109 92 59 mcl_core:acaciatree 130 84 55 -mcl_trees:acaciatree 130 84 55 +mcl_trees:tree_acacia 130 84 55 mcl_core:acaciatree_bark 105 91 74 -mcl_trees:acaciatree_bark 105 91 74 +mcl_trees:bark_acacia 105 91 74 mcl_core:acaciawood 152 100 69 -mcl_trees:acaciawood 152 100 69 +mcl_trees:wood_acacia 152 100 69 mcl_core:andesite 104 110 107 mcl_core:andesite_smooth 107 113 109 mcl_core:bedrock 91 77 66 mcl_core:birchleaves 47 97 47 -mcl_trees:birchleaves 47 97 47 +mcl_trees:leaves_birch 47 97 47 mcl_core:birchsapling 78 110 74 -mcl_trees:birchsapling 78 110 74 +mcl_trees:sapling_birch 78 110 74 mcl_core:birchtree 155 130 112 -mcl_trees:birchtree 155 130 112 +mcl_trees:tree_birch 155 130 112 mcl_core:birchtree_bark 194 184 174 -mcl_trees:birchtree_bark 194 184 174 +mcl_trees:bark_birch 194 184 174 mcl_core:birchwood 145 113 89 -mcl_trees:birchwood 145 113 89 +mcl_trees:wood_birch 145 113 89 mcl_core:bone_block 220 201 170 mcl_core:brick_block 139 87 75 mcl_core:cactus 77 99 49 @@ -218,15 +218,15 @@ mcl_core:coarse_dirt 117 92 76 mcl_core:cobble 113 106 104 mcl_core:cobweb 202 189 167 mcl_core:darkleaves 44 105 48 -mcl_trees:darkleaves 44 105 48 +mcl_trees:leaves_dark_oak 44 105 48 mcl_core:darksapling 69 92 80 -mcl_trees:darksapling 69 92 80 +mcl_trees:sapling_dark_oak 69 92 80 mcl_core:darktree 83 70 62 -mcl_trees:darktree 83 70 62 +mcl_trees:tree_dark_oak 83 70 62 mcl_core:darktree_bark 74 62 55 -mcl_trees:darktree_bark 74 62 55 +mcl_trees:bark_dark_oak 74 62 55 mcl_core:darkwood 87 74 62 -mcl_trees:darkwood 87 74 62 +mcl_trees:wood_dark_oak 87 74 62 mcl_core:deadbush 118 88 69 mcl_core:diamondblock 92 160 200 mcl_core:diorite 153 149 146 @@ -264,21 +264,21 @@ mcl_core:gravel 112 105 99 mcl_core:ice 145 197 226 mcl_core:ironblock 159 151 151 mcl_core:jungleleaves 39 113 40 -mcl_trees:jungleleaves 39 113 40 +mcl_trees:leaves_jungle 39 113 40 mcl_core:junglesapling 64 88 39 -mcl_trees:junglesapling 64 88 39 +mcl_trees:sapling_jungle 64 88 39 mcl_core:jungletree 125 87 67 -mcl_trees:jungletree 125 87 67 +mcl_trees:tree_jungle 125 87 67 mcl_core:jungletree_bark 86 58 45 -mcl_trees:jungletree_bark 86 58 45 +mcl_trees:bark_jungle 86 58 45 mcl_core:junglewood 113 78 59 -mcl_trees:junglewood 113 78 59 +mcl_trees:wood_jungle 113 78 59 mcl_core:ladder 83 64 50 mcl_core:lapisblock 50 92 162 mcl_core:lava_flowing 177 42 16 mcl_core:lava_source 178 45 17 mcl_core:leaves 50 102 50 -mcl_trees:leaves 50 102 50 +mcl_trees:leaves_oak 50 102 50 mcl_core:mossycobble 100 105 94 mcl_core:mycelium 108 89 117 mcl_core:mycelium_snow 221 229 234 @@ -298,7 +298,7 @@ mcl_core:sandstonecarved 201 154 121 mcl_core:sandstonesmooth 201 154 121 mcl_core:sandstonesmooth2 201 154 121 mcl_core:sapling 62 90 45 -mcl_trees:sapling 62 90 45 +mcl_trees:sapling_oak 62 90 45 mcl_core:slimeblock 93 157 86 mcl_core:snow 221 229 234 mcl_core:snowblock 221 229 234 @@ -311,13 +311,13 @@ mcl_core:snow_7 221 229 234 mcl_core:snow_8 221 229 234 mcl_core:spruceleaves 56 104 68 mcl_core:sprucesapling 55 72 53 -mcl_trees:sprucesapling 55 72 53 +mcl_trees:sapling_spruce 55 72 53 mcl_core:sprucetree 97 71 57 -mcl_trees:sprucetree 97 71 57 +mcl_trees:tree_spruce 97 71 57 mcl_core:sprucetree_bark 66 51 44 -mcl_trees:sprucetree_bark 66 51 44 +mcl_trees:bark_spruce 66 51 44 mcl_core:sprucewood 81 65 54 -mcl_trees:sprucewood 81 65 54 +mcl_trees:wood_spruce 81 65 54 mcl_core:stone 130 122 118 mcl_core:stonebrick 97 89 86 mcl_core:stonebrickcarved 97 90 85 @@ -335,11 +335,11 @@ mcl_core:stone_with_redstone_lit 128 91 88 mcl_core:stripped_acacia 157 98 62 mcl_trees:stripped_acacia 157 98 62 mcl_core:stripped_acacia_bark 151 90 57 -mcl_trees:stripped_acacia_bark 151 90 57 +mcl_trees:bark_stripped_acacia 151 90 57 mcl_core:stripped_birch 170 135 108 mcl_trees:stripped_birch 170 135 108 mcl_core:stripped_birch_bark 179 143 115 -mcl_trees:stripped_birch_bark 179 143 115 +mcl_trees:bark_stripped_birch 179 143 115 mcl_core:stripped_dark_oak 90 78 68 mcl_core:stripped_dark_oak_bark 91 78 70 mcl_core:stripped_jungle 170 113 83 @@ -349,16 +349,16 @@ mcl_core:stripped_oak_bark 162 122 84 mcl_core:stripped_spruce 107 79 64 mcl_trees:stripped_spruce 107 79 64 mcl_core:stripped_spruce_bark 109 81 67 -mcl_trees:stripped_spruce_bark 109 81 67 +mcl_trees:bark_stripped_spruce 109 81 67 mcl_core:tree 135 104 74 -mcl_trees:tree 135 104 74 +mcl_trees:tree_oak 135 104 74 mcl_core:tree_bark 95 75 57 -mcl_trees:tree_bark 95 75 57 +mcl_trees:bark_tree 95 75 57 mcl_core:vine 21 61 21 mcl_core:water_flowing 26 70 90 mcl_core:water_source 38 98 129 mcl_core:wood 113 87 67 -mcl_trees:wood 113 87 67 +mcl_trees:wood_oak 113 87 67 mcl_crafting_table:crafting_table 152 121 93 mcl_dispensers:dispenser 148 138 133 mcl_dispensers:dispenser_down 148 138 133 From 5ee01c728be872d79e946c951d982693f8de4c06 Mon Sep 17 00:00:00 2001 From: Freeman Date: Tue, 5 Dec 2023 15:02:51 +0100 Subject: [PATCH 3/3] bark_stripes --- colors/mc2.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/colors/mc2.txt b/colors/mc2.txt index 58359f5..7a4b7eb 100644 --- a/colors/mc2.txt +++ b/colors/mc2.txt @@ -341,11 +341,17 @@ mcl_trees:stripped_birch 170 135 108 mcl_core:stripped_birch_bark 179 143 115 mcl_trees:bark_stripped_birch 179 143 115 mcl_core:stripped_dark_oak 90 78 68 +mcl_trees:stripped_dark_oak 90 78 68 mcl_core:stripped_dark_oak_bark 91 78 70 +mcl_trees:bark_stripped_dark_oak 91 78 70 mcl_core:stripped_jungle 170 113 83 +mcl_trees:stripped_jungle 170 113 83 mcl_core:stripped_jungle_bark 175 117 86 +mcl_trees:bark_stripped_jungle 175 117 86 mcl_core:stripped_oak 153 115 80 +mcl_trees:stripped_oak 153 115 80 mcl_core:stripped_oak_bark 162 122 84 +mcl_trees:bark_stripped_oak 162 122 84 mcl_core:stripped_spruce 107 79 64 mcl_trees:stripped_spruce 107 79 64 mcl_core:stripped_spruce_bark 109 81 67