Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
Pyritie
commit
cb74670ceb
166 changed files with 167 additions and 165 deletions
|
|
@ -1 +1 @@
|
|||
{"ad_astra:oxygen_loading":{"order":159}}
|
||||
{"ad_astra:oxygen_loading":{"order":160}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"ae2:attunement":{"order":156}}
|
||||
{"ae2:attunement":{"order":157}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"ae2:condenser":{"order":146}}
|
||||
{"ae2:condenser":{"order":147}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"ae2:item_transformation":{"order":135}}
|
||||
{"ae2:item_transformation":{"order":136}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"afc:tree_tap":{"order":27}}
|
||||
{"afc:tree_tap":{"order":28}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:deploying":{"order":48}}
|
||||
{"create:deploying":{"order":49}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:draining":{"order":157}}
|
||||
{"create:draining":{"order":158}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:item_application":{"order":49}}
|
||||
{"create:item_application":{"order":50}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:mechanical_crafting":{"order":5}}
|
||||
{"create:mechanical_crafting":{"order":6}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:sandpaper_polishing":{"order":47}}
|
||||
{"create:sandpaper_polishing":{"order":48}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:sequenced_assembly":{"order":50}}
|
||||
{"create:sequenced_assembly":{"order":51}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"create:spout_filling":{"order":158}}
|
||||
{"create:spout_filling":{"order":159}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"createaddition:liquid_burning":{"order":54}}
|
||||
{"createaddition:liquid_burning":{"order":55}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"createaddition:rolling":{"order":69}}
|
||||
{"createaddition:rolling":{"order":70}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"domum_ornamentum:architects_cutter":{"order":155}}
|
||||
{"domum_ornamentum:architects_cutter":{"order":156}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"emi:info":{"order":164}}
|
||||
{"emi:info":{"order":165}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"emi:tag":{"order":165}}
|
||||
{"emi:tag":{"order":166}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"exposure:photograph_printing":{"order":151}}
|
||||
{"exposure:photograph_printing":{"order":152}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"exposure:photograph_stacking":{"order":160}}
|
||||
{"exposure:photograph_stacking":{"order":161}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:bowl_pot":{"order":41}}
|
||||
{"firmalife:bowl_pot":{"order":42}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:drying":{"order":33}}
|
||||
{"firmalife:drying":{"order":34}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:mixing_bowl":{"order":34}}
|
||||
{"firmalife:mixing_bowl":{"order":35}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:oven":{"order":35}}
|
||||
{"firmalife:oven":{"order":36}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:smoking":{"order":37}}
|
||||
{"firmalife:smoking":{"order":38}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:stomping":{"order":43}}
|
||||
{"firmalife:stomping":{"order":44}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"firmalife:vat":{"order":42}}
|
||||
{"firmalife:vat":{"order":43}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"framedblocks:framing_saw":{"order":154}}
|
||||
{"framedblocks:framing_saw":{"order":155}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:automatic_packing":{"order":149}}
|
||||
{"greate:automatic_packing":{"order":150}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:automatic_shaped":{"order":147}}
|
||||
{"greate:automatic_shaped":{"order":148}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:automatic_shapeless":{"order":148}}
|
||||
{"greate:automatic_shapeless":{"order":149}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:block_cutting":{"order":153}}
|
||||
{"greate:block_cutting":{"order":154}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:crushing":{"order":104}}
|
||||
{"greate:crushing":{"order":105}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:fan_washing":{"order":137}}
|
||||
{"greate:fan_washing":{"order":138}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:milling":{"order":103}}
|
||||
{"greate:milling":{"order":104}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:mixing":{"order":106}}
|
||||
{"greate:mixing":{"order":107}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:packing":{"order":19}}
|
||||
{"greate:packing":{"order":20}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:pressing":{"order":94}}
|
||||
{"greate:pressing":{"order":95}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"greate:sawing":{"order":81}}
|
||||
{"greate:sawing":{"order":82}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:air_scrubber":{"order":63}}
|
||||
{"gtceu:air_scrubber":{"order":64}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:alloy_blast_smelter":{"order":117}}
|
||||
{"gtceu:alloy_blast_smelter":{"order":118}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:alloy_smelter":{"order":64}}
|
||||
{"gtceu:alloy_smelter":{"order":65}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:aqueous_accumulator":{"order":65}}
|
||||
{"gtceu:aqueous_accumulator":{"order":66}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:arc_furnace":{"order":66}}
|
||||
{"gtceu:arc_furnace":{"order":67}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:arc_furnace_recycling":{"order":143}}
|
||||
{"gtceu:arc_furnace_recycling":{"order":144}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:assembler":{"order":67}}
|
||||
{"gtceu:assembler":{"order":68}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:assembly_line":{"order":118}}
|
||||
{"gtceu:assembly_line":{"order":119}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:autoclave":{"order":68}}
|
||||
{"gtceu:autoclave":{"order":69}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:bedrock_fluid_diagram":{"order":2}}
|
||||
{"gtceu:bedrock_fluid_diagram":{"order":3}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:bedrock_ore_diagram":{"order":3}}
|
||||
{"gtceu:bedrock_ore_diagram":{"order":4}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:bender":{"order":71}}
|
||||
{"gtceu:bender":{"order":72}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:brewery":{"order":72}}
|
||||
{"gtceu:brewery":{"order":73}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:canner":{"order":73}}
|
||||
{"gtceu:canner":{"order":74}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:centrifuge":{"order":75}}
|
||||
{"gtceu:centrifuge":{"order":76}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:chem_dyes":{"order":141}}
|
||||
{"gtceu:chem_dyes":{"order":142}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:chemical_bath":{"order":76}}
|
||||
{"gtceu:chemical_bath":{"order":77}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:chemical_reactor":{"order":77}}
|
||||
{"gtceu:chemical_reactor":{"order":78}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:circuit_assembler":{"order":79}}
|
||||
{"gtceu:circuit_assembler":{"order":80}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:coke_oven":{"order":53}}
|
||||
{"gtceu:coke_oven":{"order":54}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:combustion_generator":{"order":55}}
|
||||
{"gtceu:combustion_generator":{"order":56}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:compressor":{"order":80}}
|
||||
{"gtceu:compressor":{"order":81}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:cracker":{"order":119}}
|
||||
{"gtceu:cracker":{"order":120}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:cutter":{"order":82}}
|
||||
{"gtceu:cutter":{"order":83}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:distillation_tower":{"order":84}}
|
||||
{"gtceu:distillation_tower":{"order":85}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:distillery":{"order":83}}
|
||||
{"gtceu:distillery":{"order":84}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:electric_blast_furnace":{"order":120}}
|
||||
{"gtceu:electric_blast_furnace":{"order":121}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:electrolyzer":{"order":85}}
|
||||
{"gtceu:electrolyzer":{"order":86}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:electromagnetic_separator":{"order":86}}
|
||||
{"gtceu:electromagnetic_separator":{"order":87}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:end_dome":{"order":121}}
|
||||
{"gtceu:end_dome":{"order":122}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:evaporation_tower":{"order":122}}
|
||||
{"gtceu:evaporation_tower":{"order":123}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:extractor":{"order":88}}
|
||||
{"gtceu:extractor":{"order":89}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:extractor_recycling":{"order":145}}
|
||||
{"gtceu:extractor_recycling":{"order":146}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:extruder":{"order":90}}
|
||||
{"gtceu:extruder":{"order":91}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:fermenter":{"order":91}}
|
||||
{"gtceu:fermenter":{"order":92}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:fission_reactor":{"order":123}}
|
||||
{"gtceu:fission_reactor":{"order":124}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:fluid_heater":{"order":92}}
|
||||
{"gtceu:fluid_heater":{"order":93}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:fluid_solidifier":{"order":93}}
|
||||
{"gtceu:fluid_solidifier":{"order":94}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:food_oven":{"order":36}}
|
||||
{"gtceu:food_oven":{"order":37}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:food_processor":{"order":44}}
|
||||
{"gtceu:food_processor":{"order":45}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:forge_hammer":{"order":95}}
|
||||
{"gtceu:forge_hammer":{"order":96}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:forming_press":{"order":96}}
|
||||
{"gtceu:forming_press":{"order":97}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:fusion_reactor":{"order":124}}
|
||||
{"gtceu:fusion_reactor":{"order":125}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:gas_collector":{"order":97}}
|
||||
{"gtceu:gas_collector":{"order":98}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:gas_pressurizer":{"order":98}}
|
||||
{"gtceu:gas_pressurizer":{"order":99}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:gas_turbine":{"order":56}}
|
||||
{"gtceu:gas_turbine":{"order":57}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:greenhouse":{"order":125}}
|
||||
{"gtceu:greenhouse":{"order":126}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:heat_exchanger":{"order":126}}
|
||||
{"gtceu:heat_exchanger":{"order":127}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:implosion_compressor":{"order":127}}
|
||||
{"gtceu:implosion_compressor":{"order":128}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:ingot_molding":{"order":142}}
|
||||
{"gtceu:ingot_molding":{"order":143}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:large_boiler":{"order":51}}
|
||||
{"gtceu:large_boiler":{"order":52}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:large_chemical_reactor":{"order":78}}
|
||||
{"gtceu:large_chemical_reactor":{"order":79}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:large_solar_panel":{"order":57}}
|
||||
{"gtceu:large_solar_panel":{"order":58}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:large_solar_panel_tier2":{"order":58}}
|
||||
{"gtceu:large_solar_panel_tier2":{"order":59}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:large_solar_panel_tier3":{"order":59}}
|
||||
{"gtceu:large_solar_panel_tier3":{"order":60}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:laser_engraver":{"order":100}}
|
||||
{"gtceu:laser_engraver":{"order":101}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:lathe":{"order":102}}
|
||||
{"gtceu:lathe":{"order":103}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:macerator":{"order":105}}
|
||||
{"gtceu:macerator":{"order":106}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:macerator_recycling":{"order":144}}
|
||||
{"gtceu:macerator_recycling":{"order":145}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:mixer":{"order":107}}
|
||||
{"gtceu:mixer":{"order":108}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:nether_dome":{"order":128}}
|
||||
{"gtceu:nether_dome":{"order":129}}
|
||||
|
|
@ -1 +1 @@
|
|||
{"gtceu:nuclear_fuel_factory":{"order":129}}
|
||||
{"gtceu:nuclear_fuel_factory":{"order":130}}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue