Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
Pyritie
commit
d2ec89f2b8
6 changed files with 407 additions and 354 deletions
|
|
@ -10,6 +10,8 @@
|
|||
- Added Tier 2 Insulation: Alkaline Earth Silicate @BlueBoat29
|
||||
- Added tfc data to tacz guns and attachments (#1353) @Redeix
|
||||
- Allowed "window" blocks and panes to be broken and picked up @BlueBoat29
|
||||
- Updated title and loading screens to be more memory efficient and hopefully look better on other resolutions. (#1381) @Redeix
|
||||
- Changed Firmalife greenhouses to no longer allow any doors/trapdoors/pipes (#1363) @BlueBoat29
|
||||
### Bug fixes
|
||||
- Fixed yeast food processor conflict (#1310) @Redeix
|
||||
- Fixed seed oil voiding in barrels (#1310) @Redeix
|
||||
|
|
|
|||
|
|
@ -3,13 +3,24 @@ type = fancymenu_layout
|
|||
layout-meta {
|
||||
identifier = drippy_loading_overlay
|
||||
render_custom_elements_behind_vanilla = false
|
||||
last_edited_time = 1752822404814
|
||||
last_edited_time = 1752899622608
|
||||
is_enabled = true
|
||||
randommode = false
|
||||
randomgroup = 1
|
||||
randomonlyfirsttime = false
|
||||
layout_index = 0
|
||||
[loading_requirement_container_meta:eaa53af5-5510-4a75-9b0a-68ade58a1b7e-1752822391236] = [groups:][instances:]
|
||||
[loading_requirement_container_meta:5a04ea61-16dc-4ce3-b5f1-db096b50a05a-1752899545176] = [groups:][instances:]
|
||||
}
|
||||
|
||||
customization {
|
||||
action = setscale
|
||||
scale = 3.0
|
||||
}
|
||||
|
||||
customization {
|
||||
action = autoscale
|
||||
basewidth = 1920
|
||||
baseheight = 1080
|
||||
}
|
||||
|
||||
menu_background {
|
||||
|
|
@ -58,10 +69,10 @@ element {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = -200
|
||||
y = -53
|
||||
width = 400
|
||||
height = 66
|
||||
x = -147
|
||||
y = -33
|
||||
width = 294
|
||||
height = 48
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
|
|
@ -180,9 +191,9 @@ vanilla_button {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 180
|
||||
y = 388
|
||||
width = 472
|
||||
x = 138
|
||||
y = 298
|
||||
width = 364
|
||||
height = 10
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
|
|
@ -237,10 +248,10 @@ vanilla_button {
|
|||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 180
|
||||
y = 177
|
||||
width = 472
|
||||
height = 118
|
||||
x = 138
|
||||
y = 137
|
||||
width = 364
|
||||
height = 90
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = true
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ type = fancymenu_layout
|
|||
layout-meta {
|
||||
identifier = title_screen
|
||||
render_custom_elements_behind_vanilla = false
|
||||
last_edited_time = 1752823089998
|
||||
last_edited_time = 1752900020786
|
||||
is_enabled = true
|
||||
randommode = false
|
||||
randomgroup = 1
|
||||
randomonlyfirsttime = false
|
||||
layout_index = 0
|
||||
[loading_requirement_container_meta:1f498569-ad72-4f60-a630-0ff85ed0bedb-1752822836432] = [groups:][instances:]
|
||||
[loading_requirement_container_meta:4b07f109-9867-4431-85aa-407ae630bd9e-1752899904152] = [groups:][instances:]
|
||||
}
|
||||
|
||||
customization {
|
||||
|
|
@ -17,6 +17,12 @@ customization {
|
|||
scale = 3.0
|
||||
}
|
||||
|
||||
customization {
|
||||
action = autoscale
|
||||
basewidth = 1920
|
||||
baseheight = 1080
|
||||
}
|
||||
|
||||
menu_background {
|
||||
panorama_name = moon
|
||||
instance_identifier = 346b08c7-0697-4ae3-8335-569c9df854ac-1752817749252
|
||||
|
|
@ -141,7 +147,7 @@ element {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 36
|
||||
x = 38
|
||||
y = 23
|
||||
width = 20
|
||||
height = 20
|
||||
|
|
@ -200,7 +206,7 @@ element {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 116
|
||||
x = 115
|
||||
y = 23
|
||||
width = 20
|
||||
height = 20
|
||||
|
|
@ -259,7 +265,7 @@ element {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 90
|
||||
x = 89
|
||||
y = 23
|
||||
width = 20
|
||||
height = 20
|
||||
|
|
@ -318,8 +324,8 @@ element {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 36
|
||||
y = -30
|
||||
x = 37
|
||||
y = -29
|
||||
width = 98
|
||||
height = 20
|
||||
stretch_x = false
|
||||
|
|
@ -445,15 +451,15 @@ element {
|
|||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072
|
||||
[executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:]
|
||||
button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345
|
||||
[executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072
|
||||
[loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:]
|
||||
widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087
|
||||
[loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
|
|
@ -467,121 +473,7 @@ vanilla_button {
|
|||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = title_screen_copyright_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 2168
|
||||
auto_sizing_base_screen_height = 968
|
||||
sticky_anchor = false
|
||||
anchor_point = bottom-left
|
||||
x = 5
|
||||
y = 4
|
||||
width = 196
|
||||
height = 10
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = true
|
||||
element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072
|
||||
[loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = false
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345
|
||||
[executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087
|
||||
[loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_accessibility_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 520
|
||||
y = 250
|
||||
width = 20
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345
|
||||
[loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345
|
||||
[executable_block:829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 25294933-825d-420e-bc29-c6f745e55876-1738509235087
|
||||
[loading_requirement_container_meta:25294933-825d-420e-bc29-c6f745e55876-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_language_button
|
||||
instance_identifier = mc_titlescreen_realms_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
|
|
@ -594,15 +486,15 @@ vanilla_button {
|
|||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 86
|
||||
y = 41
|
||||
width = 20
|
||||
x = 47
|
||||
y = -5
|
||||
width = 98
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 7d7202d8-25bc-4fa6-8054-842ea3371a8d-1710837053345
|
||||
[loading_requirement_container_meta:7d7202d8-25bc-4fa6-8054-842ea3371a8d-1710837053345] = [groups:][instances:]
|
||||
element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345
|
||||
[loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
|
|
@ -615,6 +507,65 @@ vanilla_button {
|
|||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = f04fbec6-3e03-4b54-a3aa-aa7ce92175ec-1710837053345
|
||||
[executable_block:f04fbec6-3e03-4b54-a3aa-aa7ce92175ec-1710837053345][type:generic] = [executables:]
|
||||
backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button.png
|
||||
backgroundhovered = [source:location]tfg:textures/gui/button_hover.gif
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = a5d0eb38-e0bd-40e2-b194-0fcbc741923c-1738509235087
|
||||
[loading_requirement_container_meta:a5d0eb38-e0bd-40e2-b194-0fcbc741923c-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_singleplayer_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 2496
|
||||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = -67
|
||||
y = -58
|
||||
width = 201
|
||||
height = 19
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 35fdf2a6-00bc-456b-830a-e97b7ee6f3a0-1710837053345
|
||||
[loading_requirement_container_meta:35fdf2a6-00bc-456b-830a-e97b7ee6f3a0-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = false
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345
|
||||
[executable_block:c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345][type:generic] = [executables:]
|
||||
|
|
@ -732,63 +683,6 @@ vanilla_button {
|
|||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072
|
||||
[executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072
|
||||
[loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = minecraft_splash_widget
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 489
|
||||
y = 49
|
||||
width = 100
|
||||
height = 40
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072
|
||||
[loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = f5d492e4-e25d-4646-a378-cae04b45c8b3-1710837053345
|
||||
[executable_block:f5d492e4-e25d-4646-a378-cae04b45c8b3-1710837053345][type:generic] = [executables:]
|
||||
|
|
@ -849,15 +743,15 @@ vanilla_button {
|
|||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345
|
||||
[executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:]
|
||||
button_element_executable_block_identifier = 829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345
|
||||
[executable_block:829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087
|
||||
[loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:]
|
||||
widget_active_state_requirement_container_identifier = 25294933-825d-420e-bc29-c6f745e55876-1738509235087
|
||||
[loading_requirement_container_meta:25294933-825d-420e-bc29-c6f745e55876-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
|
|
@ -871,7 +765,7 @@ vanilla_button {
|
|||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_realms_button
|
||||
instance_identifier = mc_titlescreen_language_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
|
|
@ -884,15 +778,131 @@ vanilla_button {
|
|||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 47
|
||||
y = -5
|
||||
x = 86
|
||||
y = 41
|
||||
width = 20
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 7d7202d8-25bc-4fa6-8054-842ea3371a8d-1710837053345
|
||||
[loading_requirement_container_meta:7d7202d8-25bc-4fa6-8054-842ea3371a8d-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = e2b3e9b3-2d45-4f4f-b6dd-4f89f83b7da5-1710837053345
|
||||
[executable_block:e2b3e9b3-2d45-4f4f-b6dd-4f89f83b7da5-1710837053345][type:generic] = [executables:]
|
||||
backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png
|
||||
backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 81fe13c9-2717-47ad-b654-f4d7a9906ad6-1738509235086
|
||||
[loading_requirement_container_meta:81fe13c9-2717-47ad-b654-f4d7a9906ad6-1738509235086] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_multiplayer_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 2496
|
||||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = -67
|
||||
y = -29
|
||||
width = 98
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345
|
||||
[loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:]
|
||||
element_loading_requirement_container_identifier = 59ff81cd-18cf-42ee-9f05-29ab3efbd338-1710837053345
|
||||
[loading_requirement_container_meta:59ff81cd-18cf-42ee-9f05-29ab3efbd338-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = false
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345
|
||||
[executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087
|
||||
[loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_accessibility_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 424
|
||||
y = 223
|
||||
width = 20
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345
|
||||
[loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
|
|
@ -943,7 +953,7 @@ vanilla_button {
|
|||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = 36
|
||||
x = 37
|
||||
y = -3
|
||||
width = 98
|
||||
height = 20
|
||||
|
|
@ -965,17 +975,15 @@ vanilla_button {
|
|||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = f04fbec6-3e03-4b54-a3aa-aa7ce92175ec-1710837053345
|
||||
[executable_block:f04fbec6-3e03-4b54-a3aa-aa7ce92175ec-1710837053345][type:generic] = [executables:]
|
||||
backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button.png
|
||||
backgroundhovered = [source:location]tfg:textures/gui/button_hover.gif
|
||||
button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072
|
||||
[executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = a5d0eb38-e0bd-40e2-b194-0fcbc741923c-1738509235087
|
||||
[loading_requirement_container_meta:a5d0eb38-e0bd-40e2-b194-0fcbc741923c-1738509235087] = [groups:][instances:]
|
||||
widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072
|
||||
[loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
|
|
@ -989,7 +997,7 @@ vanilla_button {
|
|||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_singleplayer_button
|
||||
instance_identifier = title_screen_copyright_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
|
|
@ -998,19 +1006,19 @@ vanilla_button {
|
|||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 2496
|
||||
auto_sizing_base_screen_height = 1419
|
||||
auto_sizing_base_screen_width = 2168
|
||||
auto_sizing_base_screen_height = 968
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = -67
|
||||
y = -60
|
||||
width = 200
|
||||
height = 20
|
||||
anchor_point = bottom-left
|
||||
x = 5
|
||||
y = 4
|
||||
width = 196
|
||||
height = 10
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 35fdf2a6-00bc-456b-830a-e97b7ee6f3a0-1710837053345
|
||||
[loading_requirement_container_meta:35fdf2a6-00bc-456b-830a-e97b7ee6f3a0-1710837053345] = [groups:][instances:]
|
||||
stay_on_screen = true
|
||||
element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072
|
||||
[loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
|
|
@ -1023,122 +1031,6 @@ vanilla_button {
|
|||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = e2b3e9b3-2d45-4f4f-b6dd-4f89f83b7da5-1710837053345
|
||||
[executable_block:e2b3e9b3-2d45-4f4f-b6dd-4f89f83b7da5-1710837053345][type:generic] = [executables:]
|
||||
backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png
|
||||
backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = 81fe13c9-2717-47ad-b654-f4d7a9906ad6-1738509235086
|
||||
[loading_requirement_container_meta:81fe13c9-2717-47ad-b654-f4d7a9906ad6-1738509235086] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = mc_titlescreen_multiplayer_button
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 2496
|
||||
auto_sizing_base_screen_height = 1419
|
||||
sticky_anchor = false
|
||||
anchor_point = mid-centered
|
||||
x = -67
|
||||
y = -30
|
||||
width = 98
|
||||
height = 20
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 59ff81cd-18cf-42ee-9f05-29ab3efbd338-1710837053345
|
||||
[loading_requirement_container_meta:59ff81cd-18cf-42ee-9f05-29ab3efbd338-1710837053345] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = false
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072
|
||||
[executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072
|
||||
[loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = minecraft_logo_widget
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 288
|
||||
y = 30
|
||||
width = 256
|
||||
height = 51
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072
|
||||
[loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072
|
||||
[executable_block:17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072][type:generic] = [executables:]
|
||||
|
|
@ -1176,7 +1068,7 @@ vanilla_button {
|
|||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 2
|
||||
y = 423
|
||||
y = 314
|
||||
width = 128
|
||||
height = 49
|
||||
stretch_x = false
|
||||
|
|
@ -1196,3 +1088,117 @@ vanilla_button {
|
|||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072
|
||||
[executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072
|
||||
[loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = minecraft_splash_widget
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 393
|
||||
y = 49
|
||||
width = 100
|
||||
height = 40
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072
|
||||
[loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
vanilla_button {
|
||||
button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072
|
||||
[executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:]
|
||||
restartbackgroundanimations = true
|
||||
nine_slice_custom_background = false
|
||||
nine_slice_border_x = 5
|
||||
nine_slice_border_y = 5
|
||||
navigatable = true
|
||||
widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072
|
||||
[loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:]
|
||||
is_template = false
|
||||
template_apply_width = false
|
||||
template_apply_height = false
|
||||
template_apply_posx = false
|
||||
template_apply_posy = false
|
||||
template_apply_opacity = false
|
||||
template_apply_visibility = false
|
||||
template_apply_label = false
|
||||
template_share_with = buttons
|
||||
nine_slice_slider_handle = false
|
||||
nine_slice_slider_handle_border_x = 5
|
||||
nine_slice_slider_handle_border_y = 5
|
||||
element_type = vanilla_button
|
||||
instance_identifier = minecraft_logo_widget
|
||||
appearance_delay = no_delay
|
||||
appearance_delay_seconds = 1.0
|
||||
fade_in_v2 = no_fading
|
||||
fade_in_speed = 1.0
|
||||
fade_out = no_fading
|
||||
fade_out_speed = 1.0
|
||||
base_opacity = 1.0
|
||||
auto_sizing = false
|
||||
auto_sizing_base_screen_width = 0
|
||||
auto_sizing_base_screen_height = 0
|
||||
sticky_anchor = false
|
||||
anchor_point = vanilla
|
||||
x = 192
|
||||
y = 30
|
||||
width = 256
|
||||
height = 51
|
||||
stretch_x = false
|
||||
stretch_y = false
|
||||
stay_on_screen = false
|
||||
element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072
|
||||
[loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:]
|
||||
enable_parallax = false
|
||||
parallax_intensity_v2 = 0.5
|
||||
invert_parallax = false
|
||||
animated_offset_x = 0
|
||||
animated_offset_y = 0
|
||||
load_once_per_session = false
|
||||
in_editor_color = #FFC800FF
|
||||
layer_hidden_in_editor = false
|
||||
is_hidden = true
|
||||
automated_button_clicks = 0
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ const registerFirmaLifeItemTags = (event) => {
|
|||
|
||||
// Удаление тегов у руд
|
||||
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
|
||||
|
||||
|
||||
}
|
||||
|
||||
const registerFirmaLifeBlockTags = (event) => {
|
||||
|
|
@ -31,6 +33,43 @@ const registerFirmaLifeBlockTags = (event) => {
|
|||
// Удаление тегов у руд
|
||||
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
|
||||
|
||||
// Удаление тегов у отключенных предметов
|
||||
global.FIRMALIFE_DISABLED_ITEMS.forEach(item => {
|
||||
event.removeAllTagsFrom(item)
|
||||
})
|
||||
|
||||
// Удаление тегов у руд
|
||||
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
|
||||
|
||||
//greenhouse wall fixes
|
||||
event.remove('firmalife:always_valid_greenhouse_wall', '#minecraft:doors')
|
||||
event.remove('firmalife:always_valid_greenhouse_wall', '#minecraft:trapdoors')
|
||||
|
||||
const greenhouse_tiers = [
|
||||
'treated_wood',
|
||||
'weathered_treated_wood',
|
||||
'copper',
|
||||
'exposed_copper',
|
||||
'weathered_copper',
|
||||
'oxidized_copper',
|
||||
'iron',
|
||||
'rusted_iron',
|
||||
'stainless_steel'
|
||||
]
|
||||
|
||||
greenhouse_tiers.forEach(tier => {
|
||||
event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_door')
|
||||
event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_trapdoor')
|
||||
})
|
||||
|
||||
//Allows any block with the word "brick" in its id to be used as oven insulation.
|
||||
//Add blacklisted words to the const with | between.
|
||||
const brick_blacklist = ('drying|additionalplacements');
|
||||
event.add('firmalife:oven_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`);
|
||||
|
||||
event.add('firmalife:oven_insulation', 'firmalife:stovetop_pot');
|
||||
event.add('firmalife:oven_insulation', 'firmalife:vat');
|
||||
|
||||
//Allows any block with the word "brick" in its id to be used as oven insulation.
|
||||
//Add blacklisted words to the const with | between.
|
||||
const brick_blacklist = ('drying|additionalplacements');
|
||||
|
|
@ -52,4 +91,4 @@ const registerFirmaLifeFluidTags = (event) => {
|
|||
event.add('firmalife:mixable', 'tfcchannelcasting:dark_chocolate')
|
||||
event.add('firmalife:mixable', 'afc:maple_syrup')
|
||||
event.add('firmalife:mixable', 'afc:birch_syrup')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -321,6 +321,8 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
GTMaterials.Platinum.setMaterialSecondaryARGB(0x59563a)
|
||||
GTMaterials.Nickel.setMaterialARGB(0xfff4ba)
|
||||
GTMaterials.Nickel.setMaterialSecondaryARGB(0x8d8d71)
|
||||
GTMaterials.Thorium.setMaterialARGB(0xf8a8c0)
|
||||
GTMaterials.Thorium.setMaterialSecondaryARGB(0xcd8dbc)
|
||||
|
||||
|
||||
global.MINECRAFT_DYE_NAMES.forEach(colorName =>
|
||||
|
|
|
|||
|
|
@ -52,13 +52,6 @@ const registerGTCEuTagPrefixes = (event) => {
|
|||
TagPrefix.pipeNonupleFluid.defaultTagPath("nonuple_fluid_pipes/%s")
|
||||
TagPrefix.pipeNonupleFluid.unformattedTagPath("nonuple_fluid_pipes")
|
||||
|
||||
// FirmaLife Shit
|
||||
TagPrefix.pipeTinyFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
|
||||
TagPrefix.pipeSmallFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
|
||||
TagPrefix.pipeNormalFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
|
||||
TagPrefix.pipeLargeFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
|
||||
// FirmaLife Shit
|
||||
|
||||
TagPrefix.pipeSmallItem.defaultTagPath("small_item_pipes/%s")
|
||||
TagPrefix.pipeSmallItem.unformattedTagPath("small_item_pipes")
|
||||
TagPrefix.pipeNormalItem.defaultTagPath("normal_item_pipes/%s")
|
||||
|
|
@ -99,4 +92,4 @@ const registerGTCEuTagPrefixes = (event) => {
|
|||
TagPrefix.rawOreBlock.unformattedTagPath("raw_ore_blocks")
|
||||
|
||||
TagPrefix.rawOre.setIgnored(GTMaterials.Iron);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue