some fixes and 0.12 cpmpability

Author: Zaraney

shaders/block.properties

@@ -230,6 +230,9 @@
 # tags_neoforge_glass 								%neoforge:glass
 # tags_neoforge_glass_panes							%neoforge:glass_pane
 
+# TerraFirmaCraft
+#define tags_tfc_plants								%tfc:plants
+
 #endif
 
 # ============================================================================
@@ -755,6 +758,8 @@ terrestria:bryce_sapling terrestria:cypress_sapling terrestria:dark_japanese_map
 \
 tfc:crop/alfalfa tfc:crop/barley tfc:crop/beet tfc:crop/cabbage tfc:crop/canola tfc:crop/carrot tfc:crop/cassava tfc:crop/garlic tfc:crop/green_bean:stick=false:part=bottom tfc:crop/jute:part=bottom tfc:crop/lentil tfc:crop/maize:part=bottom tfc:crop/melon tfc:crop/oat tfc:crop/onion tfc:crop/papyrus:part=bottom tfc:crop/peanut tfc:crop/potato tfc:crop/pumpkin tfc:crop/radish tfc:crop/red_bell_pepper tfc:crop/rice:fluid=empty tfc:crop/rye tfc:crop/soybean tfc:crop/squash tfc:crop/tomato:stick=false:part=bottom tfc:crop/wheat tfc:crop/yellow_bell_pepper tfc:dead_crop/alfalfa tfc:dead_crop/barley tfc:dead_crop/beet tfc:dead_crop/cabbage tfc:dead_crop/canola tfc:dead_crop/carrot tfc:dead_crop/cassava tfc:dead_crop/garlic tfc:dead_crop/green_bean:part=bottom tfc:dead_crop/jute:part=bottom tfc:dead_crop/lentil tfc:dead_crop/maize:part=bottom tfc:dead_crop/melon tfc:dead_crop/oat tfc:dead_crop/onion tfc:dead_crop/papyrus:part=bottom tfc:dead_crop/peanut tfc:dead_crop/potato tfc:dead_crop/pumpkin tfc:dead_crop/radish tfc:dead_crop/red_bell_pepper tfc:dead_crop/rye tfc:dead_crop/soybean tfc:dead_crop/squash tfc:dead_crop/tomato:part=bottom tfc:dead_crop/wheat tfc:dead_crop/yellow_bell_pepper tfc:plant/arrowhead:part=lower tfc:plant/arundo tfc:plant/athyrium_fern tfc:plant/banana_sapling tfc:plant/beachgrass tfc:plant/bear_grass:part=lower tfc:plant/bird_nest_fern tfc:plant/bluegrass tfc:plant/bromegrass tfc:plant/bunchberry_bush tfc:plant/canna tfc:plant/cattail:part=lower tfc:plant/cherry_sapling tfc:plant/cloudberry_bush tfc:plant/coontail tfc:plant/cordgrass:part=lower tfc:plant/cranberry_bush tfc:plant/dead_berry_bush tfc:plant/dead_bush tfc:plant/desert_flame tfc:plant/dry_grass tfc:plant/dry_phragmite tfc:plant/fan_palm:part=lower tfc:plant/field_horsetail tfc:plant/fountain_grass tfc:plant/foxglove:part=lower tfc:plant/golden_bamboo_sapling tfc:plant/gooseberry_bush tfc:plant/green_apple_sapling tfc:plant/heather tfc:plant/king_fern:part=upper tfc:plant/lady_fern tfc:plant/lemon_sapling tfc:plant/marigold:part=lower tfc:plant/olive_sapling tfc:plant/orange_sapling tfc:plant/orchard_grass tfc:plant/ostrich_fern tfc:plant/pampas_grass:part=lower tfc:plant/peach_sapling tfc:plant/phragmite:part=lower tfc:plant/pickerelweed:part=lower tfc:plant/plum_sapling tfc:plant/primrose tfc:plant/raddia_grass tfc:plant/ramunda tfc:plant/red_apple_sapling tfc:plant/red_oat_grass tfc:plant/red_sealing_wax_palm:part=lower tfc:plant/ryegrass tfc:plant/sagebrush tfc:plant/saguaro_fruit tfc:plant/sapphire_tower:part=lower tfc:plant/scutch_grass tfc:plant/sea_lavender:part=lower tfc:plant/silver_bromeliad tfc:plant/silver_spurflower tfc:plant/snowberry_bush tfc:plant/star_grass tfc:plant/strawberry_bush tfc:plant/switchgrass:part=lower tfc:plant/sword_fern tfc:plant/tall_fescue_grass:part=lower tfc:plant/timothy_grass tfc:plant/toquilla_palm:part=lower tfc:plant/water_taro:part=lower tfc:plant/wintergreen_berry_bush tfc:plant/yucca tfc:wild_crop/alfalfa tfc:wild_crop/barley tfc:wild_crop/beet tfc:wild_crop/cabbage tfc:wild_crop/canola tfc:wild_crop/carrot tfc:wild_crop/cassava tfc:wild_crop/garlic tfc:wild_crop/green_bean:part=bottom tfc:wild_crop/jute:part=bottom tfc:wild_crop/lentil tfc:wild_crop/maize:part=bottom tfc:wild_crop/melon tfc:wild_crop/oat tfc:wild_crop/onion tfc:wild_crop/papyrus:part=bottom tfc:wild_crop/peanut tfc:wild_crop/potato tfc:wild_crop/pumpkin tfc:wild_crop/radish tfc:wild_crop/red_bell_pepper tfc:wild_crop/rice:fluid=empty tfc:wild_crop/rye tfc:wild_crop/soybean tfc:wild_crop/squash tfc:wild_crop/tomato:part=bottom tfc:wild_crop/wheat tfc:wild_crop/yellow_bell_pepper tfc:wood/sapling/acacia tfc:wood/sapling/ash tfc:wood/sapling/aspen tfc:wood/sapling/birch tfc:wood/sapling/blackwood tfc:wood/sapling/chestnut tfc:wood/sapling/douglas_fir tfc:wood/sapling/hickory tfc:wood/sapling/kapok tfc:wood/sapling/mangrove tfc:wood/sapling/maple tfc:wood/sapling/oak tfc:wood/sapling/palm tfc:wood/sapling/pine tfc:wood/sapling/rosewood tfc:wood/sapling/sequoia tfc:wood/sapling/spruce tfc:wood/sapling/sycamore tfc:wood/sapling/white_cedar tfc:wood/sapling/willow \
 \
