From a8f7b470005ab318932ac053e959677e0192d996 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 25 Mar 2018 13:40:19 +0200
Subject: [PATCH] Update colors.txt

---
 autogenerating-colors.txt |   8 ++-
 colors.txt                | 112 ++++++++++++++++++++++++++++++++++----
 2 files changed, 105 insertions(+), 15 deletions(-)

diff --git a/autogenerating-colors.txt b/autogenerating-colors.txt
index d753726..aaf0a68 100644
--- a/autogenerating-colors.txt
+++ b/autogenerating-colors.txt
@@ -118,11 +118,13 @@ done < $NODESTXT_PATH > $COLORSTXT_PATH
 # Use nicer colors for water and lava:
 sed -re 's/^default:((river_)?water_(flowing|source)) [0-9 ]+$/default:\1 39 66 106 128 224/g' $COLORSTXT_PATH -i
 sed -re 's/^default:(lava_(flowing|source)) [0-9 ]+$/default:\1 255 100 0/g' $COLORSTXT_PATH -i
-# Add transparency to glass nodes:
+# Add transparency to glass nodes and xpanes:
 sed -re 's/^default:(.*glass) ([0-9 ]+)$/default:\1 \2 64 16/g' $COLORSTXT_PATH -i
 sed -re 's/^doors:(.*glass[^ ]*) ([0-9 ]+)$/doors:\1 \2 64 16/g' $COLORSTXT_PATH -i
-# Fix xpanes color:
-sed -re 's/^xpanes:((pane|bar)(_flat)?) [0-9 ]+$/xpanes:\1 194 194 227 64 16/g' $COLORSTXT_PATH -i
+sed -re 's/^xpanes:(.*(pane|bar)[^ ]*) ([0-9 ]+)$/xpanes:\1 \3 64 16/g' $COLORSTXT_PATH -i
+# Delete some usually hidden nodes:
+sed '/^doors:hidden /d' $COLORSTXT_PATH -i
+sed '/^fireflies:firefly /d' $COLORSTXT_PATH -i
 ==INSTRUCTIONS==
 1) Make sure avgcolors.py works (outputs the usage instructions when run)
 2) Add the dumpnodes mod to Minetest
diff --git a/colors.txt b/colors.txt
index d6b8487..eb6f2f5 100644
--- a/colors.txt
+++ b/colors.txt
@@ -32,6 +32,7 @@ default:bush_leaves 34 52 29
 default:bush_sapling 65 60 40
 default:bush_stem 45 33 23
 default:cactus 52 116 15
+default:cave_ice 167 206 247
 default:chest 140 108 65
 default:chest_locked 140 108 65
 default:chest_locked_open 140 108 65
@@ -44,7 +45,7 @@ default:copperblock 192 126 63
 default:coral_brown 139 104 72
 default:coral_orange 191 62 12
 default:coral_skeleton 235 230 214
-default:desert_cobble 146 95 76
+default:desert_cobble 107 65 49
 default:desert_sand 206 165 98
 default:desert_sandstone 195 152 92
 default:desert_sandstone_block 192 151 94
@@ -54,6 +55,7 @@ default:desert_stone_block 130 79 60
 default:desert_stonebrick 129 79 60
 default:diamondblock 135 217 223
 default:dirt 95 64 39
+default:dirt_with_coniferous_litter 107 88 68
 default:dirt_with_dry_grass 187 148 77
 default:dirt_with_grass 66 112 31
 default:dirt_with_grass_footsteps 66 112 31
@@ -65,11 +67,15 @@ default:dry_grass_3 210 174 87
 default:dry_grass_4 211 175 88
 default:dry_grass_5 213 178 92
 default:dry_shrub 101 66 17
+default:emergent_jungle_sapling 48 39 15
 default:fence_acacia_wood 147 60 38
 default:fence_aspen_wood 210 199 170
 default:fence_junglewood 54 37 11
 default:fence_pine_wood 221 184 129
 default:fence_wood 129 100 55
+default:fern_1 81 114 48
+default:fern_2 86 118 50
+default:fern_3 88 121 52
 default:furnace 100 96 94
 default:furnace_active 100 96 94
 default:glass 194 194 227 64 16
@@ -91,6 +97,9 @@ default:ladder_wood 123 90 34
 default:lava_flowing 255 100 0
 default:lava_source 255 100 0
 default:leaves 34 52 29
+default:marram_grass_1 96 133 89
+default:marram_grass_2 87 126 83
+default:marram_grass_3 85 125 82
 default:mese 220 220 0
 default:mese_post_light 131 102 57
 default:meselamp 211 213 139
