From 6944cb7083aad202f48e5317bd8f8231f9ac5f3e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 15 Dec 2025 19:12:36 +0000 Subject: [PATCH] coke gem trim -> armalcolite gem trim --- CHANGELOG.md | 7 +++++-- kubejs/assets/minecraft/atlases/armor_trims.json | 2 +- kubejs/assets/minecraft/atlases/blocks.json | 2 +- .../trims/{coke_tfc.png => armalcolite_tfc.png} | Bin .../minecraft/trim_material/armalcolite_tfc.json | 9 +++++++++ kubejs/data/minecraft/trim_material/coke_tfc.json | 9 --------- kubejs/data/tfc/trim_material/armalcolite_tfc.json | 9 +++++++++ kubejs/data/tfc/trim_material/coke_tfc.json | 9 --------- kubejs/server_scripts/tfg/json_tool.armor_trim.js | 2 +- 9 files changed, 26 insertions(+), 23 deletions(-) rename kubejs/assets/tfc/textures/color_palettes/trims/{coke_tfc.png => armalcolite_tfc.png} (100%) create mode 100644 kubejs/data/minecraft/trim_material/armalcolite_tfc.json delete mode 100644 kubejs/data/minecraft/trim_material/coke_tfc.json create mode 100644 kubejs/data/tfc/trim_material/armalcolite_tfc.json delete mode 100644 kubejs/data/tfc/trim_material/coke_tfc.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 2470f19a5..8f39eeea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ - Cleaned up the EMI pages for small and large boilers so they aren't flooded with furniture and other things. If you were using something "non-standard" to fuel your boilers, check if they're still valid. (#2421, #2415) @thederpysockdude123 @applenper - Clay dust is no longer electrolyzable, but now you can get infinite clay blocks from a rock breaker @Pyritie ### Changes +- Added BTX fuel, a new EV-tier gas fuel to replace nitrobenzene. (#2416) @TomPlop +- Primitive illagers will no longer endlessly respawn. Instead, now they only spawn as "structures", so once you kill them they will never return. @Pyritie #### Hot or Not - Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `#tfg:hot_protection_equipment`, `#tfg:cold_protection_equipment`, and `#tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. The equipment also protects against pipes! @Pyritie - GregTech hot ingots are also now properly included in the "too hot to handle" system so the same protection applies @Pyritie @@ -22,7 +24,6 @@ - The medical condition effect that previously instantly killed you (which did not spawn a corpse) now gives you Wither III instead. @Pyritie #### Other - Added two more early game mechanical belts, and rubber+ belts are also now more expensive. @Pyritie @Epicificator -- Primitive illagers will no longer endlessly respawn. Instead, now they only spawn as "structures", so once you kill them they will never return. @Pyritie - Doubled the durability of all space suits @Pyritie - Added a way to convert between vinegar and acetic acid (#2386) @Epicificator - Added a renderer to the electric greenhouse, so now you can visually see your crops grow! @RubenVerg @@ -40,7 +41,7 @@ - Fixed fries and cheese curds not being able to be put on burgers. @Redeix - Fixed sliced brinza missing the proper cheese tags. @Redeix - Fixed pyroxenite and keratophyre bricks crafting 1 instead of 4 (#2373) @Pyritie -- Fixed some issues with quest items (#2384, #2386) @Mqrius +- Fixed some issues with quest text and items (#2384, #2386, #2435) @Mqrius @thederpysockdude123 - Fixed some tag issues with foods (#2405) @thederpysockdude123 - Fixed treated wooden planks from being excluded in the Domum Ornamentum and Facade whitelists (#2404) @thederpysockdude123 - Fixed a recipe conflict for boiled and fried eggs (#2407) @Mqrius @@ -50,6 +51,8 @@ - Fixed Ostrum Casing not having a recipe (#2363) @FlightingFalcon - Fixed warped trees not growing on normal mars dirt @Pyritie - Fixed missing block names for some of the variations of non-earth stones @Pyritie +- Fixed being able to turn bismuth and black bronze drums into regular bronze drums (#2436) @Jeuvke +- Fixed a recipe conflict with stone plates (#2433) @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Japanese @sakura-gondra diff --git a/kubejs/assets/minecraft/atlases/armor_trims.json b/kubejs/assets/minecraft/atlases/armor_trims.json index e69c5d5f9..e0d80f286 100644 --- a/kubejs/assets/minecraft/atlases/armor_trims.json +++ b/kubejs/assets/minecraft/atlases/armor_trims.json @@ -55,7 +55,7 @@ "salt_tfc": "tfc:color_palettes/trims/salt_tfc", "sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc", "sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc", - "coke_tfc": "tfc:color_palettes/trims/coke_tfc", + "armalcolite_tfc": "tfc:color_palettes/trims/armalcolite_tfc", "spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc", "topaz_tfc": "tfc:color_palettes/trims/topaz_tfc", "uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc", diff --git a/kubejs/assets/minecraft/atlases/blocks.json b/kubejs/assets/minecraft/atlases/blocks.json index d0a87f124..a00db2299 100644 --- a/kubejs/assets/minecraft/atlases/blocks.json +++ b/kubejs/assets/minecraft/atlases/blocks.json @@ -31,7 +31,7 @@ "salt_tfc": "tfc:color_palettes/trims/salt_tfc", "sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc", "sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc", - "coke_tfc": "tfc:color_palettes/trims/coke_tfc", + "armalcolite_tfc": "tfc:color_palettes/trims/armalcolite_tfc", "spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc", "topaz_tfc": "tfc:color_palettes/trims/topaz_tfc", "uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc", diff --git a/kubejs/assets/tfc/textures/color_palettes/trims/coke_tfc.png b/kubejs/assets/tfc/textures/color_palettes/trims/armalcolite_tfc.png similarity index 100% rename from kubejs/assets/tfc/textures/color_palettes/trims/coke_tfc.png rename to kubejs/assets/tfc/textures/color_palettes/trims/armalcolite_tfc.png diff --git a/kubejs/data/minecraft/trim_material/armalcolite_tfc.json b/kubejs/data/minecraft/trim_material/armalcolite_tfc.json new file mode 100644 index 000000000..ba7b1f0e1 --- /dev/null +++ b/kubejs/data/minecraft/trim_material/armalcolite_tfc.json @@ -0,0 +1,9 @@ +{ + "asset_name": "armalcolite_tfc", + "description": { + "color": "#424847", + "translate": "trim_material.tfc.armalcolite_tfc" + }, + "ingredient": "gtceu:exquisite_armalcolite_gem", + "item_model_index": 0.199 +} \ No newline at end of file diff --git a/kubejs/data/minecraft/trim_material/coke_tfc.json b/kubejs/data/minecraft/trim_material/coke_tfc.json deleted file mode 100644 index f66488835..000000000 --- a/kubejs/data/minecraft/trim_material/coke_tfc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "asset_name": "coke_tfc", - "description": { - "color": "#424847", - "translate": "trim_material.tfc.coke_tfc" - }, - "ingredient": "gtceu:exquisite_coke_gem", - "item_model_index": 0.199 -} \ No newline at end of file diff --git a/kubejs/data/tfc/trim_material/armalcolite_tfc.json b/kubejs/data/tfc/trim_material/armalcolite_tfc.json new file mode 100644 index 000000000..ba7b1f0e1 --- /dev/null +++ b/kubejs/data/tfc/trim_material/armalcolite_tfc.json @@ -0,0 +1,9 @@ +{ + "asset_name": "armalcolite_tfc", + "description": { + "color": "#424847", + "translate": "trim_material.tfc.armalcolite_tfc" + }, + "ingredient": "gtceu:exquisite_armalcolite_gem", + "item_model_index": 0.199 +} \ No newline at end of file diff --git a/kubejs/data/tfc/trim_material/coke_tfc.json b/kubejs/data/tfc/trim_material/coke_tfc.json deleted file mode 100644 index f66488835..000000000 --- a/kubejs/data/tfc/trim_material/coke_tfc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "asset_name": "coke_tfc", - "description": { - "color": "#424847", - "translate": "trim_material.tfc.coke_tfc" - }, - "ingredient": "gtceu:exquisite_coke_gem", - "item_model_index": 0.199 -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/json_tool.armor_trim.js b/kubejs/server_scripts/tfg/json_tool.armor_trim.js index 60ee69a26..d7bbc80b6 100644 --- a/kubejs/server_scripts/tfg/json_tool.armor_trim.js +++ b/kubejs/server_scripts/tfg/json_tool.armor_trim.js @@ -29,7 +29,7 @@ const materials = [ {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196}, {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197}, {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198}, - {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199}, + {materialName: 'armalcolite_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_armalcolite_gem', indexNumber: 0.199}, {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181}, {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182}, {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183},