+tfg:beans tfg:beans_dead tfg:beans_wild tfg:cucumber tfg:cucumber_wild tfg:cucumber_dead tfg:plant/azalea tfg:plant/bear_grass tfg:plant/buttercup tfg:plant/cornflower tfg:plant/cycad tfg:plant/dry_grass tfg:plant/edelweiss tfg:plant/moss_campion tfg:plant/mountain_hullwort tfg:plant/palash tfg:plant/penwortel tfg:plant/qantu tfg:plant/ramunda tfg:plant/red_oat_grass tfg:plant/shawiash tfg:plant/silver_bromeliad tfg:plant/tank_bromeliad tfg:plant/yellow_saxifrage tfg:radish tfg:radish_wild tfg:radish_dead tfg:ghost_pepper tfg:ghost_pepper_wild tfg:ghost_pepper_dead tfg:fruit_trees/lavacado_sapling tfg:fruit_trees/potted_lavacado_sapling tfg:fruit_trees/potted_magmango_sapling tfg:fruit_trees/magmango_sapling \
+\
 the_deep_void:bone_marrow the_deep_void:cave_growth the_deep_void:rotten_grass:half=lower \
 \
 theabyss:blaru_grass theabyss:caecus_versa theabyss:exolius_plant theabyss:fortris_ultima theabyss:glow_shroom:half=lower theabyss:gulom_plant theabyss:ralom_plant theabyss:rub_shroom:half=lower theabyss:saturnia_versa theabyss:slimed_grass theabyss:srala_shroom theabyss:tall_blaru_grass:half=lower theabyss:tall_glow_shroom:half=lower theabyss:tall_rub_shroom:half=lower theabyss:vigilant_blue_grass theabyss:vigilant_blue_outer_leaves theabyss:vigilant_grass theabyss:vigilant_outer_leaves theabyss:young_exolius_plant \
@@ -878,7 +883,7 @@ wilderwild:baobab_leaves wilderwild:cypress_leaves wilderwild:orange_maple_leave
 
 # Leaves
 block.10009 = oak_leaves birch_leaves dark_oak_leaves azalea_leaves \
-tags_leaves \
+tags_leaves	\
 \
 aether:crystal_fruit_leaves aether:crystal_leaves aether:decorated_holiday_leaves aether:golden_oak_leaves aether:holiday_leaves aether:skyroot_leaves \
 \
@@ -1020,7 +1025,7 @@ sushigocrafting:avocado_leaves \
 \
 terrestria:cypress_leaves terrestria:dark_japanese_maple_leaves terrestria:hemlock_leaves terrestria:japanese_maple_leaves terrestria:japanese_maple_shrub_leaves terrestria:jungle_palm_leaves terrestria:rainbow_eucalyptus_leaves terrestria:redwood_leaves terrestria:rubber_leaves terrestria:sakura_leaves terrestria:willow_leaves terrestria:yuca_palm_leaves terrestria:yucca_palm_leaves \
 \
-tfg:flax_dead tfg:flax_wild tfg:rapeseed_dead tfg:rapeseed_wild tfg:sunflower_dead tfg:sunflower_wild tfg:sunflower tfg:rapeseed tfg:flax \
+tfg:fruit_trees/lavacado_leaves tfg:fruit_trees/magmango_leaves tfg:flax_dead tfg:flax_wild tfg:rapeseed_dead tfg:rapeseed_wild tfg:sunflower_dead tfg:sunflower_wild tfg:sunflower tfg:rapeseed tfg:flax \
 \
 theabyss:blaru_leaves theabyss:frozen_leaves theabyss:jungle_leaves \
 \
@@ -7615,6 +7620,10 @@ regions_unexplored:icicle \
 securitycraft:reinforced_blue_ice \
 \
 tconstruct:blood_congealed_slime tconstruct:earth_congealed_slime tconstruct:ender_congealed_slime tconstruct:ichor_congealed_slime tconstruct:sky_congealed_slime tconstruct:slime_congealed
+\
+tfc:sea_ice tfc:pile_ice \
+\
+tfg:mars_ice
 
 # Non-Full Blue Ice (Modded Only)
 block.10389 = windswept:blue_ice_brick_slab windswept:blue_ice_brick_stairs windswept:blue_ice_brick_wall windswept:blue_ice_slab windswept:blue_ice_stairs \

shaders/lib/shaderSettings/activateSettings.glsl

@@ -1,4 +1,5 @@
 #include "/lib/shaderSettings/settingsFileDefines.glsl"
+#include "/lib/shaderSettings/TerraFirmaGregSettings.glsl"
 
 //Information//
 #define info0 0 //[0]