Skip to content

Commit c77011e

Browse files
authored
Merge pull request #350 from StarT-Dev-Team/updating-gtm
Updating gtm
2 parents da019cd + d4e63d1 commit c77011e

159 files changed

Lines changed: 465 additions & 250 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/jei/blacklist.cfg

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ gtceu:sand_redstone_ore
100100
nuclearcraft:depleted_fuel_neptunium_hen_236_za_bucket
101101
gtceu:mv_item_passthrough_hatch
102102
exdeorum:compressed_gravel
103-
gtceu:uiv_electric_smoker
104103
mysticalagriculture:absorption_iv_augment
105104
gtceu:red_sand_talc_ore
106105
gtceu:deepslate_zapolite_ore
@@ -322,7 +321,6 @@ gtceu:uxv_alloy_smelter
322321
enderio:fused_quartz_e_cyan
323322
fluid:nuclearcraft:zirconium
324323
gtceu:andesite_rheniite_ore
325-
gtceu:uv_electric_blast_furnace
326324
thermal:bronze_gear
327325
gtceu:granite_powellite_ore
328326
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:octane"}}
@@ -343,7 +341,6 @@ thermal:red_rockwool
343341
gtceu:chalcocite_ore
344342
start_core:uev_16384a_dream_link_energy_hatch
345343
gtceu:marble_crookesite_ore
346-
gtceu:mv_electric_smoker
347344
gtceu:netherrack_crookesite_ore
348345
thermal_extra:abyssal_gear
349346
gtceu:marble_vanadium_magnetite_ore
@@ -918,7 +915,6 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:sub_ste
918915
mysticalagriculture:inferium_gemstone
919916
gtceu:blackstone_aguilarite_ore
920917
exdeorum:cobalt_ore_chunk
921-
gtceu:lv_electric_smoker
922918
mysticalagriculture:slow_falling_augment
923919
thermal_extra:osmium_ore_chunk
924920
gtceu:gravel_red_garnet_ore
@@ -1393,7 +1389,6 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"thermal_extra
13931389
exnihilosequentia:zinc_nugget
13941390
gtceu:basalt_blue_topaz_ore
13951391
create:crushed_raw_zinc
1396-
gtceu:iv_electric_blast_furnace
13971392
mysticalagriculture:soulium_spawner
13981393
mysticaladaptations:insanium_sword
13991394
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:poly_34_ethylenedioxythiophene_polystyrene_sulfate_solution"}}
@@ -1883,7 +1878,6 @@ gtceu:andesite_oilsands_ore
18831878
sgjourney:goauld_carcass
18841879
thermal:invar_ingot
18851880
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:neodymium"}}
1886-
gtceu:iv_electric_smoker
18871881
mysticalagriculture:tertium_ingot_block
18881882
gtceu:diorite_red_garnet_ore
18891883
start_core:max_4096a_dream_link_energy_hatch
@@ -2038,7 +2032,6 @@ gtceu:andesite_malachite_ore
20382032
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:oxygenous_mineral_mixture"}}
20392033
xycraft_world:aluminum_ore_stone
20402034
gtceu:blackstone_xenotime_ore
2041-
gtceu:ev_electric_blast_furnace
20422035
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:molten_lumium"}}
20432036
gtceu:gravel_spodumene_ore
20442037
exdeorum:spruce_compressed_sieve
@@ -2089,7 +2082,6 @@ gtceu:red_sand_garnierite_ore
20892082
gtceu:red_sand_cobaltite_ore
20902083
gtceu:diorite_emerald_ore
20912084
gtceu:deepslate_adamantite_ore
2092-
gtceu:luv_electric_blast_furnace
20932085
gtceu:yellow_limonite_ore
20942086
gtceu:gravel_graphite_ore
20952087
thermal:machine_press
@@ -2176,7 +2168,6 @@ mysticalagradditions:dragon_egg_chunk
21762168
gtceu:sand_tetrahedrite_ore
21772169
gtceu:andesite_magnetite_ore
21782170
sgjourney:cut_naquadah_stairs
2179-
gtceu:uhv_electric_smoker
21802171
thermal:rich_slag
21812172
gtceu:gravel_zavaritskite_ore
21822173
gtceu:sand_sodalite_ore
@@ -2276,7 +2267,6 @@ nuclearcraft:americium_242_ni
22762267
gtceu:opv_polarizer
22772268
sgjourney:refined_naquadah
22782269
thermal_extra:soul_infused_dynamo_fuel_augment
2279-
gtceu:zpm_electric_smoker
22802270
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:severely_hydro_cracked_heavy_fuel"}}
22812271
mysticalagriculture:soul_dust
22822272
nuclearcraft:neptunium_236_bucket
@@ -2387,7 +2377,6 @@ gtceu:endstone_kyanite_ore
23872377
gtceu:red_granite_pollucite_ore
23882378
thermal_extra:soul_infused_shovel
23892379
thermal:machine_efficiency_creative_augment
2390-
gtceu:uhv_electric_blast_furnace
23912380
mysticalagriculture:awakened_supremium_ingot
23922381
gtceu:deepslate_topaz_ore
23932382
gtceu:endstone_malachite_ore
@@ -2721,7 +2710,6 @@ gtceu:opv_alloy_smelter
27212710
gtceu:basalt_uraninite_ore
27222711
gtceu:marble_estaltine_ore
27232712
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:thionyl_chloride"}}
2724-
gtceu:hv_electric_blast_furnace
27252713
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:terrathroxin"}}
27262714
gtceu:basalt_molybdenite_ore
27272715
enderio:fused_quartz_m_gray
@@ -2763,7 +2751,6 @@ gtceu:deepslate_uraninite_ore
27632751
sgjourney:energy_crystal
27642752
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:ruridit"}}
27652753
gtceu:endstone_realgar_ore
2766-
gtceu:uv_electric_smoker
27672754
gtceu:red_sand_blue_topaz_ore
27682755
thermalendergy:prismalium_plate
27692756
gtceu:red_sand_stibiopalladinite_ore
@@ -2862,7 +2849,6 @@ gtceu:red_sand_adamantite_ore
28622849
thermal_extra:dragonsteel_dust
28632850
exdeorum:warped_nylium_spores
28642851
thermal:ruby_gear
2865-
gtceu:hv_electric_smoker
28662852
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:magmatic"}}
28672853
gtceu:sand_klockmannite_ore
28682854
gtceu:red_sand_platinum_ore
@@ -2929,7 +2915,6 @@ gtceu:andesite_molybdenite_ore
29292915
gtceu:basalt_sphalerite_ore
29302916
gtceu:tuff_topaz_ore
29312917
gtceu:marble_yellow_limonite_ore
2932-
gtceu:uev_electric_blast_furnace
29332918
gtceu:gravel_grossular_ore
29342919
gtceu:basalt_green_sapphire_ore
29352920
gtceu:netherrack_mica_ore
@@ -2971,7 +2956,6 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:enriche
29712956
gtceu:flisnt_ingot
29722957
gtceu:red_granite_pyrolusite_ore
29732958
thermal:emerald_dust
2974-
gtceu:luv_electric_smoker
29752959
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:indium"}}
29762960
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:ancient_netherite"}}
29772961
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:molten_bismuth_bronze"}}
@@ -3297,7 +3281,6 @@ gtceu:tuff_magnesite_ore
32973281
gtceu:granite_amethyst_ore
32983282
fluid:thermal_extra:raw_gold
32993283
gtceu:basalt_aluminium_ore
3300-
gtceu:lv_electric_blast_furnace
33013284
xycraft_world:xychorium_ore_stone_green
33023285
gtceu:endstone_cobalt_ore
33033286
thermal:ruby
@@ -3527,7 +3510,6 @@ nuclearcraft:silicon_carbide_bucket
35273510
gtceu:max_4a_energy_converter
35283511
enderio:clear_glass_ea_light_gray
35293512
gtceu:blackstone_sylvanite_ore
3530-
gtceu:ev_electric_smoker
35313513
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:tin_alloy"}}
35323514
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:severely_hydro_cracked_light_fuel"}}
35333515
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:polonium_bismide"}}
@@ -4289,7 +4271,6 @@ woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:superst
42894271
thermal_extra:abyssal_potion_duration_augment
42904272
thermal:bitumen
42914273
gtceu:red_sand_beryllium_ore
4292-
gtceu:mv_electric_blast_furnace
42934274
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:benzoyl_chloride"}}
42944275
gtceu:gravel_opal_ore
42954276
gtceu:granite_sylvanite_ore
@@ -4306,7 +4287,6 @@ gtceu:blackstone_beryllium_ore
43064287
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:platinum_group_leach_liquor"}}
43074288
mysticalagradditions:nether_inferium_ore
43084289
gtceu:blackstone_barite_ore
4309-
gtceu:uev_electric_smoker
43104290
sgjourney:large_control_crystal
43114291
gtceu:marble_pyrite_ore
43124292
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:hyper_enriched_estaltadyne_slurry_mixture"}}
@@ -4450,7 +4430,6 @@ gtceu:magnetite_ore
44504430
sgjourney:pure_naquadah_block
44514431
gtceu:netherrack_oilsands_ore
44524432
mysticalagriculture:soulstone_smooth
4453-
gtceu:uiv_electric_blast_furnace
44544433
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:acidic_bromine_solution"}}
44554434
gtceu:blackstone_celestine_ore
44564435
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:red_dye"}}
@@ -4905,7 +4884,6 @@ gtceu:uxv_item_passthrough_hatch
49054884
gtceu:diorite_pitchblende_ore
49064885
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:severely_steam_cracked_light_fuel"}}
49074886
gtceu:netherrack_tricalcium_phosphate_ore
4908-
gtceu:zpm_electric_blast_furnace
49094887
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"thermal_extra:raw_lead"}}
49104888
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:magnetic_zapolgium"}}
49114889
woodenbucket:wooden_bucket:{Damage:0,Fluid:{Amount:1000,FluidName:"gtceu:hyper_enriched_estaltadyne_slurry_residue"}}

