Compare commits

..

No commits in common. "master" and "r1" have entirely different histories.
master ... r1

2 changed files with 108 additions and 122 deletions

View file

@ -2,63 +2,56 @@ GIMP Palette
Name: minecraft-fullblock
Columns: 0
#
226 211 173 smooth_sandstone
195 2 27 redstone_block
127 184 245 packed_ice
95 173 247 blue_ice
220 220 220 iron_block
205 212 213 white_concrete
158 166 177 clay
143 97 75 dirt
131 131 131 cobblestone
125 125 125 stone
159 159 159 smooth_stone
170 130 88 oak_planks
197 173 127 birch_planks
178 87 60 acacia_planks
170 115 88 jungle_planks
121 85 57 spruce_planks
73 47 30 dark_oak_planks
236 229 223 quartz_block
239 89 40 orange_concrete
177 56 153 magenta_concrete
0 141 193 light_blue_concrete
253 168 63 yellow_concrete
81 165 57 lime_concrete
225 98 140 pink_concrete
57 61 64 gray_concrete
125 124 115 light_gray_concrete
0 120 133 cyan_concrete
102 49 149 purple_concrete
37 59 137 blue_concrete
101 60 41 brown_concrete
73 90 47 green_concrete
151 29 41 red_concrete
16 19 22 black_concrete
251 205 94 gold_block
79 240 228 diamond_block
71 66 68 netherite_block
2 76 135 lapis_block
32 204 110 emerald_block
106 42 45 netherrack
214 175 162 white_terracotta
170 80 50 orange_terracotta
156 87 108 magenta_terracotta
112 110 135 light_blue_terracotta
194 128 57 yellow_terracotta
103 116 63 lime_terracotta
170 76 81 pink_terracotta
63 45 41 gray_terracotta
138 105 99 light_gray_terracotta
87 92 91 cyan_terracotta
123 71 86 purple_terracotta
76 64 90 blue_terracotta
82 53 42 brown_terracotta
77 83 50 green_terracotta
151 59 54 red_terracotta
44 29 24 black_terracotta
142 36 44 crimson_nylium
110 52 73 crimson_planks
43 117 105 warped_nylium
20 110 104 warped_planks
52 29 33 nether_bricks
247 233 163 smooth_sandstone
199 199 199 mushroom_stem[east=true,west=true,north=true,south=true,up=true,down=true]
255 0 0 redstone_block
160 160 255 packed_ice
167 167 167 iron_block
0 124 0 oak_leaves[distance=7,persistent=true]
255 255 255 white_concrete
164 168 184 clay
151 109 77 dirt
112 112 112 stone
143 119 72 oak_planks
255 252 245 quartz_block
216 127 51 orange_concrete
178 76 216 magenta_concrete
102 153 216 light_blue_concrete
229 229 51 yellow_concrete
127 204 25 lime_concrete
242 127 165 pink_concrete
76 76 76 gray_concrete
153 153 153 light_gray_concrete
76 127 153 cyan_concrete
127 63 178 purple_concrete
51 76 178 blue_concrete
102 76 51 brown_concrete
102 127 51 green_concrete
153 51 51 red_concrete
25 25 25 black_concrete
250 238 77 gold_block
92 219 213 diamond_block
74 128 255 lapis_block
0 217 58 emerald_block
112 2 0 netherrack
209 177 161 white_terracotta
159 82 36 orange_terracotta
149 87 108 magenta_terracotta
112 108 138 light_blue_terracotta
186 133 36 yellow_terracotta
103 117 53 lime_terracotta
160 77 78 pink_terracotta
57 41 35 gray_terracotta
135 107 98 light_gray_terracotta
87 92 92 cyan_terracotta
122 73 88 purple_terracotta
76 62 92 blue_terracotta
76 50 35 brown_terracotta
76 82 42 green_terracotta
142 60 46 red_terracotta
37 22 16 black_terracotta
189 48 49 crimson_nylium
148 63 97 crimson_planks
22 126 134 warped_nylium
58 142 140 warped_planks
20 180 133 warped_wart_block

View file