@@ -100,13 +109,14 @@ default:obsidian_block 20 22 25
 default:obsidian_glass 19 21 23 64 16
 default:obsidianbrick 20 22 24
 default:papyrus 94 132 33
-default:pine_needles 13 36 21
+default:pine_needles 11 48 18
 default:pine_sapling 27 48 25
 default:pine_tree 182 155 124
 default:pine_wood 221 184 128
 default:river_water_flowing 39 66 106 128 224
 default:river_water_source 39 66 106 128 224
 default:sand 214 207 158
+default:sand_with_kelp 214 207 158
 default:sandstone 197 193 143
 default:sandstone_block 195 190 141
 default:sandstonebrick 193 189 140
@@ -158,9 +168,8 @@ doors:gate_pine_wood_closed 221 184 128
 doors:gate_pine_wood_open 221 184 128
 doors:gate_wood_closed 128 99 55
 doors:gate_wood_open 128 99 55
-doors:hidden 0 0 0
 doors:trapdoor 128 99 50
-doors:trapdoor_open 225 217 206
+doors:trapdoor_open 136 106 59
 doors:trapdoor_steel 199 199 199
 doors:trapdoor_steel_open 206 206 206
 
@@ -193,14 +202,19 @@ farming:wheat_8 186 161 35
 fire:basic_flame 218 120 36
 fire:permanent_flame 218 120 36
 
+# fireflies
+fireflies:firefly_bottle 190 191 198
+
 # flowers
+flowers:chrysanthemum_green 101 140 39
 flowers:dandelion_white 178 176 140
-flowers:dandelion_yellow 178 148 24
+flowers:dandelion_yellow 194 159 17
 flowers:geranium 72 87 155
 flowers:mushroom_brown 106 79 72
 flowers:mushroom_red 192 85 85
 flowers:rose 118 48 24
 flowers:tulip 130 99 36
+flowers:tulip_black 72 103 63
 flowers:viola 106 60 159
 flowers:waterlily 102 158 61
 
@@ -211,7 +225,7 @@ stairs:slab_brick 117 71 69
 stairs:slab_bronzeblock 185 110 15
 stairs:slab_cobble 88 84 82
 stairs:slab_copperblock 192 126 63
-stairs:slab_desert_cobble 146 95 76
+stairs:slab_desert_cobble 107 65 49
 stairs:slab_desert_sandstone 195 152 92
 stairs:slab_desert_sandstone_block 192 151 94
 stairs:slab_desert_sandstone_brick 191 151 94
@@ -238,6 +252,7 @@ stairs:slab_stone 97 94 93
 stairs:slab_stone_block 99 96 95
 stairs:slab_stonebrick 99 96 95
 stairs:slab_straw 211 182 67
+stairs:slab_tinblock 149 149 149
 stairs:slab_wood 128 99 55
 stairs:stair_acacia_wood 146 60 37
 stairs:stair_aspen_wood 209 198 169
@@ -245,7 +260,7 @@ stairs:stair_brick 117 71 69
 stairs:stair_bronzeblock 185 110 15
 stairs:stair_cobble 88 84 82
 stairs:stair_copperblock 192 126 63
-stairs:stair_desert_cobble 146 95 76
+stairs:stair_desert_cobble 107 65 49
 stairs:stair_desert_sandstone 195 152 92
 stairs:stair_desert_sandstone_block 192 151 94
 stairs:stair_desert_sandstone_brick 191 151 94
@@ -254,11 +269,81 @@ stairs:stair_desert_stone_block 130 79 60
 stairs:stair_desert_stonebrick 129 79 60
 stairs:stair_goldblock 230 201 29
 stairs:stair_ice 167 206 247
