Merge branch 'dev' into feature/ochemForFission

Signed-off-by: Pyritie <[email protected]>

Author: Pyritie

CHANGELOG.md

@@ -1,7 +1,18 @@
 # Changelog
-
 ## [Unreleased]
 ### Changes
+- Add shapeless p2p recipes (#2234) @SpicyNoodle5
+- Added assembler, smelting and heating recipes for firmalife ovens (#2220) @SpicyNoodle5
+- Raised burning fluid threshold from 370K to 1300K @Redeix
+- Added partial unification to the gtceu wax material @Redeix
+### Bug fixes
+- Fixed brown gravy recipe @Redeix
+- Fixed instant mac recipe requiring less cardboard than it gives back @Redeix
+- Fixed Ad Astra moon cheese nutrition values being inconsistent @Redeix
+### Translation updates
+
+## [0.11.8] - 19-11-2025
+### Changes
 - Added a paving cart for automating RNR roads. (#2144) @Redeix
 - Non-TFC armors now have TFC resistances (#2157) @theMegaTech
 - Regular Blue Steel Boots now also count towards the lavaproof diving set (#2155) @theMegaTech
@@ -22,6 +33,13 @@
 - Added a little more silver to surface bismuth veins, moved apatite veins closer to the surface and with deeper indicators, increased deep sapphire veins' max Y level and added a rock type, and also added a rock type to deep magnetite's veins (all overworld only) @Pyritie
 - Buffed the amount of roof tiles from clay knapping (#2178) @Pyritie
 - Added sugar cookies, toasts, jams, pickled eggs, and butter to the meal bag tag, removed banana splits (#2129) @Pyritie
+- Added lots of new food items including fries, burgers, oatmeal, mac and cheese, poutine, and more! @Redeix
+- Added processed spices for firmalife spice crops (except cinnamon). @Redeix
+- Reduced base food oven recipe time from 300 to 200 ticks @Redeix
+- Made Nitrocellulose less annoying to craft @BlueBoat29
+- Added tags to platinum group ores @Mqrius
+- Moved the Flintlock from Steel --> Wrought Iron @BlueBoat29
+- Added better tooltips for custom machines @Xtrial-01
 ### Bug fixes
 - Fixed TFC bug where paths and roads can collapse on themselves when creating a staircase shape. (#2144) @Redeix
 - Fixed the HV aqueous accumulator water recipe so the amount of water can actually fit in the HV machine @Pyritie
@@ -35,6 +53,11 @@
 - Fixed not being able to put Seed Oil in a Mixing Bowl (#2203) @slavek
 - Added missing items to the smooth stone slabs tag, cleaned up armor stand recipes (#2197) @Pyritie
 - Fixed milk curd recipes in food processor outputting rotten curds. (#2209) @Redeix
+- Fixed missing nixtamal food processor recipes. @Redeix
+- Fixed missing lang string from loading screen. @Redeix
+- Fixed some mismatched lang strings between ja_jp and en_us @BlueBoat29 @jmecn
+- Fixed Railgun Ammo size @TomPlop
+- Fixed bread and cheese ignoring being rotten @theMegaTech
 ### Translation updates
 - Russian @DI-GitH + @nineex + @alexart2006
 - Brazilian Portuguese @Redeix

config/fancymenu/customization/gui_loading_screen.txt

@@ -3,13 +3,13 @@ type = fancymenu_layout
 layout-meta {
   identifier = drippy_loading_overlay
   render_custom_elements_behind_vanilla = false
-  last_edited_time = 1752899622608
+  last_edited_time = 1763246081342
   is_enabled = true
   randommode = false
   randomgroup = 1
   randomonlyfirsttime = false
   layout_index = 0
-  [loading_requirement_container_meta:5a04ea61-16dc-4ce3-b5f1-db096b50a05a-1752899545176] = [groups:][instances:]
+  [loading_requirement_container_meta:b25d78fb-bad6-4131-9517-ed77003190ca-1763246052248] = [groups:][instances:]
 }
 
 customization {
@@ -55,6 +55,7 @@ element {
   nine_slice_texture_border_x = 5
   nine_slice_texture_border_y = 5
   image_tint = #FFFFFF
+  restart_animated_on_menu_load = false
   element_type = image
   instance_identifier = 22ec4f96-137c-48d9-ac6b-cb4f58e7a7821699231610566
   appearance_delay = no_delay
@@ -89,8 +90,8 @@ element {
 }
 
 element {
-  interactable = true
-  source = Tip: Read the Field Guide!!!
+  interactable = false
+  source = {"placeholder":"local","values":{"key":"tfg.gui.menu.field_guide_splash_text"}}
   source_mode = direct
   shadow = true
   scale = 1.0
@@ -155,6 +156,140 @@ element {
   layer_hidden_in_editor = false
 }
 
+element {
+  interactable = false
+  source = {"placeholder":"local","values":{"key":"tfg.gui.menu.ram_usage"}} {"placeholder":"usedram"}MB/ {"placeholder":"maxram"}MB
+  source_mode = direct
+  shadow = true
+  scale = 0.8
+  base_color = #b5b5b5
+  text_border = 2
+  line_spacing = 2
+  enable_scrolling = false
+  auto_line_wrapping = true
+  remove_html_breaks = true
+  code_block_single_color = #737373FF
+  code_block_multi_color = #565656FF
+  headline_line_color = #A9A9A9FF
+  separation_line_color = #A9A9A9FF
+  hyperlink_color = #0771FCFF
+  quote_color = #818181FF
+  quote_indent = 8.0
+  quote_italic = false
+  bullet_list_dot_color = #A9A9A9FF
+  bullet_list_indent = 8.0
+  bullet_list_spacing = 3.0
+  parse_markdown = true
+  table_show_header = true
+  table_alternate_row_colors = true
+  table_line_color = #787878FF
+  table_header_background_color = #323232FF
+  table_row_background_color = #282828FF
+  table_alternate_row_color = #3C3C3CFF
+  table_line_thickness = 1.0
+  table_cell_padding = 8.0
+  table_margin = 4.0
+  element_type = text_v2
+  instance_identifier = 86a4db70-075d-42a2-ba17-fa5d4dbaa06e-1763245386549
+  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 = element
+  anchor_point_element = progress_bar
+  x = 264
+  y = 12
+  width = 192
+  height = 15
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = 613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758
+  [loading_requirement_container_meta:613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758] = [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
+}
+
+element {
+  interactable = false
+  source = {"placeholder":"local","values":{"key":"tfg.gui.menu.fps_count"}} {"placeholder":"fps"}
+  source_mode = direct
+  shadow = true
+  scale = 0.8
+  base_color = #b5b5b5
+  text_border = 2
+  line_spacing = 2
+  enable_scrolling = false
+  auto_line_wrapping = true
+  remove_html_breaks = true
+  code_block_single_color = #737373FF
+  code_block_multi_color = #565656FF
+  headline_line_color = #A9A9A9FF
+  separation_line_color = #A9A9A9FF
+  hyperlink_color = #0771FCFF
+  quote_color = #818181FF
+  quote_indent = 8.0
+  quote_italic = false
+  bullet_list_dot_color = #A9A9A9FF
+  bullet_list_indent = 8.0
+  bullet_list_spacing = 3.0
+  parse_markdown = true
+  table_show_header = true
+  table_alternate_row_colors = true
+  table_line_color = #787878FF
+  table_header_background_color = #323232FF
+  table_row_background_color = #282828FF
+  table_alternate_row_color = #3C3C3CFF
+  table_line_thickness = 1.0
+  table_cell_padding = 8.0
+  table_margin = 4.0
+  element_type = text_v2
+  instance_identifier = 212f299f-173f-42b0-be66-3c1cc155a7ed-1763245838831
+  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 = element
+  anchor_point_element = progress_bar
+  x = 264
+  y = 22
+  width = 203
+  height = 15
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = 613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758
+  [loading_requirement_container_meta:613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758] = [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
+}
+
 vanilla_button {
   button_element_executable_block_identifier = f3a70cd2-ecfc-4b6b-91cf-b88673431f32-1710837053334
   [executable_block:f3a70cd2-ecfc-4b6b-91cf-b88673431f32-1710837053334][type:generic] = [executables:]

config/fancymenu/customization/gui_main_menu.txt

@@ -3,13 +3,13 @@ type = fancymenu_layout
 layout-meta {
   identifier = title_screen
   render_custom_elements_behind_vanilla = false
-  last_edited_time = 1759697550520
+  last_edited_time = 1763246321798
   is_enabled = true
   randommode = false
   randomgroup = 1
   randomonlyfirsttime = false
   layout_index = 0
-  [loading_requirement_container_meta:5de75902-4589-4c02-a443-487a6194d339-1759697516765] = [groups:][instances:]
+  [loading_requirement_container_meta:f89ba56d-3e0b-46b3-bef2-6e7ecabf2ff0-1763246081347] = [groups:][instances:]
 }
 
 customization {

config/moldraw.yaml

@@ -4,7 +4,7 @@ debugMode: false
 
 coloredAtoms: true
 
-useMaterialColors: true
+useMaterialColors: false
 
 onlyShowOnShift: true
 

kubejs/assets/endermanoverhaul/lang/en_us.json

@@ -1,85 +1,5 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
-  "block.betterend.aeridium": "Aeridium",
-  "block.betterend.amaranita_stem": "Amaranita Stem",
-  "block.betterend.amber_grass": "Amber Grass",
-  "block.betterend.amber_root_wild": "Wild Amber Shoots",
-  "block.betterend.amber_root_dead": "Dead Amber Shoots",
-  "block.betterend.amber_root": "Amber Shoots",
-  "block.betterend.aurant_polypore": "Aurant Polypore",
-  "block.betterend.blooming_cooksonia": "Blooming Cooksonia",
-  "block.betterend.blossom_berry": "Blossom Berry",
-  "block.betterend.blossom_berry_wild": "Wild Blossom Berry",
-  "block.betterend.blossom_berry_dead": "Dead Blossom Berry",
-  "block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
-  "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
-  "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
-  "block.betterend.bushy_grass": "Novagrass",
-  "block.betterend.bulb_moss": "Bulb Moss",
-  "block.betterend.cave_bush": "Carmine Lamella",
-  "block.betterend.cave_bush_fallen": "Small Carmine Lamella",
-  "block.betterend.cave_grass": "Vermilligma",
-  "block.betterend.cave_pumpkin": "Bulbkin",
-  "block.betterend.cave_pumpkin_wild": "Wild Bulbkin Stem",
-  "block.betterend.cave_pumpkin_dead": "Dead Bulbkin Stem",
-  "block.betterend.cave_pumpkin_plant": "Bulbkin Stem",
-  "block.betterend.charnia_cyan": "Cyan Charnia",
-  "block.betterend.charnia_green": "Green Charnia",
-  "block.betterend.charnia_light_blue": "Teal Charnia",
-  "block.betterend.charnia_orange": "Orange Charnia",
-  "block.betterend.charnia_purple": "Purple Charnia",
-  "block.betterend.charnia_red": "Red Charnia",
-  "block.betterend.chorus_grass": "Chorus Grass",
-  "block.betterend.chorus_lily": "Chorus Lily",
-  "block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
-  "block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
-  "block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
-  "block.betterend.clawfern": "Clawfern",
-  "block.betterend.crystal_grass": "Crystal Grass",
-  "block.betterend.end_lily": "Deimos Lily",
-  "block.betterend.end_lily_seed": "Deimos Lily Sprout",
-  "block.betterend.end_lotus_flower": "Phobos Lotus Flower",
-  "block.betterend.end_lotus_leaf": "Phobos Lotus Leaf",
-  "block.betterend.end_lotus_stem": "Phobos Lotus Stem",
-  "block.betterend.end_lotus_seed": "Phobos Lotus Sprout",
-  "block.betterend.filalux_wings": "Filalux Wings",
-  "block.betterend.flamaea": "Flamaea Mushroom",
-  "block.betterend.flammalix": "Flammalix Mushroom",
-  "block.betterend.fracturn": "Fracturn",
-  "block.betterend.glacian_hymenophore": "Glacian Hymenophore",
-  "block.betterend.globulagus": "Globulagus",
-  "block.betterend.hydralux": "Hydralux",
-  "block.betterend.hydralux_sapling": "Hydralux Sprout",
-  "block.betterend.inflexia": "Inflexia",
-  "block.betterend.lacugrove": "Lacugrove Algae",
-  "block.betterend.lamellarium": "Lamellarium",
-  "block.betterend.lanceleaf": "Lanceleaf",
-  "block.betterend.lanceleaf_small": "Lanceleaf Dagger",
-  "block.betterend.large_amaranita_mushroom": "Large Amaranita Mushroom",
-  "block.betterend.lucernia_leaves": "Lucernia Lamella",
-  "block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella",
-  "block.betterend.lucernia_outer_leaves": "Lucernia Hyphae",
-  "block.betterend.lutebus": "Lutebus",
-  "block.betterend.magnula": "Magnula",
-  "block.betterend.nightshade_moss": "Nox Moss",
-  "block.betterend.orango": "Orango",
-  "block.betterend.pond_anemone": "Anemone",
-  "block.betterend.purple_polypore": "Purple Polypore",
-  "block.betterend.rubinea": "Rubinea",
-  "block.betterend.ruscus": "Ruscus Grass",
-  "block.betterend.salteago": "Salteago",
-  "block.betterend.selagine": "Selagine",
-  "block.betterend.shadow_berry": "Nox Berries",
-  "block.betterend.shadow_berry_wild": "Wild Nox Berries",
-  "block.betterend.shadow_berry_dead": "Dead Nox Berries",
-  "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
-  "block.betterend.twisted_moss": "Twisted Moss",
-  "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
-  "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss",
-  "block.betterend.twisted_vine": "Twisted Vine",
-  "block.betterend.umbrella_moss": "Umbrella Moss",
-  "block.betterend.umbrella_moss_tall": "Umbrella Moss",
-  "block.betterend.vaiolush_fern": "Vaiolush Fern",
   "entity.endermanoverhaul.nether_wastes_enderman": "Deep Cave Enderman",
   "entity.endermanoverhaul.dark_oak_enderman": "Ashen Enderman",
   "entity.endermanoverhaul.mushroom_fields_enderman": "Mushroom Enderman",