@ -3,67 +3,60 @@ Name: minecraft
Columns: 0
#
127 178 56 grass_block[snowy=false]
247 233 163 smooth_sandstone
199 199 199 mushroom_stem[east=true,west=true,north=true,south=true,up=true,down=true]
255 0 0 redstone_block
160 160 255 packed_ice
167 167 167 iron_block
0 124 0 oak_leaves[distance=7,persistent=true]
255 255 255 white_concrete
164 168 184 clay
151 109 77 dirt
112 112 112 stone
64 64 255 water[level=0]
100 64 36 podzol[snowy=false]
203 195 185 mushroom_stem[east=true,west=true,north=true,south=true,up=true,down=true]
226 211 173 smooth_sandstone
195 2 27 redstone_block
127 184 245 packed_ice
95 173 247 blue_ice
220 220 220 iron_block
205 212 213 white_concrete
158 166 177 clay
143 97 75 dirt
131 131 131 cobblestone
125 125 125 stone
159 159 159 smooth_stone
170 130 88 oak_planks
197 173 127 birch_planks
178 87 60 acacia_planks
170 115 88 jungle_planks
121 85 57 spruce_planks
73 47 30 dark_oak_planks
236 229 223 quartz_block
239 89 40 orange_concrete
177 56 153 magenta_concrete
0 141 193 light_blue_concrete
253 168 63 yellow_concrete
81 165 57 lime_concrete
225 98 140 pink_concrete
57 61 64 gray_concrete
125 124 115 light_gray_concrete
0 120 133 cyan_concrete
102 49 149 purple_concrete
37 59 137 blue_concrete
101 60 41 brown_concrete
73 90 47 green_concrete
151 29 41 red_concrete
16 19 22 black_concrete
251 205 94 gold_block
79 240 228 diamond_block
71 66 68 netherite_block
2 76 135 lapis_block
32 204 110 emerald_block
106 42 45 netherrack
214 175 162 white_terracotta
170 80 50 orange_terracotta
156 87 108 magenta_terracotta
112 110 135 light_blue_terracotta
194 128 57 yellow_terracotta
103 116 63 lime_terracotta
170 76 81 pink_terracotta
63 45 41 gray_terracotta
138 105 99 light_gray_terracotta
87 92 91 cyan_terracotta
123 71 86 purple_terracotta
76 64 90 blue_terracotta
82 53 42 brown_terracotta
77 83 50 green_terracotta
151 59 54 red_terracotta
44 29 24 black_terracotta
142 36 44 crimson_nylium
110 52 73 crimson_planks
43 117 105 warped_nylium
20 110 104 warped_planks
52 29 33 nether_bricks
143 119 72 oak_planks
255 252 245 quartz_block
216 127 51 orange_concrete
178 76 216 magenta_concrete
102 153 216 light_blue_concrete
229 229 51 yellow_concrete
127 204 25 lime_concrete
242 127 165 pink_concrete
76 76 76 gray_concrete
153 153 153 light_gray_concrete
76 127 153 cyan_concrete
127 63 178 purple_concrete
51 76 178 blue_concrete
102 76 51 brown_concrete
102 127 51 green_concrete
153 51 51 red_concrete
25 25 25 black_concrete
250 238 77 gold_block
92 219 213 diamond_block
74 128 255 lapis_block
0 217 58 emerald_block
129 86 49 podzol[snowy=false]
112 2 0 netherrack
209 177 161 white_terracotta
159 82 36 orange_terracotta
149 87 108 magenta_terracotta
112 108 138 light_blue_terracotta
186 133 36 yellow_terracotta
103 117 53 lime_terracotta
160 77 78 pink_terracotta
57 41 35 gray_terracotta
135 107 98 light_gray_terracotta
87 92 92 cyan_terracotta
122 73 88 purple_terracotta
76 62 92 blue_terracotta
76 50 35 brown_terracotta
76 82 42 green_terracotta
142 60 46 red_terracotta
37 22 16 black_terracotta
189 48 49 crimson_nylium
148 63 97 crimson_planks
92 25 29 crimson_hyphae[axis=y]
22 126 134 warped_nylium
58 142 140 warped_planks
86 44 62 warped_hyphae[axis=y]
20 180 133 warped_wart_block