diff --git a/CHANGELOG.md b/CHANGELOG.md index 5328771a9..b4bb9f7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ - Improved placement of Illages so now they should never generate on top of a river @Pyritie - Create Packagers/Jar Packagers are now significantly cheaper to craft (#1892) @airrice - Create Casings now need stripped logs instead of any logs @Pyritie +- You can now use honey to make jam in a food processor (#1921) @ShadowDimentio +- Your first MV circuit now needs a sequenced assembly instead of a crafting table recipe @Pyritie ### Bug fixes - Soup can no longer kill you from overheating @BlueBoat29 - Air Distributors now consume as much gas as they should, instead of significantly more (#1760) @Bumperdo09 @@ -35,6 +37,10 @@ - Updated boiler minecart models and textures (#1900) @Redeix - Fixed flux dupe using filled sea shells (#1903) @Redeix - Fixed some more dupes with tool heads (#1576) @Pyritie +- Fixed missing recipe for raw to polished alabaster @Pyritie +- Fixed food processor not being able to cut Basil properly (#1934) @aldp2883 +- Fixed food processor outputting only 1 shredded cheese instead of 4 (#1925) @aldp2883 +- Fixed some more stack size issues with the assembly line (#1952) ### Translation updates - Chinese (simplified) @jmecn diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a3759e5f6..61f77a650 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -694,6 +694,11 @@ "item.tfg.unfired_chalk": "Unfired Chalk Stick", "item.tfg.armor_stand_arms": "Armor Stand with Arms", "item.tfg.flint_club_head": "Flint Club Head", + "item.tfg.unfinished_electron_tube": "Unfinished Electron Tube", + "item.tfg.unfinished_vacuum_tube": "Unfinished Vacuum Tube", + "item.tfg.unfinished_basic_electronic_circuit": "Unfinished Basic Electronic Circuit", + "item.tfg.unfinished_good_electronic_circuit": "Unfinished Good Electronic Circuit", + "item.tfg.unfinished_inscriber_accumulation_press": "Unfinished Inscriber Accumulation Press", "item.tfg.brick.deepslate": "Migmatite Brick", "item.tfg.brick.dripstone": "Travertine Brick", "item.tfg.loose.moon_stone": "Loose Anorthosite", @@ -1077,6 +1082,7 @@ "ore_vein.tfg.mars_copper": "Copper & Chalcopyrite", "ore_vein.tfg.mars_galena": "Silver, Galena, & Lead", "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", + "ore_vein.tfg.mars_graphite": "Graphite & Diamond", "ore_vein.tfg.mars_hematite": "Hematite & Limonite", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasite & Monazite", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 380d8b09e..d5de2d7c4 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -778,6 +778,7 @@ "ore_vein.tfg.mars_copper": "Cobre e Calcopirita", "ore_vein.tfg.mars_galena": "Prata, Galena e Chumbo", "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", + "ore_vein.tfg.mars_graphite": "Grafite e Diamante", "ore_vein.tfg.mars_hematite": "Hematita e Limonita", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasita e Monazita", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 65255496e..6c4d8f374 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -988,6 +988,7 @@ "ore_vein.tfg.mars_copper": "Медь и Халькопирит", "ore_vein.tfg.mars_galena": "Серебро, Галена и Свинец", "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", + "ore_vein.tfg.mars_graphite": "Графит и Алмаз", "ore_vein.tfg.mars_hematite": "Гематит и Лимонит", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Бастнезит и Монацит", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 1412125ab..1f57f1af3 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -1069,23 +1069,24 @@ "ore_vein.tfg.surface_copper": "Халькопірит та Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", - "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", - "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", - "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", + "ore_vein.tfg.deep_mars_chromite": "Редстоун і Хроміт", + "ore_vein.tfg.deep_mars_pitchblende": "Настуран, Торій і Уранініт", + "ore_vein.tfg.deep_mars_sheldonite": "Борніт і Куперит", + "ore_vein.tfg.mars_almandine": "Альмандин і Сапфір", "ore_vein.tfg.mars_apatite": "Апатит і Пірохлор", "ore_vein.tfg.mars_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.mars_coal": "Coal & Hematite", + "ore_vein.tfg.mars_coal": "Вугілля і Гематит", "ore_vein.tfg.mars_copper": "Мідь та Халькопірит", "ore_vein.tfg.mars_galena": "Срібло, Гален і Свинець", - "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", + "ore_vein.tfg.mars_sapphire": "Золото, Електротин і Боксит", + "ore_vein.tfg.mars_graphite": "Графіт і Діамант", "ore_vein.tfg.mars_hematite": "Гематит та Лімоніт", - "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", + "ore_vein.tfg.mars_lubricant": "Стеатит, Тальк і Глауконіт", "ore_vein.tfg.mars_neodynium": "Бастнезит і Монацит", "ore_vein.tfg.mars_nickel": "Гарнієрит і Кобальтит", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", - "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", - "ore_vein.tfg.mars_salt": "Salts & Spodumene", + "ore_vein.tfg.mars_pitchblende": "Настуран, Торій і Гематит", + "ore_vein.tfg.mars_quartzite": "Кварцит, Азбест і Барит", + "ore_vein.tfg.mars_salt": "Солі і Сподумен", "ore_vein.tfg.mars_stibnite": "Тетраедрит (Звичайний)", "ore_vein.tfg.mars_sulfur": "Сфалерит і Пірит", "ore_vein.tfg.mars_tantalite": "Марганець і Тантал", @@ -1093,7 +1094,7 @@ "ore_vein.tfg.mars_surface_bismuthinite": "Вісмут", "ore_vein.tfg.mars_surface_cassiterite": "Каситерит", "ore_vein.tfg.mars_surface_hematite": "Гематит та Лімоніт", - "ore_vein.tfg.mars_surface_nickel_galena": "Sphalerite & Galena", + "ore_vein.tfg.mars_surface_nickel_galena": "Сфалерит і Галеніт", "ore_vein.tfg.mars_surface_tetrahedrite": "Тетраедрит (Поверхня)", "ore_vein.tfg.moon_apatite": "Апатит і Пірохлор", "ore_vein.tfg.moon_bauxite": "Боксит і Ільменіт", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index a4ddf9b76..95735b295 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -1159,8 +1159,9 @@ "ore_vein.tfg.mars_copper": "铜矿, 黄铜矿", "ore_vein.tfg.mars_galena": "银矿, 方铅矿, 铅矿", "ore_vein.tfg.mars_sapphire": "金矿, 电石, 铝土矿", + "ore_vein.tfg.mars_graphite": "石墨, 钻石", "ore_vein.tfg.mars_hematite": "赤铁矿, 褐铁矿", - "ore_vein.tfg.mars_lubricant": "天然碱, 滑石, 海绿石矿砂", + "ore_vein.tfg.mars_lubricant": "皂石, 滑石, 海绿石矿砂", "ore_vein.tfg.mars_neodynium": "氟碳镧铈矿, 独居石", "ore_vein.tfg.mars_nickel": "硅镁镍矿, 辉钴矿", "ore_vein.tfg.mars_pitchblende": "沥青铀矿, 钍矿, 赤铁矿", diff --git a/kubejs/assets/tfg/textures/item/unfinished_good_electronic_circuit.png b/kubejs/assets/tfg/textures/item/unfinished_good_electronic_circuit.png new file mode 100644 index 000000000..f1211dd9c Binary files /dev/null and b/kubejs/assets/tfg/textures/item/unfinished_good_electronic_circuit.png differ diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 31e68c78b..e900886f5 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -906,7 +906,7 @@ const registerCreateRecipes = (event) => { B: '#forge:ingots/brass', C: '#forge:bolts/brass', D: '#forge:tools/files' - }).id('tfg:create/shaped/brass_hand') + }).addMaterialInfo().id('tfg:create/shaped/brass_hand') event.recipes.gtceu.assembler('tfg:create/brass_hand') .itemInputs('3x #forge:bolts/brass', '#forge:plates/brass') @@ -990,7 +990,7 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/super_glue') // Deployer - event.shaped('create:deployer', [ + event.recipes.gtceu.shaped('create:deployer', [ ' A ', 'DBF', ' CE' @@ -1001,7 +1001,7 @@ const registerCreateRecipes = (event) => { D: '#forge:tools/wrenches', E: '#forge:tools/screwdrivers', F: 'create:electron_tube' - }).id('tfg:create/shaped/deployer') + }).addMaterialInfo().id('tfg:create/shaped/deployer') event.recipes.gtceu.assembler('create:deployer') .itemInputs('#forge:cogwheels', 'gtceu:ulv_machine_casing', 'create:brass_hand', 'create:electron_tube') diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 9f7598775..16820df59 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -603,6 +603,21 @@ const registerGTCEURecipes = (event) => { event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', '#forge:plates/steel']), ]).transitionalItem('tfg:unfinished_basic_electronic_circuit').loops(1).id('tfg:gtceu/sequenced_assembly/basic_electronic_circuit') + event.remove({ id: 'gtceu:shaped/electronic_circuit_mv' }) + + event.recipes.createSequencedAssembly([ + 'gtceu:good_electronic_circuit', + ], 'gtceu:phenolic_printed_circuit_board', [ + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', 'gtceu:diode']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', 'gtceu:diode']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', '#forge:single_wires/copper']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', '#forge:single_wires/copper']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', 'gtceu:basic_electronic_circuit']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', 'gtceu:basic_electronic_circuit']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', 'gtceu:basic_electronic_circuit']), + event.recipes.createDeploying('tfg:unfinished_good_electronic_circuit', ['tfg:unfinished_good_electronic_circuit', '#forge:plates/steel']), + ]).transitionalItem('tfg:unfinished_good_electronic_circuit').loops(1).id('tfg:gtceu/sequenced_assembly/good_electronic_circuit') + //#endregion //#region Quantum mainframe stack fix. diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index f5c14b2c7..d2da48e68 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -13,6 +13,7 @@ const registerTFGItems = (event) => { event.create('tfg:unfinished_electron_tube', 'create:sequenced_assembly') event.create('tfg:unfinished_vacuum_tube', 'create:sequenced_assembly') event.create('tfg:unfinished_basic_electronic_circuit', 'create:sequenced_assembly') + event.create('tfg:unfinished_good_electronic_circuit', 'create:sequenced_assembly') event.create('tfg:unfinished_inscriber_accumulation_press') event.create('tfg:vitrified_pearl') event.create('tfg:cryo_fluix_pearl')