Merge remote-tracking branch 'origin/dev' into dev

FTBTeam · Nov 25, 2024 · 46d3950 · 46d3950
2 parents a98e939 + b70dbe9
commit 46d3950
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java b/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java
@@ -66,6 +66,7 @@ protected void apply(JsonObject object, ResourceManager resourceManager, Profile
 						|| block instanceof FireBlock
 						|| block instanceof ButtonBlock
 						|| block instanceof TorchBlock && !(block instanceof RedstoneTorchBlock)
+						|| block instanceof StainedGlassPaneBlock
 				) {
 					BLOCK_ID_TO_COLOR_MAP.put(id, BlockColors.IGNORED);
 				} else if (block instanceof GrassBlock) {

diff --git a/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json b/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json
@@ -65,5 +65,11 @@
 	"lily_pad": "#208030",
 	"dead_bush": "#A89061",
 	"glass": "#CCE5E4",
-	"cherry_leaves": "#b390a4"
+	"cherry_leaves": "#b390a4",
+	"glass_pane": "ignored",
+	"comparator": "ignored",
+	"repeater": "ignored",
+	"end_rod": "ignored",
+	"chain": "ignored",
+	"lever": "ignored"
 }