+stairs:stair_inner_acacia_wood 146 60 37
+stairs:stair_inner_aspen_wood 209 198 169
+stairs:stair_inner_brick 117 71 69
+stairs:stair_inner_bronzeblock 185 110 15
+stairs:stair_inner_cobble 88 84 82
+stairs:stair_inner_copperblock 192 126 63
+stairs:stair_inner_desert_cobble 107 65 49
+stairs:stair_inner_desert_sandstone 195 152 92
+stairs:stair_inner_desert_sandstone_block 192 151 94
+stairs:stair_inner_desert_sandstone_brick 191 151 94
+stairs:stair_inner_desert_stone 129 79 60
+stairs:stair_inner_desert_stone_block 130 79 60
+stairs:stair_inner_desert_stonebrick 129 79 60
+stairs:stair_inner_goldblock 230 201 29
+stairs:stair_inner_ice 167 206 247
+stairs:stair_inner_junglewood 54 37 11
+stairs:stair_inner_mossycobble 86 90 68
+stairs:stair_inner_obsidian 19 21 24
+stairs:stair_inner_obsidian_block 20 22 25
+stairs:stair_inner_obsidianbrick 20 22 24
+stairs:stair_inner_pine_wood 221 184 128
+stairs:stair_inner_sandstone 197 193 143
+stairs:stair_inner_sandstone_block 195 190 141
+stairs:stair_inner_sandstonebrick 193 189 140
+stairs:stair_inner_silver_sandstone 195 192 181
+stairs:stair_inner_silver_sandstone_block 192 190 179
+stairs:stair_inner_silver_sandstone_brick 190 188 178
+stairs:stair_inner_snowblock 224 225 238
+stairs:stair_inner_steelblock 194 194 194
+stairs:stair_inner_stone 97 94 93
+stairs:stair_inner_stone_block 99 96 95
+stairs:stair_inner_stonebrick 99 96 95
+stairs:stair_inner_straw 211 182 67
+stairs:stair_inner_tinblock 149 149 149
+stairs:stair_inner_wood 128 99 55
 stairs:stair_junglewood 54 37 11
 stairs:stair_mossycobble 86 90 68
 stairs:stair_obsidian 19 21 24
 stairs:stair_obsidian_block 20 22 25
 stairs:stair_obsidianbrick 20 22 24
+stairs:stair_outer_acacia_wood 146 60 37
+stairs:stair_outer_aspen_wood 209 198 169
+stairs:stair_outer_brick 117 71 69
+stairs:stair_outer_bronzeblock 185 110 15
+stairs:stair_outer_cobble 88 84 82
+stairs:stair_outer_copperblock 192 126 63
+stairs:stair_outer_desert_cobble 107 65 49
+stairs:stair_outer_desert_sandstone 195 152 92
+stairs:stair_outer_desert_sandstone_block 192 151 94
+stairs:stair_outer_desert_sandstone_brick 191 151 94
+stairs:stair_outer_desert_stone 129 79 60
+stairs:stair_outer_desert_stone_block 130 79 60
+stairs:stair_outer_desert_stonebrick 129 79 60
+stairs:stair_outer_goldblock 230 201 29
+stairs:stair_outer_ice 167 206 247
+stairs:stair_outer_junglewood 54 37 11
+stairs:stair_outer_mossycobble 86 90 68
+stairs:stair_outer_obsidian 19 21 24
+stairs:stair_outer_obsidian_block 20 22 25
+stairs:stair_outer_obsidianbrick 20 22 24
+stairs:stair_outer_pine_wood 221 184 128
+stairs:stair_outer_sandstone 197 193 143
+stairs:stair_outer_sandstone_block 195 190 141
+stairs:stair_outer_sandstonebrick 193 189 140
+stairs:stair_outer_silver_sandstone 195 192 181
+stairs:stair_outer_silver_sandstone_block 192 190 179
+stairs:stair_outer_silver_sandstone_brick 190 188 178
+stairs:stair_outer_snowblock 224 225 238
+stairs:stair_outer_steelblock 194 194 194
+stairs:stair_outer_stone 97 94 93
+stairs:stair_outer_stone_block 99 96 95
+stairs:stair_outer_stonebrick 99 96 95
+stairs:stair_outer_straw 211 182 67
+stairs:stair_outer_tinblock 149 149 149
+stairs:stair_outer_wood 128 99 55
 stairs:stair_pine_wood 221 184 128
 stairs:stair_sandstone 197 193 143
 stairs:stair_sandstone_block 195 190 141
@@ -272,6 +357,7 @@ stairs:stair_stone 97 94 93
 stairs:stair_stone_block 99 96 95
 stairs:stair_stonebrick 99 96 95
 stairs:stair_straw 211 182 67
+stairs:stair_tinblock 149 149 149
 stairs:stair_wood 128 99 55
 
 # tnt
@@ -288,7 +374,7 @@ vessels:steel_bottle 193 192 191
 
 # walls
 walls:cobble 88 84 82
-walls:desertcobble 146 95 76
+walls:desertcobble 107 65 49
 walls:mossycobble 86 90 68
 
 # wool
@@ -309,8 +395,10 @@ wool:white 220 220 220
 wool:yellow 254 225 15
 
 # xpanes
-xpanes:bar 194 194 227 64 16
-xpanes:bar_flat 194 194 227 64 16
-xpanes:pane 194 194 227 64 16
-xpanes:pane_flat 194 194 227 64 16
+xpanes:bar 114 114 114 64 16
+xpanes:bar_flat 114 114 114 64 16
+xpanes:obsidian_pane 16 16 17 64 16
+xpanes:obsidian_pane_flat 16 16 17 64 16
+xpanes:pane 192 192 227 64 16
+xpanes:pane_flat 192 192 227 64 16