kubejs/assets/gtceu/lang/en_us.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,8 @@
11821182
"block.gtceu.perfect_oc_subtick.tooltip.1": "Has §6Perfect Overclock§r and §cSubtick Parallels",
11831183
"block.gtceu.subtick.tooltip.1": "Has §cSubtick Parallels",
11841184
"block.gtceu.subtick_coil_parallel.tooltip.1": "Has §cSubtick Parallels§r and §bCoil Parallels§r",
1185+
"block.gtceu.coil_boosting_subtick.tooltip.1": "Has §cSubtick Parallels§r and §bCoil Boosting§r",
1186+
"block.gtceu.coil_boosting_parallel_subtick.tooltip.1": "Can use §3Parallel§r hatches and has §cSubtick Parallels§r and §bCoil Boosting§r",
11851187

11861188
"block.gtceu.macerators.tooltip.1": "§7Macerators only produce byproducts shown in JEI at HV or higher",
11871189

@@ -1378,5 +1380,18 @@
13781380
"block.gtceu.t_large_pulverizer": "Large Pulverizer",
13791381
"block.gtceu.t_large_pulverizer.tooltip.0": "§7A larger variant of the pulverizier that can process materials with more energy efficiency.",
13801382
"block.gtceu.t_large_pulverizer.tooltip.1": "Has §6Perfect Overclock",
1381-
"block.gtceu.t_large_pulverizer.tooltip.2": "Can only have §bone§r Energy Hatch"
1383+
"block.gtceu.t_large_pulverizer.tooltip.2": "Can only have §bone§r Energy Hatch",
1384+
1385+
"material.gtceu.acidic_bromine_solution": "Acidic Bromine Solution",
1386+
"material.gtceu.concentrated_bromine_solution": "Concentrated Bromine Solution",
1387+
"material.gtceu.hydrogen_iodid": "Hydrogen Iodide",
1388+
"material.gtceu.hot_brine": "Hot Brine",
1389+
"material.gtceu.hot_chlorinated_brominated_brine": "Hot Chlorinated Brominated Brine",
1390+
"material.gtceu.hot_debrominated_brine": "Hot Debrominated Brine",
1391+
"material.gtceu.hot_alkaline_debrominated_brine": "Hot Alkaline Debrominated Brine",
1392+
"material.gtceu.raw_brine": "Raw Brine",
1393+
"material.gtceu.debrominated_brine": "Debrominated Brine",
1394+
"material.gtceu.brominated_chlorine_vapor": "Brominated Chlorine Vapor",
1395+
"material.gtceu.acidic_bromine_exhaust": "Acidic Bromine Exhaust"
1396+
13821397
}

kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/advanced_machine_facility.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/auto_scavenger.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/auto_scavenger.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/circuit_facility.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/component_chamber.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/component_nexus.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/component_nexus.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/component_part_assembly.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/component_part_assembly.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/component_part_synthesis_forge.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/component_part_synthesis_forge.rtui

File renamed without changes.

kubejs/assets/gtceu/ui/recipe_type/component_synthesis_forge.rtui renamed to kubejs/assets/gtceu/ui/recipe_type/old_versions/component_synthesis_forge.rtui

File renamed without changes.

0 commit comments

Comments
 (0)