coke gem trim -> armalcolite gem trim

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

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",

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",

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
+}

kubejs/data/minecraft/trim_material/coke_tfc.json

@@ -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
-}

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
+}

kubejs/data/tfc/trim_material/coke_tfc.json

@@ -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
-}

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},